Skip to content

Commit a725efb

Browse files
andykaylorandykaylor
authored
[CIR] Backport changes to DynamicCastInfoAttr (#1941)
This backports some minor changes to DynamicCastInfoAttr that were suggested during the upstreaming review. Specifically, the parameter names are changed to snake_case and the assembly format uses `struct()`.
1 parent c45b338 commit a725efb

File tree

4 files changed

+80
-24
lines changed

4 files changed

+80
-24
lines changed

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

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -918,42 +918,39 @@ def CIR_DynamicCastInfoAttr : CIR_Attr<"DynamicCastInfo", "dyn_cast_info"> {
918918
let description = [{
919919
Provide ABI specific information about a dynamic cast operation.
920920

921-
The `srcRtti` and the `destRtti` parameters give the RTTI of the source
921+
The `src_rtti` and the `dest_rtti` parameters give the RTTI of the source
922922
record type and the destination record type, respectively.
923923

924-
The `runtimeFunc` parameter gives the `__dynamic_cast` function which is
925-
provided by the runtime. The `badCastFunc` parameter gives the
924+
The `runtime_func` parameter gives the `__dynamic_cast` function which is
925+
provided by the runtime. The `bad_cast_func` parameter gives the
926926
`__cxa_bad_cast` function which is also provided by the runtime.
927927

928-
The `offsetHint` parameter gives the hint value that should be passed to the
929-
`__dynamic_cast` runtime function.
928+
The `offset_hint` parameter gives the hint value that should be passed to
929+
the `__dynamic_cast` runtime function.
930930
}];
931931

932932
let parameters = (ins
933-
CIR_GlobalViewAttr:$srcRtti,
934-
CIR_GlobalViewAttr:$destRtti,
935-
"mlir::FlatSymbolRefAttr":$runtimeFunc,
936-
"mlir::FlatSymbolRefAttr":$badCastFunc,
937-
CIR_IntAttr:$offsetHint
933+
CIR_GlobalViewAttr:$src_rtti,
934+
CIR_GlobalViewAttr:$dest_rtti,
935+
"mlir::FlatSymbolRefAttr":$runtime_func,
936+
"mlir::FlatSymbolRefAttr":$bad_cast_func,
937+
CIR_IntAttr:$offset_hint
938938
);
939939

940940
let builders = [
941-
AttrBuilderWithInferredContext<(ins "GlobalViewAttr":$srcRtti,
942-
"GlobalViewAttr":$destRtti,
943-
"mlir::FlatSymbolRefAttr":$runtimeFunc,
944-
"mlir::FlatSymbolRefAttr":$badCastFunc,
945-
"IntAttr":$offsetHint), [{
946-
return $_get(srcRtti.getContext(), srcRtti, destRtti, runtimeFunc,
947-
badCastFunc, offsetHint);
941+
AttrBuilderWithInferredContext<(ins "GlobalViewAttr":$src_rtti,
942+
"GlobalViewAttr":$dest_rtti,
943+
"mlir::FlatSymbolRefAttr":$runtime_func,
944+
"mlir::FlatSymbolRefAttr":$bad_cast_func,
945+
"IntAttr":$offset_hint), [{
946+
return $_get(src_rtti.getContext(), src_rtti, dest_rtti, runtime_func,
947+
bad_cast_func, offset_hint);
948948
}]>,
949949
];
950950

951951
let genVerifyDecl = 1;
952952
let assemblyFormat = [{
953-
`<`
954-
qualified($srcRtti) `,` qualified($destRtti) `,`
955-
$runtimeFunc `,` $badCastFunc `,` qualified($offsetHint)
956-
`>`
953+
`<` struct(qualified($src_rtti), qualified($dest_rtti), $runtime_func, $bad_cast_func, qualified($offset_hint)) `>`
957954
}];
958955

959956
let extraClassDeclaration = [{

‎clang/test/CIR/CodeGen/dynamic-cast.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct Base {
99

1010
struct Derived : Base {};
1111

12-
// BEFORE-DAG: #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>
12+
// BEFORE-DAG: #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>
1313
// BEFORE-DAG: !rec_Base = !cir.record
1414
// BEFORE-DAG: !rec_Derived = !cir.record
1515

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

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// RUN: cir-opt --verify-roundtrip %s | FileCheck %s
2+
3+
!s64i = !cir.int<s, 64>
4+
!u8i = !cir.int<u, 8>
5+
!void = !cir.void
6+
7+
!rec_Base = !cir.record<struct "Base" {!cir.vptr}>
8+
!rec_Derived = !cir.record<struct "Derived" {!rec_Base}>
9+
10+
#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>
11+
12+
// 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>
13+
14+
module {
15+
cir.global "private" constant external @_ZTI4Base : !cir.ptr<!u8i>
16+
cir.global "private" constant external @_ZTI7Derived : !cir.ptr<!u8i>
17+
cir.func private @__dynamic_cast(!cir.ptr<!void>, !cir.ptr<!u8i>, !cir.ptr<!u8i>, !s64i) -> !cir.ptr<!void>
18+
cir.func private @__cxa_bad_cast()
19+
20+
cir.func @test_ptr_cast(%arg0: !cir.ptr<!rec_Base>) -> !cir.ptr<!rec_Derived> {
21+
%0 = cir.dyn_cast ptr %arg0 : !cir.ptr<!rec_Base> -> !cir.ptr<!rec_Derived> #dyn_cast_info__ZTI4Base__ZTI7Derived
22+
cir.return %0 : !cir.ptr<!rec_Derived>
23+
}
24+
25+
// CHECK: cir.func @test_ptr_cast(%arg0: !cir.ptr<!rec_Base>) -> !cir.ptr<!rec_Derived> {
26+
// CHECK: %0 = cir.dyn_cast ptr %arg0 : !cir.ptr<!rec_Base> -> !cir.ptr<!rec_Derived> #dyn_cast_info__ZTI4Base__ZTI7Derived
27+
// CHECK: cir.return %0 : !cir.ptr<!rec_Derived>
28+
// CHECK: }
29+
30+
cir.func @test_ref_cast(%arg0: !cir.ptr<!rec_Base>) -> !cir.ptr<!rec_Derived> {
31+
%0 = cir.dyn_cast ref %arg0 : !cir.ptr<!rec_Base> -> !cir.ptr<!rec_Derived> #dyn_cast_info__ZTI4Base__ZTI7Derived
32+
cir.return %0 : !cir.ptr<!rec_Derived>
33+
}
34+
35+
// CHECK: cir.func @test_ref_cast(%arg0: !cir.ptr<!rec_Base>) -> !cir.ptr<!rec_Derived> {
36+
// CHECK: %0 = cir.dyn_cast ref %arg0 : !cir.ptr<!rec_Base> -> !cir.ptr<!rec_Derived> #dyn_cast_info__ZTI4Base__ZTI7Derived
37+
// CHECK: cir.return %0 : !cir.ptr<!rec_Derived>
38+
// CHECK: }
39+
40+
cir.func dso_local @test_cast_to_void(%arg0: !cir.ptr<!rec_Base>) -> !cir.ptr<!void> {
41+
%0 = cir.dyn_cast ptr %arg0 : !cir.ptr<!rec_Base> -> !cir.ptr<!void>
42+
cir.return %0 : !cir.ptr<!void>
43+
}
44+
45+
// CHECK: cir.func dso_local @test_cast_to_void(%arg0: !cir.ptr<!rec_Base>) -> !cir.ptr<!void> {
46+
// CHECK: %0 = cir.dyn_cast ptr %arg0 : !cir.ptr<!rec_Base> -> !cir.ptr<!void>
47+
// CHECK: cir.return %0 : !cir.ptr<!void>
48+
// CHECK: }
49+
50+
cir.func dso_local @test_relative_layout_cast(%arg0: !cir.ptr<!rec_Base>) -> !cir.ptr<!void> {
51+
%0 = cir.dyn_cast ptr relative_layout %arg0 : !cir.ptr<!rec_Base> -> !cir.ptr<!void>
52+
cir.return %0 : !cir.ptr<!void>
53+
}
54+
55+
// CHECK: cir.func dso_local @test_relative_layout_cast(%arg0: !cir.ptr<!rec_Base>) -> !cir.ptr<!void> {
56+
// CHECK: %0 = cir.dyn_cast ptr relative_layout %arg0 : !cir.ptr<!rec_Base> -> !cir.ptr<!void>
57+
// CHECK: cir.return %0 : !cir.ptr<!void>
58+
// CHECK: }
59+
}

‎clang/test/CIR/IR/invalid.cir‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ module {
11921192
cir.func private @__cxa_bad_cast()
11931193
cir.func @test(%arg0 : !cir.ptr<!Base>) {
11941194
// expected-error@+1 {{srcRtti must be an RTTI pointer}}
1195-
%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>
1195+
%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>
11961196
}
11971197
}
11981198

@@ -1214,7 +1214,7 @@ module {
12141214
cir.func private @__cxa_bad_cast()
12151215
cir.func @test(%arg0 : !cir.ptr<!Base>) {
12161216
// expected-error@+1 {{destRtti must be an RTTI pointer}}
1217-
%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>
1217+
%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>
12181218
}
12191219
}
12201220

0 commit comments

Comments
 (0)