================
@@ -480,3 +480,124 @@ void useHasField() {
// LLVM: %[[GET_MEM:.*]] = getelementptr i8, ptr %[[LOAD_ARG]], i64 0
// LLVM: store i32 1, ptr %[[GET_MEM]]
+struct Inner {
+ int x;
+ int y;
+};
+
+struct Outer {
+ int a;
+ Inner inner;
+};
+
+Inner test_agg_dot(const Outer &o, Inner Outer::*p) {
+ return o.*p;
+}
+
+// CIR-BEFORE-LABEL: cir.func {{.*}} @_Z12test_agg_dotRK5OuterMS_5Inner(
+// CIR-BEFORE-SAME: %[[O_ARG:.*]]: !cir.ptr<!rec_Outer>
+// CIR-BEFORE-SAME: %[[P_ARG:.*]]: !cir.data_member<!rec_Inner in
!rec_Outer>
+// CIR-BEFORE: %[[O_ADDR:.*]] = cir.alloca "o" {{.*}} init const :
!cir.ptr<!cir.ptr<!rec_Outer>>
+// CIR-BEFORE: %[[P_ADDR:.*]] = cir.alloca "p" {{.*}} init :
!cir.ptr<!cir.data_member<!rec_Inner in !rec_Outer>>
+// CIR-BEFORE: %[[RETVAL_ADDR:.*]] = cir.alloca "__retval" {{.*}} :
!cir.ptr<!rec_Inner>
+// CIR-BEFORE: cir.store %[[O_ARG]], %[[O_ADDR]]
+// CIR-BEFORE: cir.store %[[P_ARG]], %[[P_ADDR]]
+// CIR-BEFORE: %[[O:.*]] = cir.load %[[O_ADDR]]
+// CIR-BEFORE: %[[P:.*]] = cir.load{{.*}} %[[P_ADDR]]
+// CIR-BEFORE: %[[RT_MEMBER:.*]] = cir.get_runtime_member
%[[O]][%[[P]] : !cir.data_member<!rec_Inner in !rec_Outer>] :
!cir.ptr<!rec_Outer> -> !cir.ptr<!rec_Inner>
+// CIR-BEFORE: cir.copy %[[RT_MEMBER]] to %[[RETVAL_ADDR]] :
!cir.ptr<!rec_Inner>
+// CIR-BEFORE: cir.return
+
+// CIR-AFTER-LABEL: cir.func {{.*}} @_Z12test_agg_dotRK5OuterMS_5Inner(
+// CIR-AFTER-SAME: %[[O_ARG:.*]]: !cir.ptr<!rec_Outer>
+// CIR-AFTER-SAME: %[[P_ARG:.*]]: !s64i
+// CIR-AFTER: %[[O_ADDR:.*]] = cir.alloca "o" {{.*}} init const :
!cir.ptr<!cir.ptr<!rec_Outer>>
+// CIR-AFTER: %[[P_ADDR:.*]] = cir.alloca "p" {{.*}} init :
!cir.ptr<!s64i>
+// CIR-AFTER: %[[RETVAL_ADDR:.*]] = cir.alloca "__retval" {{.*}} :
!cir.ptr<!rec_Inner>
+// CIR-AFTER: cir.store %[[O_ARG]], %[[O_ADDR]] : !cir.ptr<!rec_Outer>,
!cir.ptr<!cir.ptr<!rec_Outer>>
+// CIR-AFTER: cir.store %[[P_ARG]], %[[P_ADDR]] : !s64i, !cir.ptr<!s64i>
+// CIR-AFTER: %[[O:.*]] = cir.load %[[O_ADDR]] :
!cir.ptr<!cir.ptr<!rec_Outer>>, !cir.ptr<!rec_Outer>
+// CIR-AFTER: %[[P:.*]] = cir.load{{.*}} %[[P_ADDR]] : !cir.ptr<!s64i>,
!s64i
+// CIR-AFTER: %[[BYTE_PTR:.*]] = cir.cast bitcast %[[O]] :
!cir.ptr<!rec_Outer> -> !cir.ptr<!s8i>
+// CIR-AFTER: %[[BYTE_PTR_STRIDE:.*]] = cir.ptr_stride %[[BYTE_PTR]],
%[[P]] : (!cir.ptr<!s8i>, !s64i) -> !cir.ptr<!s8i>
+// CIR-AFTER: %[[MEMBER_ADDR:.*]] = cir.cast bitcast
%[[BYTE_PTR_STRIDE]] : !cir.ptr<!s8i> -> !cir.ptr<!rec_Inner>
+// CIR-AFTER: cir.copy %[[MEMBER_ADDR]] to %[[RETVAL_ADDR]] :
!cir.ptr<!rec_Inner>
+// CIR-AFTER: cir.return
+
+// LLVM-LABEL: define {{.*}} @_Z12test_agg_dotRK5OuterMS_5Inner(
+// LLVM: %[[RETVAL_ADDR:.*]] = alloca %struct.Inner
----------------
E00N777 wrote:
This binds to the ABI `coerce` staging slot (`align 8`), not the `__retval`
alloca that the memcpy actually writes to:
%3 = alloca %struct.Inner, align 8 ; cir.alloca "coerce"
%4 = alloca ptr, align 8
%5 = alloca i64, align 8
%6 = alloca %struct.Inner, align 4 ; cir.alloca "__retval"
call void @llvm.memcpy.p0.p0.i64(ptr align 4 %6, ptr align 4 %9, i64 8, i1
false)
CIR lowers aggregate returns in two steps, and the extra `coerce` temp
(CIRGenCall.cpp:1266) has no counterpart in OGCG — which is why the OGCG block
below matches but this one doesn't.
Note you can't just append `, align 4` here: FileCheck scans forward only, so
anchoring on `%6` would leave the following `alloca ptr` / `alloca i64` checks
with nothing left to match. Capturing all four in order works:
// LLVM: %[[COERCE:.*]] = alloca %struct.Inner
// LLVM: %[[O_ADDR:.*]] = alloca ptr
// LLVM: %[[P_ADDR:.*]] = alloca i64
// LLVM: %[[RETVAL_ADDR:.*]] = alloca %struct.Inner, align 4
Same at lines 584/592.
https://github.com/llvm/llvm-project/pull/221784
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits