Remove legacy symbol utils

include/vast/CodeGen/ScopeContext.hpp

@@ -10,7 +10,6 @@ VAST_UNRELAX_WARNINGS
 
 #include "vast/CodeGen/DefaultSymbolGenerator.hpp"
 #include "vast/Util/TypeList.hpp"
-#include "vast/Util/Symbols.hpp"
 
 #include "vast/Dialect/Core/Interfaces/SymbolInterface.hpp"
 

include/vast/Dialect/Core/Interfaces/SymbolInterface.hpp

@@ -1,4 +1,4 @@
 // Copyright (c) 2022-present, Trail of Bits, Inc.
 
 #pragma once
 
@@ -19,10 +19,16 @@
     // Use TypeID of Interfaces that defines the symbol
     using symbol_kind = mlir::TypeID;
 
+    using symbol_use_range = ::mlir::SymbolTable::UseRange;
+
+    symbol_use_range get_symbol_uses(
+        operation symbol, operation from
+    );
+
 } // namespace vast::core
 
 /// Include the generated interface declarations.
 #include "vast/Dialect/Core/Interfaces/SymbolInterface.h.inc"
 
 namespace vast::core {
 
@@ -49,4 +55,13 @@
         return kind == get_symbol_kind< interface >;
     }
 
+    template< typename symbol_kind >
+    void symbols(operation scope, auto &&yield) {
+        scope->walk([&] (operation child) {
+            if (auto symbol = mlir::dyn_cast< symbol_kind >(child)) {
+                yield(symbol);
+            }
+        });
+    }
+
 } // namespace vast::core

include/vast/Dialect/Core/Interfaces/SymbolInterface.td

@@ -37,6 +37,17 @@ def Core_Symbol : Core_OpInterface< "SymbolOpInterface" > {
                     op->setAttr("name", attr);
                 }
             }]
+        >,
+        InterfaceMethod< [{
+                Get all of the uses of the current symbol that are nested within
+                the given operation 'from'.
+                Note: See core::symbol_table::get_symbol_uses for more details.
+            }],
+            "::mlir::SymbolTable::UseRange", "getSymbolUses",
+            (ins "::mlir::Operation *":$from), [{}],
+            /*defaultImplementation=*/[{
+                return ::vast::core::get_symbol_uses(this->getOperation(), from);
+            }]
         >
     ];
 }

include/vast/Dialect/Core/Interfaces/SymbolTableInterface.hpp

@@ -1,4 +1,4 @@
 // Copyright (c) 2024, Trail of Bits, Inc.
 
 #pragma once
 
@@ -24,4 +24,12 @@
 
     using symbol_table_op_interface = SymbolTableOpInterface;
 
+    void symbol_tables(operation root, auto &&yield) {
+        root->walk([&] (operation child) {
+            if (mlir::isa< symbol_table_op_interface >(child)) {
+                yield(child);
+            }
+        });
+    }
+
 } // namespace vast::core

include/vast/Dialect/Core/SymbolTable.hpp

@@ -1,4 +1,4 @@
 // Copyright (c) 2024, Trail of Bits, Inc.
 
 #pragma once
 
@@ -162,6 +162,41 @@
 
         operation get_defining_operation() { return symbol_table_op; }
 
+        auto nested_operations() const {
+            return gmw::operations(symbol_table_op);
+        }
+
+        // Note: These are adapted from mlir::SymbolTable,
+        // try to keep them consistent when updating, or note the differences.
+        //
+        // Get an iterator range for all of the uses, for any symbol, that are
+        // nested within the given operation 'from'. This does not traverse into
+        // any nested symbol tables.
+        static symbol_use_range get_direct_symbol_uses(operation from);
+        static symbol_use_range get_direct_symbol_uses(region_ptr from);
+
+        // Get all of the uses of the given symbol that are nested within the given
+        // operation 'from'. This does not traverse into any nested symbol tables.
+        static symbol_use_range get_direct_symbol_uses(operation symbol, operation from);
+        static symbol_use_range get_direct_symbol_uses(string_attr symbol, operation from);
+        static symbol_use_range get_direct_symbol_uses(operation symbol, region_ptr from);
+        static symbol_use_range get_direct_symbol_uses(string_attr symbol, region_ptr from);
+
+        // Get an iterator range for all of the uses, for any symbol, that are
+        // nested within the given operation 'from'. In contrast to
+        // mlir::SymbolTable::getSymbolUses and `get_direct_symbol_uses` this
+        // function traverses into nested symbol tables.
+        static symbol_use_range get_symbol_uses(operation from);
+        static symbol_use_range get_symbol_uses(region_ptr from);
+
+        // Get all of the uses of the given symbol that are nested within the given
+        // operation 'from'. In contrast to mlir::SymbolTable::getSymbolUses, this
+        // function traverses into nested symbol tables.
+        static symbol_use_range get_symbol_uses(operation symbol, operation from);
+        static symbol_use_range get_symbol_uses(string_attr symbol, operation from);
+        static symbol_use_range get_symbol_uses(operation symbol, region_ptr from);
+        static symbol_use_range get_symbol_uses(string_attr symbol, region_ptr from);
+
       protected:
 
         template< util::flat_list symbols_list >

include/vast/Dialect/HighLevel/HighLevelUtils.hpp

@@ -11,7 +11,6 @@
 #include "vast/Dialect/Core/Interfaces/SymbolInterface.hpp"
 
 #include "vast/Util/Common.hpp"
-#include <vast/Util/Symbols.hpp>
 #include "vast/Util/TypeUtils.hpp"
 
 #include <gap/coro/generator.hpp>

include/vast/Dialect/HighLevel/Passes.hpp

@@ -18,8 +18,6 @@ VAST_UNRELAX_WARNINGS
 namespace vast::hl {
     std::unique_ptr< mlir::Pass > createHLLowerTypesPass();
 
-    std::unique_ptr< mlir::Pass > createExportFnInfoPass();
-
     std::unique_ptr< mlir::Pass > createDCEPass();
 
     std::unique_ptr< mlir::Pass > createUDEPass();

include/vast/Dialect/HighLevel/Passes.td

@@ -5,25 +5,6 @@
 
 include "mlir/Pass/PassBase.td"
 
-def ExportFnInfo : Pass<"vast-export-fn-info", "core::ModuleOp"> {
-  let summary = "Create JSON that exports information about function arguments.";
-  let description = [{
-    Lowers module into llvm IR and dumps it on stderr.
-  }];
-
-  let dependentDialects = [
-    "vast::hl::HighLevelDialect",
-    "vast::core::CoreDialect"
-  ];
-
-  let constructor = "vast::hl::createExportFnInfoPass()";
-
-  let options = [
-    Option< "o", "o", "std::string", "",
-            "Output JSON file to be created." >
-  ];
-}
-
 def DCE : Pass<"vast-hl-dce", "core::ModuleOp"> {
   let summary = "Trim dead code";
   let description = [{

include/vast/Dialect/Meta/MetaDialect.hpp

@@ -1,4 +1,4 @@
 // Copyright (c) 2022-present, Trail of Bits, Inc.
 
 #pragma once
 
@@ -14,18 +14,20 @@
 
 
 // Pull in the dialect definition.
 #include "vast/Dialect/Meta/MetaDialect.h.inc"
 
+#include "vast/Util/Common.hpp"
+
 namespace vast::meta
 {
     using identifier_t = std::uint64_t;
 
-    void add_identifier(mlir::Operation *op, identifier_t id);
+    void add_identifier(operation op, identifier_t id);
 
-    void remove_identifier(mlir::Operation *op);
+    void remove_identifier(operation op);
 
-    std::vector< mlir::Operation * > get_with_identifier(mlir::Operation *scope, identifier_t id);
+    std::vector< operation  > get_with_identifier(operation scope, identifier_t id);
 
-    std::vector< mlir::Operation * > get_with_meta_location(mlir::Operation *scope, identifier_t id);
+    std::vector< operation  > get_with_meta_location(operation scope, identifier_t id);
 
 } // namespace vast::meta

include/vast/Util/Common.hpp

@@ -59,9 +59,12 @@ namespace vast {
     using string_ref     = llvm::StringRef;
     using logical_result = mlir::LogicalResult;
 
+    using symbol_ref_attr = mlir::SymbolRefAttr;
+
     using mlir_attr    = mlir::Attribute;
     using maybe_attr_t = std::optional< mlir_attr >;
     using named_attr   = mlir::NamedAttribute;
+    using string_attr  = mlir::StringAttr;
 
     using integer_attr_t = mlir::IntegerAttr;
 

include/vast/repl/command.hpp

@@ -8,7 +8,6 @@ VAST_RELAX_WARNINGS
 #include <llvm/ADT/StringExtras.h>
 VAST_UNRELAX_WARNINGS
 
-#include "vast/Util/Symbols.hpp"
 #include "vast/Util/Tuple.hpp"
 #include "vast/Util/TypeList.hpp"
 

lib/vast/Conversion/ABI/EmitABI.cpp

@@ -37,7 +37,6 @@ VAST_UNRELAX_WARNINGS
 #include "vast/Util/Common.hpp"
 #include "vast/Util/Functions.hpp"
 #include "vast/Util/DialectConversion.hpp"
-#include "vast/Util/Symbols.hpp"
 
 #include "vast/Dialect/ABI/ABIOps.hpp"
 

lib/vast/Conversion/ABI/LowerABI.cpp

@@ -34,7 +34,6 @@ VAST_UNRELAX_WARNINGS
 #include "vast/Util/Common.hpp"
 #include "vast/Util/Functions.hpp"
 #include "vast/Util/DialectConversion.hpp"
-#include "vast/Util/Symbols.hpp"
 #include "vast/Util/TypeSwitch.hpp"
 #include "vast/Util/TypeUtils.hpp"
 

lib/vast/Conversion/FromHL/ToLLGEPs.cpp

@@ -18,7 +18,6 @@ VAST_UNRELAX_WARNINGS
 #include "vast/Dialect/LowLevel/LowLevelOps.hpp"
 
 #include "vast/Util/DialectConversion.hpp"
-#include "vast/Util/Symbols.hpp"
 
 namespace vast {
     namespace {

lib/vast/Conversion/ToLLVM/IRsToLLVM.cpp

@@ -31,7 +31,6 @@ VAST_UNRELAX_WARNINGS
 #include "vast/Dialect/Core/TypeTraits.hpp"
 
 #include "vast/Util/Common.hpp"
-#include "vast/Util/Symbols.hpp"
 #include "vast/Util/Terminator.hpp"
 #include "vast/Util/TypeList.hpp"
 

lib/vast/Conversion/ToLLVM/LLCFToLLVM.hpp

@@ -13,7 +13,6 @@ VAST_UNRELAX_WARNINGS
 
 #include "vast/Dialect/LowLevel/LowLevelOps.hpp"
 
-#include "vast/Util/Symbols.hpp"
 #include "vast/Util/TypeList.hpp"
 
 #include "vast/Conversion/Common/Block.hpp"

lib/vast/Dialect/Core/Interfaces/SymbolInterface.cpp

@@ -1,6 +1,7 @@
 // Copyright (c) 2022-present, Trail of Bits, Inc.
 
 #include "vast/Dialect/Core/Interfaces/SymbolInterface.hpp"
+#include "vast/Dialect/Core/Interfaces/SymbolTableInterface.hpp"
 
 //===----------------------------------------------------------------------===//
 // Symbol Interfaces