hl: Let RecordDecl use SymbolNameAttr.

trailofbits · Sep 9, 2024 · 36273f2 · 36273f2
1 parent fc29b8c
commit 36273f2
Show file tree

Hide file tree

Showing 37 changed files with 75 additions and 75 deletions.
diff --git a/include/vast/Dialect/HighLevel/HighLevelOps.td b/include/vast/Dialect/HighLevel/HighLevelOps.td
@@ -257,7 +257,7 @@ class HighLevel_RecordLikeDeclOp< string mnemonic, list< Trait > traits = [] >
           DeclareOpInterfaceMethods< AggregateTypeDefinition >
         ])
       >
-    , Arguments<(ins StrAttr:$name)>
+    , Arguments<(ins SymbolNameAttr:$sym_name)>
 {
   let regions = (region AnyRegion:$fields);
 
@@ -293,14 +293,14 @@ class HighLevel_RecordLikeDeclOp< string mnemonic, list< Trait > traits = [] >
         return hl::get_nested_declarations(*this);
     }
 
-    llvm::StringRef $cppClass::getDefinedName() { return this->getName(); }
+    llvm::StringRef $cppClass::getDefinedName() { return this->getSymName(); }
 
     mlir::Type $cppClass::getDefinedType() {
       return hl::RecordType::get(getContext(), getDefinedName());
     }
   }];
 
-  let assemblyFormat = [{ $name attr-dict `:` $fields }];
+  let assemblyFormat = [{ $sym_name attr-dict `:` $fields }];
 }
 
 def HighLevel_StructDeclOp

diff --git a/lib/vast/Dialect/HighLevel/HighLevelOps.cpp b/lib/vast/Dialect/HighLevel/HighLevelOps.cpp
@@ -428,7 +428,7 @@ namespace vast::hl
             Builder &bld, State &st, llvm::StringRef name,
             maybe_builder_callback_ref fields
         ) {
-            st.addAttribute("name", bld.getStringAttr(name));
+            st.addAttribute("sym_name", bld.getStringAttr(name));
 
             InsertionGuard guard(bld);
             build_region(bld, st, fields);
@@ -439,7 +439,7 @@ namespace vast::hl
             maybe_builder_callback_ref bases,
             maybe_builder_callback_ref fields
         ) {
-            st.addAttribute("name", bld.getStringAttr(name));
+            st.addAttribute("sym_name", bld.getStringAttr(name));
 
             InsertionGuard guard(bld);
             build_region(bld, st, bases);

diff --git a/test/vast/Dialect/HighLevel/attr-f.c b/test/vast/Dialect/HighLevel/attr-f.c
@@ -1,7 +1,7 @@
 // RUN: %vast-front -vast-emit-mlir=hl -o - %s | %file-check %s
 // RUN: %vast-front -vast-emit-mlir=hl -o - %s > %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.union "u" {hl.transparent_union = #hl.transparent_union}
+// CHECK: hl.union @u {hl.transparent_union = #hl.transparent_union}
 union u {
     int *a;
     char *b;

diff --git a/test/vast/Dialect/HighLevel/enum-e.c b/test/vast/Dialect/HighLevel/enum-e.c
@@ -1,7 +1,7 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.struct "Element"
+// CHECK: hl.struct @Element
 // CHECK:  hl.field "z" : !hl.int
 // CHECK:  hl.enum @State : !hl.int< unsigned >
 // CHECK:   hl.enum.const @SOLID

diff --git a/test/vast/Dialect/HighLevel/indirect-call-a.c b/test/vast/Dialect/HighLevel/indirect-call-a.c
@@ -15,7 +15,7 @@ typedef ck_rv_t (*ck_lockmutex_t) (void *mutex);
 // CHECK: hl.typedef @ck_unlockmutex_t : !hl.ptr<!hl.paren<!core.fn<(!hl.lvalue<!hl.ptr<!hl.void>>) -> (!hl.elaborated<!hl.typedef<"ck_rv_t">>)>>>
 typedef ck_rv_t (*ck_unlockmutex_t) (void *mutex);
 
-// CHECK: hl.struct "ck_c_initialize_args"
+// CHECK: hl.struct @ck_c_initialize_args
 struct ck_c_initialize_args
 {
     // CHECK: hl.field "create_mutex" : !hl.elaborated<!hl.typedef<"ck_createmutex_t">>

diff --git a/test/vast/Dialect/HighLevel/libc-locale.c b/test/vast/Dialect/HighLevel/libc-locale.c
@@ -3,5 +3,5 @@
 
 // CHECK-DAG: hl.func @setlocale
 // CHECK-DAG: hl.func @localeconv
-// CHECK-DAG: hl.struct "lconv"
+// CHECK-DAG: hl.struct @lconv
 #include <locale.h>
diff --git a/test/vast/Dialect/HighLevel/libc-time.c b/test/vast/Dialect/HighLevel/libc-time.c
@@ -11,8 +11,8 @@
 // CHECK-DAG: hl.func @gmtime
 // CHECK-DAG: hl.func @localtime
 
-// CHECK-DAG: hl.struct "tm"
-// CHECK-DAG: hl.struct "timespec"
+// CHECK-DAG: hl.struct @tm
+// CHECK-DAG: hl.struct @timespec
 // CHECK-DAG: hl.typedef @time_t
 // CHECK-DAG: hl.typedef @clock_t
 

diff --git a/test/vast/Dialect/HighLevel/qualifiers-i.c b/test/vast/Dialect/HighLevel/qualifiers-i.c
@@ -1,7 +1,7 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.union "u"
+// CHECK: hl.union @u
 union u { int i; double d; };
 
 // CHECK: hl.var @v : !hl.lvalue<!hl.elaborated<!hl.record<"u">>>

diff --git a/test/vast/Dialect/HighLevel/quirks-a.c b/test/vast/Dialect/HighLevel/quirks-a.c
@@ -3,9 +3,9 @@
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
-// CHECK: hl.struct "foo"
+// CHECK: hl.struct @foo
 struct foo {
-    // CHECK: hl.struct "bar"
+    // CHECK: hl.struct @bar
     struct bar {
         int x;
     } baz;

diff --git a/test/vast/Dialect/HighLevel/quirks-i.c b/test/vast/Dialect/HighLevel/quirks-i.c
@@ -3,14 +3,14 @@
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
-// CHECK: hl.struct "foo"
+// CHECK: hl.struct @foo
 struct foo {
     // CHECK: hl.field "x" : !hl.int
     // CHECK: hl.field "y" : !hl.int
     int x, y;
 };
 
-// CHECK: hl.struct "lots_of_inits"
+// CHECK: hl.struct @lots_of_inits
 struct lots_of_inits {
     // CHECK: hl.field "z" : !hl.array<2, !hl.elaborated<!hl.record<"foo">>>
     struct foo z[2];

diff --git a/test/vast/Dialect/HighLevel/quirks-j.c b/test/vast/Dialect/HighLevel/quirks-j.c
@@ -3,7 +3,7 @@
 
 // adapted from https://gist.github.com/fay59/5ccbe684e6e56a7df8815c3486568f01
 
-// CHECK: hl.struct "bitfield"
+// CHECK: hl.struct @bitfield
 struct bitfield {
     // CHECK: hl.field "x" bw 3 : !hl.int< unsigned >
     unsigned x: 3;

diff --git a/test/vast/Dialect/HighLevel/quirks-n.c b/test/vast/Dialect/HighLevel/quirks-n.c
@@ -7,7 +7,7 @@
 short typedef signed s16;
 // CHECK: hl.typedef @u32 : !hl.int< unsigned >
 unsigned int typedef u32;
-// CHECK: hl.struct "foo"
+// CHECK: hl.struct @foo
 // CHECK:   hl.field "bar" : !hl.int
 // CHECK: hl.typedef @baz : !hl.elaborated<!hl.record<"foo">,  const >
 struct foo { int bar; } const typedef baz;

diff --git a/test/vast/Dialect/HighLevel/struct-a.c b/test/vast/Dialect/HighLevel/struct-a.c
@@ -1,10 +1,10 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.struct "empty"
+// CHECK: hl.struct @empty
 struct empty {};
 
-// CHECK: hl.struct "pair" : {
+// CHECK: hl.struct @pair : {
 // CHECK:  hl.field "a" : !hl.int
 // CHECK:  hl.field "b" : !hl.int
 // CHECK: }
@@ -17,14 +17,14 @@ struct pair p;
 
 struct forward;
 
-// CHECK: hl.struct "forward" : {
+// CHECK: hl.struct @forward : {
 // CHECK:  hl.field "a" : !hl.int
 // CHECK: }
 struct forward {
   int a;
 };
 
-// CHECK: hl.struct "wrap" : {
+// CHECK: hl.struct @wrap : {
 // CHECK:  hl.field "v" : !hl.int
 // CHECK: }
 
@@ -36,7 +36,7 @@ typedef struct wrap {
 // CHECK: hl.var @w : !hl.lvalue<!hl.elaborated<!hl.typedef<"wrap_t">>>
 wrap_t w;
 
-// CHECK: hl.struct "compound" : {
+// CHECK: hl.struct @compound : {
 // CHECK:  hl.field "e" : !hl.elaborated<!hl.record<"empty">>
 // CHECK:  hl.field "w" : !hl.elaborated<!hl.typedef<"wrap_t">>
 // CHECK: }

diff --git a/test/vast/Dialect/HighLevel/struct-b.c b/test/vast/Dialect/HighLevel/struct-b.c
@@ -1,7 +1,7 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.struct "node" : {
+// CHECK: hl.struct @node : {
 // CHECK:  hl.field "data" : !hl.int
 // CHECK:  hl.field "left" : !hl.ptr<!hl.elaborated<!hl.record<"node">>>
 // CHECK:  hl.field "right" : !hl.ptr<!hl.elaborated<!hl.record<"node">>>

diff --git a/test/vast/Dialect/HighLevel/struct-c.c b/test/vast/Dialect/HighLevel/struct-c.c
@@ -1,7 +1,7 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.struct "[[N:anonymous\[[0-9]+\]]]" : {
+// CHECK: hl.struct @"[[N:anonymous\[[0-9]+\]]]" : {
 // CHECK:  hl.field "data" : !hl.int
 // CHECK: }
 // CHECK: hl.var @named : !hl.lvalue<!hl.elaborated<!hl.record<"[[N]]">>>

diff --git a/test/vast/Dialect/HighLevel/struct-d.c b/test/vast/Dialect/HighLevel/struct-d.c
@@ -12,7 +12,7 @@
 struct s* p = 0;
 
 // definition for the struct pointed to by p
-// CHECK: hl.struct "s" : {
+// CHECK: hl.struct @s : {
 // CHECK:  hl.field "a" : !hl.int
 // CHECK: }
 struct s { int a; };

diff --git a/test/vast/Dialect/HighLevel/struct-e.c b/test/vast/Dialect/HighLevel/struct-e.c
@@ -1,7 +1,7 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.struct "s" : {
+// CHECK: hl.struct @s : {
 // CHECK:  hl.field "a" : !hl.int
 // CHECK:  hl.field "b" : !hl.short
 // CHECK: }

diff --git a/test/vast/Dialect/HighLevel/struct-f.c b/test/vast/Dialect/HighLevel/struct-f.c
@@ -1,10 +1,10 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.struct "X"
+// CHECK: hl.struct @X
 struct X {};
 
-// CHECK: hl.struct "Y"
+// CHECK: hl.struct @Y
 // CHECK: hl.typedef @X : !hl.elaborated<!hl.record<"Y">>
 typedef struct Y {} X;
 

diff --git a/test/vast/Dialect/HighLevel/union-a.c b/test/vast/Dialect/HighLevel/union-a.c
@@ -1,7 +1,7 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.union "u" : {
+// CHECK: hl.union @u : {
 // CHECK:   hl.field "u32" : !hl.int< unsigned >
 // CHECK:   hl.field "u16" : !hl.array<2, !hl.short< unsigned >>
 // CHECK:   hl.field "u8" : !hl.char< unsigned >

diff --git a/test/vast/Dialect/HighLevel/union-b.c b/test/vast/Dialect/HighLevel/union-b.c
@@ -1,16 +1,16 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl -std=c11 %s -o - | %file-check %s
 // RUN: %vast-cc1 -vast-emit-mlir=hl -std=c11 %s -o %t && %vast-opt %t | diff -B %t -
 
-// CHECK: hl.struct "v"
+// CHECK: hl.struct @v
 struct v {
-   // CHECK: hl.union "[[N1:anonymous\[[0-9]+\]]]"
+   // CHECK: hl.union @"[[N1:anonymous\[[0-9]+\]]]"
    union { // anonymous union
-      // CHECK: hl.struct "[[N2:anonymous\[[0-9]+\]]]"
+      // CHECK: hl.struct @"[[N2:anonymous\[[0-9]+\]]]"
       // CHECK:    hl.field "i" : !hl.int
       // CHECK:    hl.field "j" : !hl.int
       // CHECK: hl.field "[[N3:anonymous\[[0-9]+\]]]" : !hl.record<"[[N2]]">
       struct { int i, j; }; // anonymous structure
-      // CHECK: hl.struct "[[N4:anonymous\[[0-9]+\]]]"
+      // CHECK: hl.struct @"[[N4:anonymous\[[0-9]+\]]]"
       // CHECK:   hl.field "k" : !hl.long
       // CHECK:   hl.field "l" : !hl.long
       // CHECK: hl.field "w" : !hl.elaborated<!hl.record<"[[N4]]">>

diff --git a/test/vast/Transform/HL/LowerTypes/struct-access-a.c b/test/vast/Transform/HL/LowerTypes/struct-access-a.c
@@ -1,6 +1,6 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types | %file-check %s
 
-// CHECK:  hl.struct "X" : {
+// CHECK:  hl.struct @X : {
 // CHECK:    hl.field "member_x" : si32
 // CHECK:    hl.field "member_y" : si32
 // CHECK:  }

diff --git a/test/vast/Transform/HL/UDE/func-e.c b/test/vast/Transform/HL/UDE/func-e.c
@@ -1,12 +1,12 @@
 // RUN: %vast-front -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-ude | %file-check %s
 
-// CHECK-NOT: hl.struct "unused"
+// CHECK-NOT: hl.struct @unused
 struct unused {};
 
 // CHECK-NOT: hl.typedef @unused_t
 typedef struct unused unused_t;
 
-// CHECK-NOT: hl.struct "unused_rty"
+// CHECK-NOT: hl.struct @unused_rty
 struct unused_rty {};
 
 // CHECK-NOT: hl.typedef @unused_rty_t

diff --git a/test/vast/Transform/HL/UDE/func-f.c b/test/vast/Transform/HL/UDE/func-f.c
@@ -1,12 +1,12 @@
 // RUN: %vast-front -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-ude | %file-check %s
 
-// CHECK-NOT: hl.struct "unused"
+// CHECK-NOT: hl.struct @unused
 struct unused {};
 
 // CHECK-NOT: hl.typedef @unused_t
 typedef struct unused unused_t;
 
-// CHECK-NOT: hl.struct "unused_rty"
+// CHECK-NOT: hl.struct @unused_rty
 struct unused_rty {};
 
 // CHECK-NOT: hl.typedef @unused_rty_t

diff --git a/test/vast/Transform/HL/UDE/func-g.c b/test/vast/Transform/HL/UDE/func-g.c
@@ -1,9 +1,9 @@
 // RUN: %vast-front -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-ude | %file-check %s
 
-// CHECK-NOT: hl.struct "unused"
+// CHECK-NOT: hl.struct @unused
 struct unused {};
 
-// CHECK: hl.struct "used"
+// CHECK: hl.struct @used
 struct used {};
 
 // CHECK-NOT: hl.func @inlined
@@ -15,4 +15,4 @@ __attribute__((always_inline)) void inlined() {
 // CHECK: hl.func @not_inlined
 void not_inlined() {
     struct used u;
-}
+}
diff --git a/test/vast/Transform/HL/UDE/struct-a.c b/test/vast/Transform/HL/UDE/struct-a.c
@@ -1,11 +1,11 @@
 // RUN: %vast-front -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-ude | %file-check %s
 
-// CHECK: hl.struct "used"
+// CHECK: hl.struct @used
 struct used {};
 
-// CHECK-NOT: hl.struct "unused"
+// CHECK-NOT: hl.struct @unused
 struct unused {};
 
 int main() {
     struct used u;
-}
+}
diff --git a/test/vast/Transform/HL/UDE/struct-b.c b/test/vast/Transform/HL/UDE/struct-b.c
@@ -1,13 +1,13 @@
 // RUN: %vast-front -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-ude | %file-check %s
 
-// CHECK: hl.struct "used"
+// CHECK: hl.struct @used
 struct used {};
 
-// CHECK-NOT: hl.struct "unused"
+// CHECK-NOT: hl.struct @unused
 struct unused {
     struct used d;
 };
 
 int main() {
     struct used u;
-}
+}
diff --git a/test/vast/Transform/HL/UDE/struct-c.c b/test/vast/Transform/HL/UDE/struct-c.c
@@ -1,19 +1,19 @@
 // RUN: %vast-front -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-ude | %file-check %s
 
-// CHECK: hl.struct "used"
+// CHECK: hl.struct @used
 struct used {};
 
-// CHECK: hl.struct "depedent"
+// CHECK: hl.struct @depedent
 struct depedent
 {
     struct used u;
 };
 
-// CHECK-NOT: hl.struct "unused"
+// CHECK-NOT: hl.struct @unused
 struct unused {
     struct used u;
 };
 
 int main() {
     struct depedent d;
-}
+}
diff --git a/test/vast/Transform/HL/UDE/struct-d.c b/test/vast/Transform/HL/UDE/struct-d.c
@@ -1,11 +1,11 @@
 // RUN: %vast-front -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-ude | %file-check %s
 
-// CHECK-NOT: hl.struct "in_unused"
+// CHECK-NOT: hl.struct @in_unused
 struct in_unused {};
 
-// CHECK-NOT: hl.struct "dependent_unused"
+// CHECK-NOT: hl.struct @dependent_unused
 struct dependent_unused {
     struct in_unused d;
 };
 
-int main() {}
+int main() {}