treewide: Add attribute utilities.

trailofbits · Mar 12, 2024 · cc4f69d · cc4f69d
1 parent 00ea4aa
commit cc4f69d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/include/vast/Util/Attribute.hpp b/include/vast/Util/Attribute.hpp
@@ -0,0 +1,17 @@
+// Copyright (c) 2024, Trail of Bits, Inc.
+
+#pragma once
+
+namespace vast::util
+{
+    template< typename attribute_type >
+    attribute_type get_attr(auto op) {
+        return op->template getAttrOfType< attribute_type >(attribute_type::getMnemonic());
+    }
+
+    template< typename attribute_type >
+    bool has_attr(auto op) {
+        return op->hasAttr(attribute_type::getMnemonic());
+    }
+
+} // namespace vast::util
diff --git a/lib/vast/Conversion/FromHL/ToHLBI.cpp b/lib/vast/Conversion/FromHL/ToHLBI.cpp
@@ -17,6 +17,7 @@ VAST_UNRELAX_WARNINGS
 #include "vast/Conversion/Common/Patterns.hpp"
 #include "vast/Conversion/Common/Rewriter.hpp"
 
+#include "vast/Util/Attribute.hpp"
 #include "vast/Util/Common.hpp"
 #include "vast/Util/DialectConversion.hpp"
 #include "vast/Util/TypeList.hpp"
@@ -62,12 +63,12 @@ namespace vast::conv {
         }
         auto callee = caller.resolveCallable();
 
-        auto attr = callee->template getAttrOfType< hl::BuiltinAttr >("builtin");
+        auto attr = util::get_attr< hl::BuiltinAttr >(callee);
         if (!attr) {
             return mlir::failure();
         }
 
-        auto id = attr.getID();
+        auto id = mlir::cast< hl::BuiltinAttr >(attr).getID();
         VAST_CHECK(id != 0, "Attempting to visit builtin expr that is not builtin (id is 0).");
 
         switch (id) {

diff --git a/lib/vast/Dialect/HighLevel/Transforms/UDE.cpp b/lib/vast/Dialect/HighLevel/Transforms/UDE.cpp
@@ -17,6 +17,8 @@ VAST_UNRELAX_WARNINGS
 #include <vast/Interfaces/AggregateTypeDefinitionInterface.hpp>
 
 #include <vast/Conversion/Common/Passes.hpp>
+
+#include <vast/Util/Attribute.hpp>
 #include <vast/Util/TypeUtils.hpp>
 
 #include "PassesDetails.hpp"
@@ -53,7 +55,7 @@ namespace vast::hl {
         bool keep(hl::FieldDeclOp op, auto scope) const { return keep(op.getParentAggregate(), scope); }
 
         bool keep(hl::FuncOp op, auto scope) const {
-            return !op.isDeclaration() && !op->hasAttr( hl::AlwaysInlineAttr::getMnemonic() );
+            return !op.isDeclaration() && !util::has_attr< hl::AlwaysInlineAttr >(op);
         }
 
         bool keep(hl::VarDeclOp op, auto scope) const {