Apply review feedback

Author: andykaylor

clang/include/clang/CIR/Dialect/IR/CIRAttrs.td

@@ -643,8 +643,9 @@ def CIR_DynamicCastInfoAttr : CIR_Attr<"DynamicCastInfo", "dyn_cast_info"> {
   let genVerifyDecl = 1;
   let assemblyFormat = [{
     `<`
-      qualified($srcRtti) `,` qualified($destRtti) `,`
-      $runtimeFunc `,` $badCastFunc `,` qualified($offsetHint)
+      `srcRtti` `=` qualified($srcRtti) `,` `destRtti` `=` qualified($destRtti)
+      `,` `runtimeFunc` `=` $runtimeFunc `,` `badCastFunc` `=` $badCastFunc `,`
+      `offsetHint` `=` qualified($offsetHint)
     `>`
   }];
 

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -285,11 +285,11 @@ def CIR_DynamicCastOp : CIR_Op<"dyn_cast"> {
               -> !cir.ptr<!rec_Derived>
     %2 = cir.dyn_cast ref %r : !cir.ptr<!rec_Base> -> !cir.ptr<!rec_Derived>
               #cir.dyn_cast_info<
-                #cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>,
-                #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>,
-                @__dynamic_cast,
-                @__cxa_bad_cast,
-                #cir.int<0> : !s64i
+                srcRtti = #cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>,
+                destRtti = #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>,
+                runtimeFunc = @__dynamic_cast,
+                badCastFunc = @__cxa_bad_cast,
+                offsetHint = #cir.int<0> : !s64i
               >
     ```
   }];
@@ -313,7 +313,7 @@ def CIR_DynamicCastOp : CIR_Op<"dyn_cast"> {
 
   let extraClassDeclaration = [{
     /// Determine whether this operation models reference casting in C++.
-    bool isRefcast() {
+    bool isRefCast() {
       return getKind() == ::cir::DynamicCastKind::Ref;
     }
 

clang/test/CIR/IR/dynamic-cast.cir

@@ -7,9 +7,9 @@
 !rec_Base = !cir.record<struct "Base" {!cir.vptr}>
 !rec_Derived = !cir.record<struct "Derived" {!rec_Base}>
 
-#dyn_cast_info__ZTI4Base__ZTI7Derived = #cir.dyn_cast_info<#cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>, #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>, @__dynamic_cast, @__cxa_bad_cast, #cir.int<0> : !s64i>
+#dyn_cast_info__ZTI4Base__ZTI7Derived = #cir.dyn_cast_info<srcRtti = #cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>, destRtti = #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>, runtimeFunc = @__dynamic_cast, badCastFunc = @__cxa_bad_cast, offsetHint = #cir.int<0> : !s64i>
 
-// CHECK: #dyn_cast_info__ZTI4Base__ZTI7Derived = #cir.dyn_cast_info<#cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>, #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>, @__dynamic_cast, @__cxa_bad_cast, #cir.int<0> : !s64i>
+// CHECK: #dyn_cast_info__ZTI4Base__ZTI7Derived = #cir.dyn_cast_info<srcRtti = #cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>, destRtti = #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>, runtimeFunc = @__dynamic_cast, badCastFunc = @__cxa_bad_cast, offsetHint = #cir.int<0> : !s64i>
 
 module {
   cir.global "private" constant external @_ZTI4Base : !cir.ptr<!u8i>

clang/test/CIR/IR/invalid-dyn-cast.cir

@@ -16,7 +16,7 @@ module {
   cir.func private @__cxa_bad_cast()
   cir.func @test(%arg0 : !cir.ptr<!Base>) {
     // expected-error@+1 {{srcRtti must be an RTTI pointer}}
-    %0 = cir.dyn_cast ptr %arg0 : !cir.ptr<!Base> -> !cir.ptr<!Derived> #cir.dyn_cast_info<#cir.global_view<@_ZTI4Base> : !cir.ptr<!u32i>, #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>, @__dynamic_cast, @__cxa_bad_cast, #cir.int<0> : !s64i>
+    %0 = cir.dyn_cast ptr %arg0 : !cir.ptr<!Base> -> !cir.ptr<!Derived> #cir.dyn_cast_info<srcRtti = #cir.global_view<@_ZTI4Base> : !cir.ptr<!u32i>, destRtti = #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>, runtimeFunc = @__dynamic_cast, badCastFunc = @__cxa_bad_cast, offsetHint = #cir.int<0> : !s64i>
   }
 }
 
@@ -38,6 +38,6 @@ module {
   cir.func private @__cxa_bad_cast()
   cir.func @test(%arg0 : !cir.ptr<!Base>) {
     // expected-error@+1 {{destRtti must be an RTTI pointer}}
-    %0 = cir.dyn_cast ptr %arg0 : !cir.ptr<!Base> -> !cir.ptr<!Derived> #cir.dyn_cast_info<#cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>, #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u32i>, @__dynamic_cast, @__cxa_bad_cast, #cir.int<0> : !s64i>
+    %0 = cir.dyn_cast ptr %arg0 : !cir.ptr<!Base> -> !cir.ptr<!Derived> #cir.dyn_cast_info<srcRtti = #cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>, destRtti = #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u32i>, runtimeFunc = @__dynamic_cast, badCastFunc = @__cxa_bad_cast, offsetHint = #cir.int<0> : !s64i>
   }
 }