treewide: Clean up populating of conversions.

trailofbits · Aug 7, 2024 · 63b09fb · 63b09fb
1 parent df0782d
commit 63b09fb
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/include/vast/Conversion/Common/Mixins.hpp b/include/vast/Conversion/Common/Mixins.hpp
@@ -50,9 +50,9 @@ namespace vast {
             );
         }
 
-        template< typename... lists >
-        static void populate_conversions_base(auto &cfg) {
-            (self::template populate_conversions_impl< lists >(cfg), ...);
+        template< typename... conversions >
+        static void populate_conversions(auto &cfg) {
+            (self::template populate_conversions_impl< conversions >(cfg), ...);
         }
     };
 
@@ -176,7 +176,7 @@ namespace vast {
     //     }
     //
     //     static void populate_conversions(base_conversion_config &cfg) {
-    //         base::populate_conversions_base<
+    //         base::populate_conversions<
     //             // pass conversion type_lists here
     //         >(cfg);
     //     }
@@ -185,8 +185,6 @@ namespace vast {
     template< typename derived, template< typename > typename base >
     struct ModuleConversionPassMixin : ModuleConversionPassMixinBase< derived, base >
     {
-        void populate_conversions(base_conversion_config &cfg) {}
-
         base_conversion_config make_config() {
             auto &ctx = this->getContext();
             return { rewrite_pattern_set(&ctx), derived::create_conversion_target(ctx) };
@@ -209,7 +207,7 @@ namespace vast {
     //     }
     //
     //     static void populate_conversions(llvm_conversion_config &patterns) {
-    //         base::populate_conversions_base<
+    //         base::populate_conversions<
     //             // pass conversion type_lists here
     //         >(cfg);
     //     }

diff --git a/lib/vast/Conversion/Core/ToLLVM.cpp b/lib/vast/Conversion/Core/ToLLVM.cpp
@@ -259,7 +259,10 @@ namespace vast
 
     } //namespace pattern
 
-    struct CoreToLLVMPass : ModuleConversionPassMixin< CoreToLLVMPass, CoreToLLVMBase > {
+    struct CoreToLLVMPass : ModuleConversionPassMixin< CoreToLLVMPass, CoreToLLVMBase >
+    {
+        using base = ModuleConversionPassMixin< CoreToLLVMPass, CoreToLLVMBase >;
+
         static conversion_target create_conversion_target(mcontext_t &context) {
             conversion_target target(context);
 
@@ -271,7 +274,7 @@ namespace vast
         }
 
         static void populate_conversions(auto &cfg) {
-            populate_conversions_base< pattern::bin_lop_conversions >(cfg);
+            base::populate_conversions< pattern::bin_lop_conversions >(cfg);
         }
 
         void run_after_conversion() {

diff --git a/lib/vast/Conversion/FromHL/EmitLazyRegions.cpp b/lib/vast/Conversion/FromHL/EmitLazyRegions.cpp
@@ -127,6 +127,8 @@ namespace vast
     struct HLEmitLazyRegionsPass
         : ModuleConversionPassMixin< HLEmitLazyRegionsPass, HLEmitLazyRegionsBase >
     {
+        using base = ModuleConversionPassMixin< HLEmitLazyRegionsPass, HLEmitLazyRegionsBase >;
+
         static conversion_target create_conversion_target(mcontext_t &context) {
             conversion_target target(context);
             target.addLegalDialect< vast::core::CoreDialect >();
@@ -135,7 +137,7 @@ namespace vast
         }
 
         static void populate_conversions(auto &cfg) {
-            populate_conversions_base< bin_lop_conversions >(cfg);
+            base::populate_conversions< bin_lop_conversions >(cfg);
         }
     };
 

diff --git a/lib/vast/Conversion/FromHL/ToHLBI.cpp b/lib/vast/Conversion/FromHL/ToHLBI.cpp
@@ -409,18 +409,16 @@ namespace vast::conv {
 
     struct HLToHLBIPass : ModuleConversionPassMixin< HLToHLBIPass, HLToHLBIBase >
     {
+        using base = ModuleConversionPassMixin< HLToHLBIPass, HLToHLBIBase >;
+
         static conversion_target create_conversion_target(mcontext_t &context) {
             conversion_target target(context);
             target.addLegalDialect< hlbi::HLBuiltinDialect >();
             return target;
         }
 
         static void populate_conversions(auto &cfg) {
-            populate_conversions_base<
-                util::type_list<
-                    convert_builtin_operation< hl::CallOp >
-                >
-            >(cfg);
+            base::populate_conversions< convert_builtin_operation< hl::CallOp > >(cfg);
         }
     };
 } // namespace vast::conv

diff --git a/lib/vast/Conversion/FromHL/ToLLCF.cpp b/lib/vast/Conversion/FromHL/ToLLCF.cpp
@@ -499,6 +499,8 @@ namespace vast::conv {
 
     struct HLToLLCF : ModuleConversionPassMixin< HLToLLCF, HLToLLCFBase >
     {
+        using base = ModuleConversionPassMixin< HLToLLCF, HLToLLCFBase >;
+
         static auto create_conversion_target(mcontext_t &mctx) {
             mlir::ConversionTarget trg(mctx);
             trg.addLegalDialect< ll::LowLevelDialect >();
@@ -516,7 +518,7 @@ namespace vast::conv {
         }
 
         static void populate_conversions(auto &cfg) {
-            populate_conversions_base< pattern::cf_patterns >(cfg);
+            base::populate_conversions< pattern::cf_patterns >(cfg);
         }
 
         void run_after_conversion() {

diff --git a/lib/vast/Conversion/FromHL/ToLLFunc.cpp b/lib/vast/Conversion/FromHL/ToLLFunc.cpp
@@ -36,16 +36,17 @@ namespace vast::conv::hltollfunc
         };
     } // namespace pattern
 
-    struct HLToLLFunc : ModuleConversionPassMixin< HLToLLFunc, HLToLLFuncBase > {
-        using base   = ModuleConversionPassMixin< HLToLLFunc, HLToLLFuncBase >;
+    struct HLToLLFunc : ModuleConversionPassMixin< HLToLLFunc, HLToLLFuncBase >
+    {
+        using base = ModuleConversionPassMixin< HLToLLFunc, HLToLLFuncBase >;
 
         static conversion_target create_conversion_target(mcontext_t &context) {
             conversion_target target(context);
             return target;
         }
 
         static void populate_conversions(auto &cfg) {
-            base::populate_conversions_base< util::type_list< pattern::func_op > >(cfg);
+            base::populate_conversions< pattern::func_op >(cfg);
         }
     };
 } // namespace vast::conv::hltollfunc

diff --git a/lib/vast/Conversion/ToLLVM/IRsToLLVM.cpp b/lib/vast/Conversion/ToLLVM/IRsToLLVM.cpp
@@ -1560,7 +1560,7 @@ namespace vast::conv::irstollvm
         }
 
         static void populate_conversions(auto &cfg) {
-            base::populate_conversions_base<
+            base::populate_conversions<
                 one_to_one_conversions,
                 shift_conversions,
                 inline_region_from_op_conversions,
@@ -1581,7 +1581,6 @@ namespace vast::conv::irstollvm
         static void set_lower_to_llvm_options(lower_to_llvm_options &llvm_options) {
             llvm_options.useBarePtrCallConv = true;
         }
-
     };
 } // namespace vast::conv