Apply more review feedback

Author: andykaylor

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

@@ -610,42 +610,44 @@ def CIR_DynamicCastInfoAttr : CIR_Attr<"DynamicCastInfo", "dyn_cast_info"> {
   let description = [{
     Provide ABI specific information about a dynamic cast operation.
 
-    The `srcRtti` and the `destRtti` parameters give the RTTI of the source
+    The `src_rtti` and the `dest_rtti` parameters give the RTTI of the source
     record type and the destination record type, respectively.
 
-    The `runtimeFunc` parameter gives the `__dynamic_cast` function which is
-    provided by the runtime. The `badCastFunc` parameter gives the
+    The `runtime_func` parameter gives the `__dynamic_cast` function which is
+    provided by the runtime. The `bad_cast_func` parameter gives the
     `__cxa_bad_cast` function which is also provided by the runtime.
 
-    The `offsetHint` parameter gives the hint value that should be passed to the
-    `__dynamic_cast` runtime function.
+    The `offset_hint` parameter gives the hint value that should be passed to
+    the `__dynamic_cast` runtime function.
   }];
 
   let parameters = (ins
-    CIR_GlobalViewAttr:$srcRtti,
-    CIR_GlobalViewAttr:$destRtti,
-    "mlir::FlatSymbolRefAttr":$runtimeFunc,
-    "mlir::FlatSymbolRefAttr":$badCastFunc,
-    CIR_IntAttr:$offsetHint
+    CIR_GlobalViewAttr:$src_rtti,
+    CIR_GlobalViewAttr:$dest_rtti,
+    "mlir::FlatSymbolRefAttr":$runtime_func,
+    "mlir::FlatSymbolRefAttr":$bad_cast_func,
+    CIR_IntAttr:$offset_hint
   );
 
   let builders = [
-    AttrBuilderWithInferredContext<(ins "GlobalViewAttr":$srcRtti,
-                                        "GlobalViewAttr":$destRtti,
-                                        "mlir::FlatSymbolRefAttr":$runtimeFunc,
-                                        "mlir::FlatSymbolRefAttr":$badCastFunc,
-                                        "IntAttr":$offsetHint), [{
-      return $_get(srcRtti.getContext(), srcRtti, destRtti, runtimeFunc,
-                   badCastFunc, offsetHint);
+    AttrBuilderWithInferredContext<(ins "GlobalViewAttr":$src_rtti,
+                                        "GlobalViewAttr":$dest_rtti,
+                                        "mlir::FlatSymbolRefAttr":$runtime_func,
+                                        "mlir::FlatSymbolRefAttr":$bad_cast_func,
+                                        "IntAttr":$offset_hint), [{
+      return $_get(src_rtti.getContext(), src_rtti, dest_rtti, runtime_func,
+                   bad_cast_func, offset_hint);
     }]>,
   ];
 
   let genVerifyDecl = 1;
   let assemblyFormat = [{
     `<`
-      `srcRtti` `=` qualified($srcRtti) `,` `destRtti` `=` qualified($destRtti)
-      `,` `runtimeFunc` `=` $runtimeFunc `,` `badCastFunc` `=` $badCastFunc `,`
-      `offsetHint` `=` qualified($offsetHint)
+      struct(qualified($src_rtti),
+             qualified($dest_rtti),
+             $runtime_func,
+             $bad_cast_func,
+             qualified($offset_hint))
     `>`
   }];
 

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<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>
+#dyn_cast_info__ZTI4Base__ZTI7Derived = #cir.dyn_cast_info<src_rtti = #cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>, dest_rtti = #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>, runtime_func = @__dynamic_cast, bad_cast_func = @__cxa_bad_cast, offset_hint = #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>
+// CHECK: #dyn_cast_info__ZTI4Base__ZTI7Derived = #cir.dyn_cast_info<src_rtti = #cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>, dest_rtti = #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>, runtime_func = @__dynamic_cast, bad_cast_func = @__cxa_bad_cast, offset_hint = #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<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>
+    %0 = cir.dyn_cast ptr %arg0 : !cir.ptr<!Base> -> !cir.ptr<!Derived> #cir.dyn_cast_info<src_rtti = #cir.global_view<@_ZTI4Base> : !cir.ptr<!u32i>, dest_rtti = #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u8i>, runtime_func = @__dynamic_cast, bad_cast_func = @__cxa_bad_cast, offset_hint = #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<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>
+    %0 = cir.dyn_cast ptr %arg0 : !cir.ptr<!Base> -> !cir.ptr<!Derived> #cir.dyn_cast_info<src_rtti = #cir.global_view<@_ZTI4Base> : !cir.ptr<!u8i>, dest_rtti = #cir.global_view<@_ZTI7Derived> : !cir.ptr<!u32i>, runtime_func = @__dynamic_cast, bad_cast_func = @__cxa_bad_cast, offset_hint = #cir.int<0> : !s64i>
   }
 }