Author: Henrich Lauko Date: 2026-10-01T12:55:00+02:00 New Revision: d844ab7db8aafe8c5de2131b5f066f8b9b80bc1c
URL: https://github.com/llvm/llvm-project/commit/d844ab7db8aafe8c5de2131b5f066f8b9b80bc1c DIFF: https://github.com/llvm/llvm-project/commit/d844ab7db8aafe8c5de2131b5f066f8b9b80bc1c.diff LOG: [CIR] Extract CIR_ClassCastOp base class for BaseClassAddrOp and DerivedClassAddrOp (#195478) Both ops have identical structure (arguments, results, assembly format) and differ only in mnemonic and description. Extract a shared TableGen base class to eliminate the duplication. Improve the assembly format to be more consistent with the rest of CIR. Assisted-by: Claude Code (Claude Fable 5.1). Added: Modified: clang/docs/CIR/CleanupAndEHDesign.md clang/include/clang/CIR/Dialect/IR/CIROps.td clang/lib/CIR/Dialect/Analysis/CIRBasicAliasAnalysis.cpp clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp clang/test/CIR/Analysis/alias-analysis-underlying-object.cir clang/test/CIR/CodeGen/base-init-eh.cpp clang/test/CIR/CodeGen/base-to-derived.cpp clang/test/CIR/CodeGen/class.cpp clang/test/CIR/CodeGen/cleanup-derived-to-base-ref.cpp clang/test/CIR/CodeGen/ctor-null-init.cpp clang/test/CIR/CodeGen/ctor-try-body.cpp clang/test/CIR/CodeGen/ctor.cpp clang/test/CIR/CodeGen/delegating-ctor.cpp clang/test/CIR/CodeGen/derived-to-base.cpp clang/test/CIR/CodeGen/destructor-vtable-reinit-strict.cpp clang/test/CIR/CodeGen/destructor-vtable-reinit.cpp clang/test/CIR/CodeGen/dtors.cpp clang/test/CIR/CodeGen/inherited-ctors.cpp clang/test/CIR/CodeGen/multi-vtable.cpp clang/test/CIR/CodeGen/paren-list-agg-init.cpp clang/test/CIR/CodeGen/temporary-materialization-adjust.cpp clang/test/CIR/CodeGen/vbase.cpp clang/test/CIR/CodeGen/virtual-destructor-calls.cpp clang/test/CIR/CodeGen/vtt.cpp clang/test/CIR/IR/vtt-addrpoint.cir clang/test/CIR/Lowering/vtt-addrpoint.cir clang/test/CIR/Transforms/pure-ptr-arithmetic.cir Removed: ################################################################################ diff --git a/clang/docs/CIR/CleanupAndEHDesign.md b/clang/docs/CIR/CleanupAndEHDesign.md index de86de0697292..40846953b88e8 100644 --- a/clang/docs/CIR/CleanupAndEHDesign.md +++ b/clang/docs/CIR/CleanupAndEHDesign.md @@ -323,13 +323,13 @@ cir.func @_ZN7DerivedC2Ev(%arg0: !cir.ptr<!rec_Derived>) { %0 = cir.alloca !cir.ptr<!rec_Derived>, !cir.ptr<!cir.ptr<!rec_Derived>>, ["this", init] cir.store %arg0, %0 : !cir.ptr<!rec_Derived>, !cir.ptr<!cir.ptr<!rec_Derived>> %1 = cir.load %0 : !cir.ptr<!cir.ptr<!rec_Derived>>, !cir.ptr<!rec_Derived> - %2 = cir.base_class_addr %1 : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> + %2 = cir.base_class_addr nonnull %1 [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> cir.call @_ZN4BaseC2Ev(%2) : (!cir.ptr<!rec_Base>) -> () cir.cleanup.scope { cir.call exception @_Z1fv() : () -> () cir.yield } cleanup eh { - %3 = cir.base_class_addr %1 : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> + %3 = cir.base_class_addr nonnull %1 [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> cir.call @_ZN4BaseD2Ev(%3) : (!cir.ptr<!rec_Base>) -> () cir.yield } diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td index 239bf5cfa706e..bc9af2210a048 100644 --- a/clang/include/clang/CIR/Dialect/IR/CIROps.td +++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td @@ -6320,10 +6320,27 @@ def CIR_MatrixTransposeOp : CIR_Op<"matrix.transpose", [ } //===----------------------------------------------------------------------===// -// BaseClassAddrOp +// BaseClassAddrOp & DerivedClassAddrOp //===----------------------------------------------------------------------===// -def CIR_BaseClassAddrOp : CIR_Op<"base_class_addr", [Pure]> { +class CIR_ClassCastOp<string mnemonic> : CIR_Op<mnemonic, [Pure]> { + let arguments = (ins + CIR_PointerType:$src_addr, + IndexAttr:$offset, + UnitAttr:$assume_not_null + ); + + let results = (outs Res<CIR_PointerType, "">:$result); + + let assemblyFormat = [{ + (`nonnull` $assume_not_null^)? + $src_addr ` ` `[` $offset `]` + `:` qualified(type($src_addr)) `->` qualified(type($result)) + attr-dict + }]; +} + +def CIR_BaseClassAddrOp : CIR_ClassCastOp<"base_class_addr"> { let summary = "Get the base class address for a class/struct"; let description = [{ The `cir.base_class_addr` operaration gets the address of a particular @@ -6347,28 +6364,12 @@ def CIR_BaseClassAddrOp : CIR_Op<"base_class_addr", [Pure]> { ``` will generate ``` - %3 = cir.base_class_addr %1 : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> + %3 = cir.base_class_addr nonnull %1 [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> ``` }]; - - let arguments = (ins - CIR_PointerType:$derived_addr, - IndexAttr:$offset, UnitAttr:$assume_not_null); - - let results = (outs Res<CIR_PointerType, "">:$base_addr); - - let assemblyFormat = [{ - $derived_addr `:` qualified(type($derived_addr)) - (`nonnull` $assume_not_null^)? - ` ` `[` $offset `]` `->` qualified(type($base_addr)) attr-dict - }]; } -//===----------------------------------------------------------------------===// -// DerivedClassAddrOp -//===----------------------------------------------------------------------===// - -def CIR_DerivedClassAddrOp : CIR_Op<"derived_class_addr", [Pure]> { +def CIR_DerivedClassAddrOp : CIR_ClassCastOp<"derived_class_addr"> { let summary = "Get the derived class address for a class/struct"; let description = [{ The `cir.derived_class_addr` operaration gets the address of a particular @@ -6397,21 +6398,9 @@ def CIR_DerivedClassAddrOp : CIR_Op<"derived_class_addr", [Pure]> { leads to ``` %2 = cir.load %0 : !cir.ptr<!cir.ptr<!rec_A>>, !cir.ptr<!rec_A> - %3 = cir.base_class_addr %2 : !cir.ptr<!rec_B> [0] -> !cir.ptr<!rec_A> + %3 = cir.derived_class_addr %2 [0] : !cir.ptr<!rec_A> -> !cir.ptr<!rec_B> ``` }]; - - let arguments = (ins - CIR_PointerType:$base_addr, - IndexAttr:$offset, UnitAttr:$assume_not_null); - - let results = (outs Res<CIR_PointerType, "">:$derived_addr); - - let assemblyFormat = [{ - $base_addr `:` qualified(type($base_addr)) - (`nonnull` $assume_not_null^)? - ` ` `[` $offset `]` `->` qualified(type($derived_addr)) attr-dict - }]; } //===----------------------------------------------------------------------===// diff --git a/clang/lib/CIR/Dialect/Analysis/CIRBasicAliasAnalysis.cpp b/clang/lib/CIR/Dialect/Analysis/CIRBasicAliasAnalysis.cpp index 26f2c570c578e..9d5031bcecd38 100644 --- a/clang/lib/CIR/Dialect/Analysis/CIRBasicAliasAnalysis.cpp +++ b/clang/lib/CIR/Dialect/Analysis/CIRBasicAliasAnalysis.cpp @@ -191,7 +191,7 @@ static PointerOffset decomposePointer(mlir::Value val, if (auto baseOp = mlir::dyn_cast<cir::BaseClassAddrOp>(defOp)) { LDBG() << "Walking past BaseClassAddrOp"; addToOffset(offset, baseOp.getOffset().tryZExtValue()); - val = baseOp.getDerivedAddr(); + val = baseOp.getSrcAddr(); continue; } @@ -205,7 +205,7 @@ static PointerOffset decomposePointer(mlir::Value val, if (baseOffset) baseOffset = -*baseOffset; addToOffset(offset, baseOffset); - val = derivedOp.getBaseAddr(); + val = derivedOp.getSrcAddr(); continue; } diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp index 0d715e6023d04..d3a1b3fb1a02c 100644 --- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp +++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp @@ -2025,14 +2025,14 @@ mlir::LogicalResult CIRToLLVMBaseClassAddrOpLowering::matchAndRewrite( mlir::ConversionPatternRewriter &rewriter) const { const mlir::Type resultType = getTypeConverter()->convertType(baseClassOp.getType()); - mlir::Value derivedAddr = adaptor.getDerivedAddr(); + mlir::Value derivedAddr = adaptor.getSrcAddr(); llvm::SmallVector<mlir::LLVM::GEPArg, 1> offset = { adaptor.getOffset().getZExtValue()}; mlir::Type byteType = mlir::IntegerType::get(resultType.getContext(), 8, mlir::IntegerType::Signless); if (adaptor.getOffset().getZExtValue() == 0) { - rewriter.replaceOpWithNewOp<mlir::LLVM::BitcastOp>( - baseClassOp, resultType, adaptor.getDerivedAddr()); + rewriter.replaceOpWithNewOp<mlir::LLVM::BitcastOp>(baseClassOp, resultType, + adaptor.getSrcAddr()); return mlir::success(); } @@ -2057,12 +2057,12 @@ mlir::LogicalResult CIRToLLVMDerivedClassAddrOpLowering::matchAndRewrite( mlir::ConversionPatternRewriter &rewriter) const { const mlir::Type resultType = getTypeConverter()->convertType(derivedClassOp.getType()); - mlir::Value baseAddr = adaptor.getBaseAddr(); + mlir::Value baseAddr = adaptor.getSrcAddr(); // The offset is set in the operation as an unsigned value, but it must be // applied as a negative offset. int64_t offsetVal = -(adaptor.getOffset().getZExtValue()); if (offsetVal == 0) { - // If the offset is zero, we can just return the base address, + // If the offset is zero, we can just return the source address. rewriter.replaceOp(derivedClassOp, baseAddr); return mlir::success(); } diff --git a/clang/test/CIR/Analysis/alias-analysis-underlying-object.cir b/clang/test/CIR/Analysis/alias-analysis-underlying-object.cir index 017ae426a7a22..efc161534b7ec 100644 --- a/clang/test/CIR/Analysis/alias-analysis-underlying-object.cir +++ b/clang/test/CIR/Analysis/alias-analysis-underlying-object.cir @@ -311,10 +311,10 @@ cir.func @get_element_of_records() { cir.func @base_class_addr_distinct_allocas() { %d1 = cir.alloca "d1" align(4) : !cir.ptr<!rec_Derived> {test.ptr = "d1"} %d2 = cir.alloca "d2" align(4) : !cir.ptr<!rec_Derived> {test.ptr = "d2"} - %base1 = cir.base_class_addr %d1 : !cir.ptr<!rec_Derived> nonnull [0] - -> !cir.ptr<!rec_Base> {test.ptr = "base1"} - %base2 = cir.base_class_addr %d2 : !cir.ptr<!rec_Derived> nonnull [0] - -> !cir.ptr<!rec_Base> {test.ptr = "base2"} + %base1 = cir.base_class_addr nonnull %d1 [0] + : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> {test.ptr = "base1"} + %base2 = cir.base_class_addr nonnull %d2 [0] + : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> {test.ptr = "base2"} cir.return } @@ -338,10 +338,10 @@ cir.func @base_class_addr_distinct_allocas() { !rec_Derived = !cir.struct<"Derived" {data !s32i, data !rec_Base}> cir.func @base_and_derived_class_addr(%d: !cir.ptr<!rec_Derived>) attributes {test.ptr = "func"} { - %base = cir.base_class_addr %d : !cir.ptr<!rec_Derived> nonnull [4] - -> !cir.ptr<!rec_Base> {test.ptr = "base"} - %derived = cir.derived_class_addr %base : !cir.ptr<!rec_Base> nonnull [4] - -> !cir.ptr<!rec_Derived> {test.ptr = "derived"} + %base = cir.base_class_addr nonnull %d [4] + : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> {test.ptr = "base"} + %derived = cir.derived_class_addr nonnull %base [4] + : !cir.ptr<!rec_Base> -> !cir.ptr<!rec_Derived> {test.ptr = "derived"} %first = cir.get_member %d[0] {name = "x"} {test.ptr = "first"} : !cir.ptr<!rec_Derived> -> !cir.ptr<!s32i> %basedata = cir.get_member %base[0] {name = "b"} {test.ptr = "basedata"} @@ -369,10 +369,10 @@ cir.func @base_and_derived_class_addr(%d: !cir.ptr<!rec_Derived>) !rec_Derived = !cir.struct<"Derived" {data !s32i, data !rec_Base}> cir.func @base_and_derived_class_maybe_null(%d: !cir.ptr<!rec_Derived>) attributes {test.ptr = "func"} { - %base = cir.base_class_addr %d : !cir.ptr<!rec_Derived> [4] - -> !cir.ptr<!rec_Base> {test.ptr = "base"} - %derived = cir.derived_class_addr %base : !cir.ptr<!rec_Base> [4] - -> !cir.ptr<!rec_Derived> {test.ptr = "derived"} + %base = cir.base_class_addr %d [4] + : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> {test.ptr = "base"} + %derived = cir.derived_class_addr %base [4] + : !cir.ptr<!rec_Base> -> !cir.ptr<!rec_Derived> {test.ptr = "derived"} %first = cir.get_member %d[0] {name = "x"} {test.ptr = "first"} : !cir.ptr<!rec_Derived> -> !cir.ptr<!s32i> %basedata = cir.get_member %base[0] {name = "b"} {test.ptr = "basedata"} diff --git a/clang/test/CIR/CodeGen/base-init-eh.cpp b/clang/test/CIR/CodeGen/base-init-eh.cpp index 24f6f7a93e73f..28b6b3163f1a3 100644 --- a/clang/test/CIR/CodeGen/base-init-eh.cpp +++ b/clang/test/CIR/CodeGen/base-init-eh.cpp @@ -35,7 +35,7 @@ void test_virt_base_initializer() { // CIR: cir.func {{.*}} @_ZN11VirtDerivedC1Ev // CIR: %[[THIS:.*]] = cir.load %{{.*}} -// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_VirtDerived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_VirtDerived> -> !cir.ptr<!rec_Base> // CIR: %[[ZERO:.*]] = cir.const #cir.int<0> : !s32i // CIR: cir.call @_ZN4BaseC2Ei(%[[BASE_ADDR]], %[[ZERO]]) // CIR: cir.cleanup.scope { @@ -51,7 +51,7 @@ void test_virt_base_initializer() { // CIR: cir.func {{.*}} @_ZN7DerivedC2Ev // CIR: %[[THIS:.*]] = cir.load %{{.*}} -// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: %[[ZERO:.*]] = cir.const #cir.int<0> : !s32i // CIR: cir.call @_ZN4BaseC2Ei(%[[BASE_ADDR]], %[[ZERO]]) // CIR: cir.cleanup.scope { diff --git a/clang/test/CIR/CodeGen/base-to-derived.cpp b/clang/test/CIR/CodeGen/base-to-derived.cpp index e8dad9b163efb..430b096e88d9e 100644 --- a/clang/test/CIR/CodeGen/base-to-derived.cpp +++ b/clang/test/CIR/CodeGen/base-to-derived.cpp @@ -27,7 +27,7 @@ X *castAtoX(A *a) { // CIR: %[[A_ADDR:.*]] = cir.alloca "a" {{.*}} init : !cir.ptr<!cir.ptr<!rec_A>> // CIR: cir.store %[[ARG0]], %[[A_ADDR]] : !cir.ptr<!rec_A>, !cir.ptr<!cir.ptr<!rec_A>> // CIR: %[[A:.*]] = cir.load{{.*}} %[[A_ADDR]] : !cir.ptr<!cir.ptr<!rec_A>>, !cir.ptr<!rec_A> -// CIR: %[[X:.*]] = cir.derived_class_addr %[[A]] : !cir.ptr<!rec_A> [0] -> !cir.ptr<!rec_X> +// CIR: %[[X:.*]] = cir.derived_class_addr %[[A]] [0] : !cir.ptr<!rec_A> -> !cir.ptr<!rec_X> // Note: Because the offset is 0, a null check is not needed. @@ -49,7 +49,7 @@ X *castBtoX(B *b) { // CIR: %[[B_ADDR:.*]] = cir.alloca "b" {{.*}} init : !cir.ptr<!cir.ptr<!rec_B>> // CIR: cir.store %[[ARG0]], %[[B_ADDR]] : !cir.ptr<!rec_B>, !cir.ptr<!cir.ptr<!rec_B>> // CIR: %[[B:.*]] = cir.load{{.*}} %[[B_ADDR]] : !cir.ptr<!cir.ptr<!rec_B>>, !cir.ptr<!rec_B> -// CIR: %[[X:.*]] = cir.derived_class_addr %[[B]] : !cir.ptr<!rec_B> [4] -> !cir.ptr<!rec_X> +// CIR: %[[X:.*]] = cir.derived_class_addr %[[B]] [4] : !cir.ptr<!rec_B> -> !cir.ptr<!rec_X> // LLVM: define {{.*}} ptr @_Z8castBtoXP1B(ptr {{.*}} %[[ARG0:.*]]) // LLVM: %[[B_ADDR:.*]] = alloca ptr, align 8 @@ -82,7 +82,7 @@ X &castBReftoXRef(B &b) { // CIR: %[[B_ADDR:.*]] = cir.alloca "b" {{.*}} init const : !cir.ptr<!cir.ptr<!rec_B>> // CIR: cir.store %[[ARG0]], %[[B_ADDR]] : !cir.ptr<!rec_B>, !cir.ptr<!cir.ptr<!rec_B>> // CIR: %[[B:.*]] = cir.load{{.*}} %[[B_ADDR]] : !cir.ptr<!cir.ptr<!rec_B>>, !cir.ptr<!rec_B> -// CIR: %[[X:.*]] = cir.derived_class_addr %[[B]] : !cir.ptr<!rec_B> nonnull [4] -> !cir.ptr<!rec_X> +// CIR: %[[X:.*]] = cir.derived_class_addr nonnull %[[B]] [4] : !cir.ptr<!rec_B> -> !cir.ptr<!rec_X> // LLVM: define {{.*}} ptr @_Z14castBReftoXRefR1B(ptr {{.*}} %[[ARG0:.*]]) // LLVM: %[[B_ADDR:.*]] = alloca ptr diff --git a/clang/test/CIR/CodeGen/class.cpp b/clang/test/CIR/CodeGen/class.cpp index afa5aab3f2d76..3a31ee34f885c 100644 --- a/clang/test/CIR/CodeGen/class.cpp +++ b/clang/test/CIR/CodeGen/class.cpp @@ -71,7 +71,7 @@ int use_base() { // CIR: cir.func{{.*}} @_Z8use_basev // CIR: %[[D_ADDR:.*]] = cir.alloca "d" {{.*}} : !cir.ptr<!rec_Derived> -// CIR: %[[BASE_ADDR:.*]] cir.base_class_addr %[[D_ADDR]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE_ADDR:.*]] cir.base_class_addr nonnull %[[D_ADDR]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: %[[D_A_ADDR:.*]] = cir.get_member %2[0] {name = "a"} : !cir.ptr<!rec_Base> -> !cir.ptr<!s32i> // CIR: %[[D_A:.*]] = cir.load align(4) %3 : !cir.ptr<!s32i>, !s32i @@ -91,7 +91,7 @@ int use_base_via_pointer(Derived *d) { // CIR: %[[D_ADDR:.*]] = cir.alloca "d" {{.*}} init : !cir.ptr<!cir.ptr<!rec_Derived>> // CIR: cir.store %[[ARG0]], %[[D_ADDR]] // CIR: %[[D:.*]] = cir.load align(8) %[[D_ADDR]] -// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[D]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[D]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: %[[D_A_ADDR:.*]] = cir.get_member %[[BASE_ADDR]][0] {name = "a"} // CIR: %[[D_A:.*]] = cir.load align(4) %[[D_A_ADDR]] diff --git a/clang/test/CIR/CodeGen/cleanup-derived-to-base-ref.cpp b/clang/test/CIR/CodeGen/cleanup-derived-to-base-ref.cpp index 481509dab602f..90799991bf0ad 100644 --- a/clang/test/CIR/CodeGen/cleanup-derived-to-base-ref.cpp +++ b/clang/test/CIR/CodeGen/cleanup-derived-to-base-ref.cpp @@ -20,7 +20,7 @@ void bind_base_ref_to_derived_temp() { // CIR: %[[SPILL:.*]] = cir.alloca "tmp.exprcleanup" {{.*}} : !cir.ptr<!cir.ptr<!rec_Base>> // CIR: cir.call @_Z12make_derivedv(%[[REF_TMP]]) : (!cir.ptr<!rec_Derived> {{.*}}llvm.sret = !rec_Derived{{.*}}) -> () // CIR: cir.cleanup.scope { -// CIR: %[[BASE:.*]] = cir.base_class_addr %[[REF_TMP]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE:.*]] = cir.base_class_addr nonnull %[[REF_TMP]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: cir.store {{.*}} %[[BASE]], %[[SPILL]] // CIR: cir.yield // CIR: } cleanup eh { diff --git a/clang/test/CIR/CodeGen/ctor-null-init.cpp b/clang/test/CIR/CodeGen/ctor-null-init.cpp index 1e54556c4665e..a327588f5d60f 100644 --- a/clang/test/CIR/CodeGen/ctor-null-init.cpp +++ b/clang/test/CIR/CodeGen/ctor-null-init.cpp @@ -19,7 +19,7 @@ void test_empty_base_null_init() { // CIR: cir.func {{.*}} @_Z25test_empty_base_null_initv() // CIR-NEXT: %[[B_ADDR:.*]] = cir.alloca "agg.tmp.ensured" {{.*}} : !cir.ptr<!rec_B> -// CIR-NEXT: %[[A_ADDR:.*]] = cir.base_class_addr %[[B_ADDR]] : !cir.ptr<!rec_B> nonnull [0] -> !cir.ptr<!rec_A> +// CIR-NEXT: %[[A_ADDR:.*]] = cir.base_class_addr nonnull %[[B_ADDR]] [0] : !cir.ptr<!rec_B> -> !cir.ptr<!rec_A> // LLVM: define{{.*}} @_Z25test_empty_base_null_initv() // LLVM-NEXT: %[[B:.*]] = alloca %struct.B @@ -46,7 +46,7 @@ void test_non_empty_base_null_init() { // CIR: cir.func {{.*}} @_Z29test_non_empty_base_null_initv() // CIR: %[[TMP:.*]] = cir.alloca "agg.tmp.ensured" {{.*}} : !cir.ptr<!rec_D> -// CIR: %[[BASE:.*]] = cir.base_class_addr %[[TMP]] : !cir.ptr<!rec_D> nonnull [0] -> !cir.ptr<!rec_C> +// CIR: %[[BASE:.*]] = cir.base_class_addr nonnull %[[TMP]] [0] : !cir.ptr<!rec_D> -> !cir.ptr<!rec_C> // CIR: %[[ZERO:.*]] = cir.const #cir.const_record<{#cir.int<0> : !s32i}> : !rec_C // CIR: cir.store{{.*}} %[[ZERO]], %[[BASE]] @@ -77,7 +77,7 @@ void test_base_chain_null_init() { // CIR: cir.func {{.*}} @_Z25test_base_chain_null_initv() // CIR: %[[TMP:.*]] = cir.alloca "agg.tmp.ensured" {{.*}} : !cir.ptr<!rec_G> -// CIR: %[[BASE:.*]] = cir.base_class_addr %[[TMP]] : !cir.ptr<!rec_G> nonnull [0] -> !cir.ptr<!rec_F> +// CIR: %[[BASE:.*]] = cir.base_class_addr nonnull %[[TMP]] [0] : !cir.ptr<!rec_G> -> !cir.ptr<!rec_F> // CIR: %[[ZERO:.*]] = cir.const #cir.const_record<{#cir.zero : !rec_E}> : !rec_F // CIR: cir.store{{.*}} %[[ZERO]], %[[BASE]] @@ -106,7 +106,7 @@ VDerived::VDerived() : VBase() {} // OGCG: store ptr getelementptr inbounds inrange(-16, 16) (i8, ptr @_ZTV8VDerived, i64 16), ptr %[[THIS]], align 8 // CIR-LABEL: cir.func {{.*}}@_ZN8VDerivedC2Ev -// CIR: %[[BASE:.*]] = cir.base_class_addr {{.*}} : !cir.ptr<!rec_VDerived> nonnull [0] -> !cir.ptr<!rec_VBase> +// CIR: %[[BASE:.*]] = cir.base_class_addr nonnull {{.*}} [0] : !cir.ptr<!rec_VDerived> -> !cir.ptr<!rec_VBase> // CIR: %[[ZERO:.*]] = cir.const #cir.const_record<{#cir.zero : !cir.vptr}> : !rec_VBase // CIR: cir.store align(8) %[[ZERO]], %[[BASE]] : !rec_VBase, !cir.ptr<!rec_VBase> // CIR: cir.call @_ZN5VBaseC2Ev(%[[BASE]]) diff --git a/clang/test/CIR/CodeGen/ctor-try-body.cpp b/clang/test/CIR/CodeGen/ctor-try-body.cpp index 21967ceebfc10..730d736ecd8b0 100644 --- a/clang/test/CIR/CodeGen/ctor-try-body.cpp +++ b/clang/test/CIR/CodeGen/ctor-try-body.cpp @@ -38,7 +38,7 @@ struct HasThings : Base { // CIR-NEXT: %[[THIS_LOAD:.*]] = cir.load %[[THIS_ALLOC]] : !cir.ptr<!cir.ptr<!rec_HasThings>>, !cir.ptr<!rec_HasThings> // CIR-NEXT: cir.scope { // CIR-NEXT: cir.try { -// CIR-NEXT: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS_LOAD]] : !cir.ptr<!rec_HasThings> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR-NEXT: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS_LOAD]] [0] : !cir.ptr<!rec_HasThings> -> !cir.ptr<!rec_Base> // CIR-NEXT: cir.call @_ZN4BaseC2Ev(%[[BASE_ADDR]]) : (!cir.ptr<!rec_Base>{{.*}}) -> () // CIR-NEXT: %[[FROMCTOR_ADDR:.*]] = cir.cast bitcast %[[THIS_LOAD]] : !cir.ptr<!rec_HasThings> -> !cir.ptr<!rec_FromCtor> // CIR-NEXT: %[[C_LOAD:.*]] = cir.load %[[C_ALLOC]] : !cir.ptr<!cir.ptr<!rec_Ctor>>, !cir.ptr<!rec_Ctor> diff --git a/clang/test/CIR/CodeGen/ctor.cpp b/clang/test/CIR/CodeGen/ctor.cpp index e8ecc03de63aa..447a7e4c08c2d 100644 --- a/clang/test/CIR/CodeGen/ctor.cpp +++ b/clang/test/CIR/CodeGen/ctor.cpp @@ -296,7 +296,7 @@ void test_derived2() { // CHECK-NEXT: cir.store %arg0, %[[THIS_ADDR]] // CHECK-NEXT: cir.store %arg1, %[[VAL_ADDR]] // CHECK-NEXT: %[[THIS:.*]] = cir.load{{.*}} %[[THIS_ADDR]] -// CHECK-NEXT: %[[BASE:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CHECK-NEXT: %[[BASE:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CHECK-NEXT: %[[VAL:.*]] = cir.load{{.*}} %[[VAL_ADDR]] // CHECK-NEXT: cir.call @_ZN4BaseC2Ei(%[[BASE]], %[[VAL]]) // CHECK-NEXT: cir.return @@ -325,10 +325,10 @@ void test_derived2() { // CHECK-NEXT: cir.store %arg2, %[[VAL2_ADDR]] // CHECK-NEXT: cir.store %arg3, %[[VAL3_ADDR]] // CHECK-NEXT: %[[THIS:.*]] = cir.load{{.*}} %[[THIS_ADDR]] -// CHECK-NEXT: %[[BASE:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Derived2> nonnull [0] -> !cir.ptr<!rec_Base> +// CHECK-NEXT: %[[BASE:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_Derived2> -> !cir.ptr<!rec_Base> // CHECK-NEXT: %[[VAL1:.*]] = cir.load{{.*}} %[[VAL1_ADDR]] // CHECK-NEXT: cir.call @_ZN4BaseC2Ei(%[[BASE]], %[[VAL1]]) -// CHECK-NEXT: %[[BASE2:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Derived2> nonnull [4] -> !cir.ptr<!rec_Base2> +// CHECK-NEXT: %[[BASE2:.*]] = cir.base_class_addr nonnull %[[THIS]] [4] : !cir.ptr<!rec_Derived2> -> !cir.ptr<!rec_Base2> // CHECK-NEXT: %[[VAL2:.*]] = cir.load{{.*}} %[[VAL2_ADDR]] // CHECK-NEXT: cir.call @_ZN5Base2C2Ei(%[[BASE2]], %[[VAL2]]) // CHECK-NEXT: %[[C_ADDR:.*]] = cir.get_member %[[THIS]][2] {name = "c"} diff --git a/clang/test/CIR/CodeGen/delegating-ctor.cpp b/clang/test/CIR/CodeGen/delegating-ctor.cpp index f90eecf21b322..6acbd8087b91b 100644 --- a/clang/test/CIR/CodeGen/delegating-ctor.cpp +++ b/clang/test/CIR/CodeGen/delegating-ctor.cpp @@ -246,7 +246,7 @@ Derived::Derived(const void *inVoid) { squawk(); } // CIR: cir.store %[[THIS_ARG]], %[[THIS_ADDR]] // CIR: cir.store %[[INVOID_ARG]], %[[INVOID_ADDR]] // CIR: %[[THIS:.*]] = cir.load %[[THIS_ADDR]] -// CIR: %[[BASE:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: cir.call @_ZN4BaseC2Ev(%[[BASE]]) // CIR: %[[VPTR_GLOBAL:.*]] = cir.vtable.address_point(@_ZTV7Derived, address_point = <index = 0, offset = 4>) : !cir.vptr // CIR: %[[VPTR_ADDR:.*]] = cir.vtable.get_vptr %[[THIS]] : !cir.ptr<!rec_Derived> -> !cir.ptr<!cir.vptr> diff --git a/clang/test/CIR/CodeGen/derived-to-base.cpp b/clang/test/CIR/CodeGen/derived-to-base.cpp index b90f8bc62cb60..6335293f3abff 100644 --- a/clang/test/CIR/CodeGen/derived-to-base.cpp +++ b/clang/test/CIR/CodeGen/derived-to-base.cpp @@ -28,7 +28,7 @@ void f() { // CIR: cir.func {{.*}} @_Z1fv() // CIR: %[[D:.*]] = cir.alloca "d" {{.*}} init : !cir.ptr<!rec_Derived> // CIR: cir.call @_ZN7DerivedC1Ev(%[[D]]) : (!cir.ptr<!rec_Derived> {{.*}}) -> () -// CIR: %[[D_BASE:.*]] = cir.base_class_addr %[[D]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[D_BASE:.*]] = cir.base_class_addr nonnull %[[D]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: cir.call @_ZN4Base1fEv(%[[D_BASE]]) : (!cir.ptr<!rec_Base> {{.*}}) -> () // LLVM: define {{.*}}void @_Z1fv() @@ -51,7 +51,7 @@ void callBaseUsingDerived(Derived *derived) { // CIR: %[[DERIVED_ADDR:.*]] = cir.alloca "derived" {{.*}} init : !cir.ptr<!cir.ptr<!rec_Derived>> // CIR: cir.store %[[DERIVED_ARG]], %[[DERIVED_ADDR]] // CIR: %[[DERIVED:.*]] = cir.load{{.*}} %[[DERIVED_ADDR]] -// CIR: %[[DERIVED_BASE:.*]] = cir.base_class_addr %[[DERIVED]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[DERIVED_BASE:.*]] = cir.base_class_addr nonnull %[[DERIVED]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: cir.call @_Z7useBaseP4Base(%[[DERIVED_BASE]]) : (!cir.ptr<!rec_Base> {{.*}}) -> () // LLVM: define {{.*}} void @_Z20callBaseUsingDerivedP7Derived(ptr {{.*}} %[[DERIVED_ARG:.*]]) @@ -75,7 +75,7 @@ Base *returnBaseFromDerived(Derived* derived) { // CIR: %[[BASE_ADDR:.*]] = cir.alloca "__retval" {{.*}} : !cir.ptr<!cir.ptr<!rec_Base>> // CIR: cir.store %[[DERIVED_ARG]], %[[DERIVED_ADDR]] // CIR: %[[DERIVED:.*]] = cir.load{{.*}} %[[DERIVED_ADDR]] -// CIR: %[[DERIVED_BASE:.*]] = cir.base_class_addr %[[DERIVED]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[DERIVED_BASE:.*]] = cir.base_class_addr nonnull %[[DERIVED]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: cir.store %[[DERIVED_BASE]], %[[BASE_ADDR]] // CIR: %[[BASE:.*]] = cir.load{{.*}} %[[BASE_ADDR]] // CIR: cir.return %[[BASE]] : !cir.ptr<!rec_Base> @@ -99,7 +99,7 @@ void test_volatile_store() { // CIR: cir.func {{.*}} @_Z19test_volatile_storev() // CIR: %[[ZERO:.*]] = cir.const #cir.int<0> : !s32i // CIR: %[[DERIVED_OBJ:.*]] = cir.get_global @derivedObj : !cir.ptr<!rec_Derived> -// CIR: %[[DERIVED_OBJ_BASE:.*]] = cir.base_class_addr %[[DERIVED_OBJ]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[DERIVED_OBJ_BASE:.*]] = cir.base_class_addr nonnull %[[DERIVED_OBJ]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: %[[DERIVED_OBJ_A:.*]] = cir.get_member %[[DERIVED_OBJ_BASE]][0] {name = "a"} : !cir.ptr<!rec_Base> -> !cir.ptr<!s32i> // CIR: cir.store volatile {{.*}} %[[ZERO]], %[[DERIVED_OBJ_A]] : !s32i, !cir.ptr<!s32i> @@ -115,7 +115,7 @@ void test_volatile_load() { // CIR: cir.func {{.*}} @_Z18test_volatile_loadv() // CIR: %[[DERIVED_OBJ:.*]] = cir.get_global @derivedObj : !cir.ptr<!rec_Derived> -// CIR: %[[DERIVED_OBJ_BASE:.*]] = cir.base_class_addr %[[DERIVED_OBJ]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[DERIVED_OBJ_BASE:.*]] = cir.base_class_addr nonnull %[[DERIVED_OBJ]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: %[[DERIVED_OBJ_A:.*]] = cir.get_member %[[DERIVED_OBJ_BASE]][0] {name = "a"} : !cir.ptr<!rec_Base> -> !cir.ptr<!s32i> // CIR: %[[VAL:.*]] = cir.load volatile {{.*}} %[[DERIVED_OBJ_A]] : !cir.ptr<!s32i>, !s32i diff --git a/clang/test/CIR/CodeGen/destructor-vtable-reinit-strict.cpp b/clang/test/CIR/CodeGen/destructor-vtable-reinit-strict.cpp index a3636a9217f83..d4b3c612ce132 100644 --- a/clang/test/CIR/CodeGen/destructor-vtable-reinit-strict.cpp +++ b/clang/test/CIR/CodeGen/destructor-vtable-reinit-strict.cpp @@ -31,7 +31,7 @@ Derived::~Derived() { some_function(); } // CIR-NEXT: cir.call @_Z13some_functionv() // CIR-NEXT: cir.yield // CIR-NEXT: } cleanup normal { -// CIR-NEXT: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[LAUNDERED]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR-NEXT: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[LAUNDERED]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR-NEXT: cir.call @_ZN4BaseD2Ev(%[[BASE_ADDR]]) // CIR-NEXT: cir.yield // CIR-NEXT: } diff --git a/clang/test/CIR/CodeGen/destructor-vtable-reinit.cpp b/clang/test/CIR/CodeGen/destructor-vtable-reinit.cpp index 38d5fe9721e0e..de48cfb941857 100644 --- a/clang/test/CIR/CodeGen/destructor-vtable-reinit.cpp +++ b/clang/test/CIR/CodeGen/destructor-vtable-reinit.cpp @@ -47,7 +47,7 @@ Derived::~Derived() { some_function(); } // CIR-NEXT: cir.call @_Z13some_functionv() // CIR-NEXT: cir.yield // CIR-NEXT: } cleanup normal { -// CIR-NEXT: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR-NEXT: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR-NEXT: cir.call @_ZN4BaseD2Ev(%[[BASE_ADDR]]) // CIR-NEXT: cir.yield // CIR-NEXT: } @@ -81,7 +81,7 @@ FinalDerived::~FinalDerived() { some_function(); } // CIR-NEXT: cir.call @_Z13some_functionv() // CIR-NEXT: cir.yield // CIR-NEXT: } cleanup normal { -// CIR-NEXT: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_FinalDerived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR-NEXT: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_FinalDerived> -> !cir.ptr<!rec_Base> // CIR-NEXT: cir.call @_ZN4BaseD2Ev(%[[BASE_ADDR]]) // CIR-NEXT: cir.yield // CIR-NEXT: } @@ -110,7 +110,7 @@ TrivialDtor::~TrivialDtor() {} // CIR-NEXT: cir.cleanup.scope { // CIR-NEXT: cir.yield // CIR-NEXT: } cleanup normal { -// CIR-NEXT: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_TrivialDtor> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR-NEXT: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_TrivialDtor> -> !cir.ptr<!rec_Base> // CIR-NEXT: cir.call @_ZN4BaseD2Ev(%[[BASE_ADDR]]) // CIR-NEXT: cir.yield // CIR-NEXT: } @@ -147,19 +147,19 @@ MultiBase::~MultiBase() { some_function(); } // CIR-NEXT: %[[MOTHER_VPTR_ADDR:.*]] = cir.vtable.get_vptr %[[THIS]] : !cir.ptr<!rec_MultiBase> -> !cir.ptr<!cir.vptr> // CIR-NEXT: cir.store{{.*}} %[[MOTHER_VPTR]], %[[MOTHER_VPTR_ADDR]] : !cir.vptr, !cir.ptr<!cir.vptr> // CIR-NEXT: %[[FATHER_VPTR:.*]] = cir.vtable.address_point(@_ZTV9MultiBase, address_point = <index = 1, offset = 2>) : !cir.vptr -// CIR-NEXT: %[[FATHER_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_MultiBase> nonnull [8] -> !cir.ptr<!rec_Father> +// CIR-NEXT: %[[FATHER_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [8] : !cir.ptr<!rec_MultiBase> -> !cir.ptr<!rec_Father> // CIR-NEXT: %[[FATHER_VPTR_ADDR:.*]] = cir.vtable.get_vptr %[[FATHER_ADDR]] : !cir.ptr<!rec_Father> -> !cir.ptr<!cir.vptr> // CIR-NEXT: cir.store{{.*}} %[[FATHER_VPTR]], %[[FATHER_VPTR_ADDR]] : !cir.vptr, !cir.ptr<!cir.vptr> // CIR-NEXT: cir.call @_Z13some_functionv() // CIR-NEXT: cir.yield // CIR-NEXT: } cleanup normal { -// CIR-NEXT: %[[FATHER_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_MultiBase> nonnull [8] -> !cir.ptr<!rec_Father> +// CIR-NEXT: %[[FATHER_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [8] : !cir.ptr<!rec_MultiBase> -> !cir.ptr<!rec_Father> // CIR-NEXT: cir.call @_ZN6FatherD2Ev(%[[FATHER_ADDR]]) // CIR-NEXT: cir.yield // CIR-NEXT: } // CIR-NEXT: cir.yield // CIR-NEXT: } cleanup normal { -// CIR-NEXT: %[[MOTHER_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_MultiBase> nonnull [0] -> !cir.ptr<!rec_Mother> +// CIR-NEXT: %[[MOTHER_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_MultiBase> -> !cir.ptr<!rec_Mother> // CIR-NEXT: cir.call @_ZN6MotherD2Ev(%[[MOTHER_ADDR]]) // CIR-NEXT: cir.yield // CIR-NEXT: } diff --git a/clang/test/CIR/CodeGen/dtors.cpp b/clang/test/CIR/CodeGen/dtors.cpp index 1ae95a7c9bb0e..da10ad4ed5ba3 100644 --- a/clang/test/CIR/CodeGen/dtors.cpp +++ b/clang/test/CIR/CodeGen/dtors.cpp @@ -293,7 +293,7 @@ void test_base_dtor_call() { // OGCG: call void @_ZN1FD2Ev(ptr {{.*}} %{{.*}}) // CIR: cir.func {{.*}} @_ZN1FD2Ev -// CIR: %[[BASE_E:.*]] = cir.base_class_addr %{{.*}} : !cir.ptr<!rec_F> nonnull [0] -> !cir.ptr<!rec_E> +// CIR: %[[BASE_E:.*]] = cir.base_class_addr nonnull %{{.*}} [0] : !cir.ptr<!rec_F> -> !cir.ptr<!rec_E> // CIR: cir.call @_ZN1ED2Ev(%[[BASE_E]]) nothrow : (!cir.ptr<!rec_E> {{.*}}) -> () // Because E is at offset 0 in F, there is no getelementptr needed. @@ -445,7 +445,7 @@ void test_base_dtor_call_virtual_base() { // CIR: %[[THIS:.*]] = cir.load %{{.*}} // CIR: %[[VTT:.*]] = cir.vtt.address_point @_ZTT7Derived, offset = 0 -> !cir.ptr<!cir.ptr<!void>> // CIR: cir.call @_ZN7DerivedD2Ev(%[[THIS]], %[[VTT]]) -// CIR: %[[VIRTUAL_BASE:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_VirtualBase> +// CIR: %[[VIRTUAL_BASE:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_VirtualBase> // CIR: cir.call @_ZN11VirtualBaseD2Ev(%[[VIRTUAL_BASE]]) // LLVM: define {{.*}} void @_ZN7DerivedD1Ev diff --git a/clang/test/CIR/CodeGen/inherited-ctors.cpp b/clang/test/CIR/CodeGen/inherited-ctors.cpp index 6871c00da5850..2afd42d70f00d 100644 --- a/clang/test/CIR/CodeGen/inherited-ctors.cpp +++ b/clang/test/CIR/CodeGen/inherited-ctors.cpp @@ -49,7 +49,7 @@ void fallsthrough() { // CIR: %[[TWO:.*]] = cir.const #cir.int<2> : !s32i // CIR: %[[THREE:.*]] = cir.const #cir.fp<3.0{{.*}}> : !cir.double // CIR: %[[LOAD_DERIVED:.*]] = cir.load %[[TMP_ALLOCA]] : !cir.ptr<!cir.ptr<!rec_Derived>>, !cir.ptr<!rec_Derived> -// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[LOAD_DERIVED]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[LOAD_DERIVED]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: cir.call @_ZN4BaseC2Efz(%[[BASE_ADDR]], %[[FP_1_1]], %[[TWO]], %[[THREE]]) : (!cir.ptr<!rec_Base>{{.*}}, !cir.float{{.*}}, !s32i{{.*}}, !cir.double{{.*}}) -> () // // LLVM-LABEL: define dso_local void @_Z26cannotEmitDelegateCallArgsv() @@ -70,7 +70,7 @@ void fallsthrough() { // CIR: %[[THIS_ALLOCA:.*]] = cir.alloca "this" align(8) init : !cir.ptr<!cir.ptr<!rec_VirtualDelegatingCtor>> // CIR: %[[X_ALLOCA:.*]] = cir.alloca "x" align(4) init : !cir.ptr<!s32i> // CIR: %[[THIS_LOAD:.*]] = cir.load %[[THIS_ALLOCA]] : !cir.ptr<!cir.ptr<!rec_VirtualDelegatingCtor>>, !cir.ptr<!rec_VirtualDelegatingCtor> -// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS_LOAD]] : !cir.ptr<!rec_VirtualDelegatingCtor> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS_LOAD]] [0] : !cir.ptr<!rec_VirtualDelegatingCtor> -> !cir.ptr<!rec_Base> // CIR: %[[X_LOAD:.*]] = cir.load align(4) %[[X_ALLOCA]] : !cir.ptr<!s32i>, !s32i // CIR: cir.call @_ZN4BaseC2Ei(%[[BASE_ADDR]], %[[X_LOAD]]) : (!cir.ptr<!rec_Base> {{.*}}, !s32i {{{.*}}) -> () // @@ -86,7 +86,7 @@ void fallsthrough() { // in the body, and not being included in the declaration/definition of this // function. CIR cannot reproduce this, as we have a verifier that checks that // the arg counts match. -// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS_LOAD]] : !cir.ptr<!rec_VirtualDelegatingCtor> nonnull [0] -> !cir.ptr<!rec_VirtDerived> +// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS_LOAD]] [0] : !cir.ptr<!rec_VirtualDelegatingCtor> -> !cir.ptr<!rec_VirtDerived> // CIR: %[[ADDR_PT:.*]] = cir.vtt.address_point @_ZTT21VirtualDelegatingCtor, offset = 1 -> !cir.ptr<!cir.ptr<!void>> // CIR: cir.call @_ZN11VirtDerivedCI24BaseEi(%[[BASE_ADDR]], %[[ADDR_PT]]) : (!cir.ptr<!rec_VirtDerived>{{.*}}, !cir.ptr<!cir.ptr<!void>>{{.*}}) -> () // CIR: %[[ADDR_PT:.*]] = cir.vtable.address_point(@_ZTV21VirtualDelegatingCtor, address_point = <index = 0, offset = 3>) : !cir.vptr @@ -101,7 +101,7 @@ void fallsthrough() { // CIR: %[[THIS_ALLOCA:.*]] = cir.alloca "this" {{.*}} init : !cir.ptr<!cir.ptr<!rec_Derived>> // CIR: %[[INT_ALLOCA:.*]] = cir.alloca "" {{.*}} init : !cir.ptr<!s32i> // CIR: %[[THIS_LOAD:.*]] = cir.load %[[THIS_ALLOCA]] : !cir.ptr<!cir.ptr<!rec_Derived>>, !cir.ptr<!rec_Derived> -// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr %[[THIS_LOAD]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS_LOAD]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: %[[INT:.*]] = cir.load align(4) %[[INT_ALLOCA]] : !cir.ptr<!s32i>, !s32i // CIR: cir.call @_ZN4BaseC2Ei(%[[BASE_ADDR]], %[[INT]]) : (!cir.ptr<!rec_Base>{{.*}}, !s32i{{.*}}) -> () // diff --git a/clang/test/CIR/CodeGen/multi-vtable.cpp b/clang/test/CIR/CodeGen/multi-vtable.cpp index e47cfd3cf90d3..48fb1fa88b11c 100644 --- a/clang/test/CIR/CodeGen/multi-vtable.cpp +++ b/clang/test/CIR/CodeGen/multi-vtable.cpp @@ -143,15 +143,15 @@ Child::Child() {} // CIR: %[[THIS_ADDR:.*]] = cir.alloca "this" {{.*}} init // CIR: cir.store %[[THIS_ARG]], %[[THIS_ADDR]] // CIR: %[[THIS:.*]] = cir.load %[[THIS_ADDR]] -// CIR: %[[MOTHER_BASE:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Child> nonnull [0] -> !cir.ptr<!rec_Mother> +// CIR: %[[MOTHER_BASE:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_Child> -> !cir.ptr<!rec_Mother> // CIR: cir.call @_ZN6MotherC2Ev(%[[MOTHER_BASE]]) nothrow : (!cir.ptr<!rec_Mother> {{.*}}) -> () -// CIR: %[[FATHER_BASE:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Child> nonnull [8] -> !cir.ptr<!rec_Father> +// CIR: %[[FATHER_BASE:.*]] = cir.base_class_addr nonnull %[[THIS]] [8] : !cir.ptr<!rec_Child> -> !cir.ptr<!rec_Father> // CIR: cir.call @_ZN6FatherC2Ev(%[[FATHER_BASE]]) nothrow : (!cir.ptr<!rec_Father> {{.*}}) -> () // CIR: %[[CHILD_VPTR:.*]] = cir.vtable.address_point(@_ZTV5Child, address_point = <index = 0, offset = 2>) : !cir.vptr // CIR: %[[CHILD_VPTR_ADDR:.*]] = cir.vtable.get_vptr %[[THIS]] : !cir.ptr<!rec_Child> -> !cir.ptr<!cir.vptr> // CIR: cir.store{{.*}} %[[CHILD_VPTR]], %[[CHILD_VPTR_ADDR]] : !cir.vptr, !cir.ptr<!cir.vptr> // CIR: %[[FATHER_IN_CHILD_VPTR:.*]] = cir.vtable.address_point(@_ZTV5Child, address_point = <index = 1, offset = 2>) : !cir.vptr -// CIR: %[[FATHER_BASE:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_Child> nonnull [8] -> !cir.ptr<!rec_Father> +// CIR: %[[FATHER_BASE:.*]] = cir.base_class_addr nonnull %[[THIS]] [8] : !cir.ptr<!rec_Child> -> !cir.ptr<!rec_Father> // CIR: %[[FATHER_IN_CHILD_VPTR_ADDR:.*]] = cir.vtable.get_vptr %[[FATHER_BASE]] : !cir.ptr<!rec_Father> -> !cir.ptr<!cir.vptr> // CIR: cir.store{{.*}} %[[FATHER_IN_CHILD_VPTR]], %[[FATHER_IN_CHILD_VPTR_ADDR]] : !cir.vptr, !cir.ptr<!cir.vptr> // CIR: cir.return diff --git a/clang/test/CIR/CodeGen/paren-list-agg-init.cpp b/clang/test/CIR/CodeGen/paren-list-agg-init.cpp index 9f62df5a257a8..7561deece14fc 100644 --- a/clang/test/CIR/CodeGen/paren-list-agg-init.cpp +++ b/clang/test/CIR/CodeGen/paren-list-agg-init.cpp @@ -213,7 +213,7 @@ C foo3() { // CIR: %[[C2_ALLOCA:.*]] = cir.alloca "c2" {{.*}} init : !cir.ptr<![[STRUCT_C]]> // CIR: %[[B_TMP:.*]] = cir.alloca "ref.tmp0" {{.*}} : !cir.ptr<![[STRUCT_B]]> // CIR: %[[A_TMP:.*]] = cir.alloca "ref.tmp1" {{.*}} : !cir.ptr<![[STRUCT_A]]> -// CIR: %[[C_BASE:.*]] = cir.base_class_addr %[[C2_ALLOCA]] : !cir.ptr<![[STRUCT_C]]> nonnull [0] -> !cir.ptr<![[STRUCT_B]]> +// CIR: %[[C_BASE:.*]] = cir.base_class_addr nonnull %[[C2_ALLOCA]] [0] : !cir.ptr<![[STRUCT_C]]> -> !cir.ptr<![[STRUCT_B]]> // CIR: %[[GET_A:.*]] = cir.get_member %[[B_TMP]][0] {name = "a"} : !cir.ptr<![[STRUCT_B]]> -> !cir.ptr<![[STRUCT_A]]> // CIR: %[[GET_I:.*]] = cir.get_member %[[GET_A]][0] {name = "i"} : !cir.ptr<![[STRUCT_A]]> -> !cir.ptr<!s8i> // CIR: %[[ONE:.*]] = cir.const #cir.int<1> : !s8i @@ -226,7 +226,7 @@ C foo3() { // CIR: %[[ONE:.*]] = cir.const #cir.int<1> : !s32i // CIR: cir.store{{.*}} %[[ONE]], %[[GET_B]] : !s32i, !cir.ptr<!s32i> // CIR: cir.copy %[[B_TMP]] align(8) to %[[C_BASE]] align(8) : !cir.ptr<![[STRUCT_B]]> -// CIR: %[[C_BASE_A:.*]] = cir.base_class_addr %[[C2_ALLOCA]] : !cir.ptr<![[STRUCT_C]]> nonnull [24] -> !cir.ptr<![[STRUCT_A]]> +// CIR: %[[C_BASE_A:.*]] = cir.base_class_addr nonnull %[[C2_ALLOCA]] [24] : !cir.ptr<![[STRUCT_C]]> -> !cir.ptr<![[STRUCT_A]]> // CIR: %[[GET_I:.*]] = cir.get_member %[[A_TMP]][0] {name = "i"} : !cir.ptr<![[STRUCT_A]]> -> !cir.ptr<!s8i> // CIR: %[[NINETYSEVEN:.*]] = cir.const #cir.int<97> : !s8i // CIR: cir.store{{.*}} %[[NINETYSEVEN]], %[[GET_I]] : !s8i, !cir.ptr<!s8i> diff --git a/clang/test/CIR/CodeGen/temporary-materialization-adjust.cpp b/clang/test/CIR/CodeGen/temporary-materialization-adjust.cpp index 567675a223ca3..761579079962e 100644 --- a/clang/test/CIR/CodeGen/temporary-materialization-adjust.cpp +++ b/clang/test/CIR/CodeGen/temporary-materialization-adjust.cpp @@ -50,7 +50,7 @@ void DerivedToBase() { // CIR-LABEL: cir.func {{.*}}@_Z13DerivedToBasev() // CIR: %[[TEMP_ALLOCA:.*]] = cir.alloca "ref.tmp0" align(4) : !cir.ptr<!rec_Derived> // CIR: %[[R_ALLOCA:.*]] = cir.alloca "r" align(8) init const : !cir.ptr<!cir.ptr<!s32i>> -// CIR: %[[BASE:.*]] = cir.base_class_addr %[[TEMP_ALLOCA]] : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE:.*]] = cir.base_class_addr nonnull %[[TEMP_ALLOCA]] [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> // CIR: %[[GET_MEM:.*]] = cir.get_member %[[BASE]][0] {name = "x"} : !cir.ptr<!rec_Base> -> !cir.ptr<!s32i> // CIR: cir.store align(8) %[[GET_MEM]], %[[R_ALLOCA]] : !cir.ptr<!s32i>, !cir.ptr<!cir.ptr<!s32i>> diff --git a/clang/test/CIR/CodeGen/vbase.cpp b/clang/test/CIR/CodeGen/vbase.cpp index 9461427269863..0d291c9adc0e8 100644 --- a/clang/test/CIR/CodeGen/vbase.cpp +++ b/clang/test/CIR/CodeGen/vbase.cpp @@ -76,7 +76,7 @@ void ppp() { B b; } // CIR: cir.func {{.*}}@_Z1gv() // CIR: %[[DF:.+]] = cir.alloca "df" {{.*}} init : !cir.ptr<!rec_DerivedFinal> // CIR: cir.call @_ZN12DerivedFinalC1Ev(%[[DF]]) nothrow : (!cir.ptr<!rec_DerivedFinal> {{.*}}) -> () -// CIR: %[[BASE_THIS_2:.+]] = cir.base_class_addr %[[DF]] : !cir.ptr<!rec_DerivedFinal> nonnull [0] -> !cir.ptr<!rec_Base> +// CIR: %[[BASE_THIS_2:.+]] = cir.base_class_addr nonnull %[[DF]] [0] : !cir.ptr<!rec_DerivedFinal> -> !cir.ptr<!rec_Base> // CIR: cir.call @_ZN4Base1fEv(%[[BASE_THIS_2]]) : (!cir.ptr<!rec_Base> {{.*}}) -> () // CIR: cir.return @@ -117,7 +117,7 @@ void ppp() { B b; } // CIR: %[[THIS_ADDR:.*]] = cir.alloca "this" {{.*}} init : !cir.ptr<!cir.ptr<!rec_B>> // CIR: cir.store %arg0, %[[THIS_ADDR]] : !cir.ptr<!rec_B>, !cir.ptr<!cir.ptr<!rec_B>> // CIR: %[[THIS:.*]] = cir.load %[[THIS_ADDR]] : !cir.ptr<!cir.ptr<!rec_B>>, !cir.ptr<!rec_B> -// CIR: %[[BASE_A_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_B> nonnull [12] -> !cir.ptr<!rec_A> +// CIR: %[[BASE_A_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [12] : !cir.ptr<!rec_B> -> !cir.ptr<!rec_A> // CIR: %[[VTABLE:.*]] = cir.vtable.address_point(@_ZTV1B, address_point = <index = 0, offset = 3>) : !cir.vptr // CIR: %[[B_VPTR:.*]] = cir.vtable.get_vptr %[[THIS]] : !cir.ptr<!rec_B> -> !cir.ptr<!cir.vptr> // CIR: cir.store align(8) %[[VTABLE]], %[[B_VPTR]] : !cir.vptr, !cir.ptr<!cir.vptr> diff --git a/clang/test/CIR/CodeGen/virtual-destructor-calls.cpp b/clang/test/CIR/CodeGen/virtual-destructor-calls.cpp index c9b9116bd3f7a..aeac50e46950f 100644 --- a/clang/test/CIR/CodeGen/virtual-destructor-calls.cpp +++ b/clang/test/CIR/CodeGen/virtual-destructor-calls.cpp @@ -79,7 +79,7 @@ C::~C() { } // Base (D2) dtor for C: calls B's base dtor. // CIR: cir.func{{.*}} @_ZN1CD2Ev -// CIR: %[[B:.*]] = cir.base_class_addr %[[THIS:.*]] : !cir.ptr<!rec_C> nonnull [0] -> !cir.ptr<!rec_B> +// CIR: %[[B:.*]] = cir.base_class_addr nonnull %[[THIS:.*]] [0] : !cir.ptr<!rec_C> -> !cir.ptr<!rec_B> // CIR: cir.call @_ZN1BD2Ev(%[[B]]) // LLVM: define{{.*}} void @_ZN1CD2Ev diff --git a/clang/test/CIR/CodeGen/vtt.cpp b/clang/test/CIR/CodeGen/vtt.cpp index 4fa1a5b1f4c27..6bd87bf75b7d8 100644 --- a/clang/test/CIR/CodeGen/vtt.cpp +++ b/clang/test/CIR/CodeGen/vtt.cpp @@ -254,10 +254,10 @@ D::D() {} // CIR-COMMON: cir.store %[[VTT_ARG]], %[[VTT_ADDR]] // CIR-COMMON: %[[THIS:.*]] = cir.load %[[THIS_ADDR]] // CIR-COMMON: %[[VTT:.*]] = cir.load{{.*}} %[[VTT_ADDR]] -// CIR-COMMON: %[[B_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_D> nonnull [0] -> !cir.ptr<!rec_B> +// CIR-COMMON: %[[B_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_D> -> !cir.ptr<!rec_B> // CIR-COMMON: %[[B_VTT:.*]] = cir.vtt.address_point %[[VTT]] : !cir.ptr<!cir.ptr<!void>>, offset = 1 -> !cir.ptr<!cir.ptr<!void>> // CIR-COMMON: cir.call @_ZN1BC2Ev(%[[B_ADDR]], %[[B_VTT]]) nothrow : (!cir.ptr<!rec_B> {{.*}}, !cir.ptr<!cir.ptr<!void>> {{.*}}) -> () -// CIR-COMMON: %[[C_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_D> nonnull [16] -> !cir.ptr<!rec_C> +// CIR-COMMON: %[[C_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [16] : !cir.ptr<!rec_D> -> !cir.ptr<!rec_C> // CIR-COMMON: %[[C_VTT:.*]] = cir.vtt.address_point %[[VTT]] : !cir.ptr<!cir.ptr<!void>>, offset = 3 -> !cir.ptr<!cir.ptr<!void>> // CIR-COMMON: cir.call @_ZN1CC2Ev(%[[C_ADDR]], %[[C_VTT]]) nothrow : (!cir.ptr<!rec_C> {{.*}}, !cir.ptr<!cir.ptr<!void>> {{.*}}) -> () // CIR-COMMON: %[[D_VTT:.*]] = cir.vtt.address_point %[[VTT]] : !cir.ptr<!cir.ptr<!void>>, offset = 0 -> !cir.ptr<!cir.ptr<!void>> @@ -283,7 +283,7 @@ D::D() {} // CIR-COMMON: %[[C_VTT_ADDR_POINT:.*]] = cir.vtt.address_point %[[VTT]] : !cir.ptr<!cir.ptr<!void>>, offset = 6 -> !cir.ptr<!cir.ptr<!void>> // CIR-COMMON: %[[C_VPTR_ADDR:.*]] = cir.cast bitcast %[[C_VTT_ADDR_POINT]] : !cir.ptr<!cir.ptr<!void>> -> !cir.ptr<!cir.vptr> // CIR-COMMON: %[[C_VPTR:.*]] = cir.load{{.*}} %[[C_VPTR_ADDR]] : !cir.ptr<!cir.vptr>, !cir.vptr -// CIR-COMMON: %[[C_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_D> nonnull [16] -> !cir.ptr<!rec_C> +// CIR-COMMON: %[[C_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [16] : !cir.ptr<!rec_D> -> !cir.ptr<!rec_C> // CIR-COMMON: %[[C_VPTR_ADDR:.*]] = cir.vtable.get_vptr %[[C_ADDR]] : !cir.ptr<!rec_C> -> !cir.ptr<!cir.vptr> // CIR-COMMON: cir.store{{.*}} %[[C_VPTR]], %[[C_VPTR_ADDR]] : !cir.vptr, !cir.ptr<!cir.vptr> @@ -478,23 +478,23 @@ D::D() {} // CIR-COMMON: %[[THIS_ADDR:.*]] = cir.alloca "this" {{.*}} init // CIR-COMMON: cir.store %[[THIS_ARG]], %[[THIS_ADDR]] // CIR-COMMON: %[[THIS:.*]] = cir.load %[[THIS_ADDR]] -// CIR-COMMON: %[[A_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_D> nonnull [40] -> !cir.ptr<!rec_A> +// CIR-COMMON: %[[A_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [40] : !cir.ptr<!rec_D> -> !cir.ptr<!rec_A> // CIR-COMMON: cir.call @_ZN1AC2Ev(%[[A_ADDR]]) nothrow : (!cir.ptr<!rec_A> {{.*}}) -> () -// CIR-COMMON: %[[B_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_D> nonnull [0] -> !cir.ptr<!rec_B> +// CIR-COMMON: %[[B_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [0] : !cir.ptr<!rec_D> -> !cir.ptr<!rec_B> // CIR-COMMON: %[[B_VTT:.*]] = cir.vtt.address_point @_ZTT1D, offset = 1 -> !cir.ptr<!cir.ptr<!void>> // CIR-COMMON: cir.call @_ZN1BC2Ev(%[[B_ADDR]], %[[B_VTT]]) nothrow : (!cir.ptr<!rec_B> {{.*}}, !cir.ptr<!cir.ptr<!void>> {{.*}}) -> () -// CIR-COMMON: %[[C_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_D> nonnull [16] -> !cir.ptr<!rec_C> +// CIR-COMMON: %[[C_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [16] : !cir.ptr<!rec_D> -> !cir.ptr<!rec_C> // CIR-COMMON: %[[C_VTT:.*]] = cir.vtt.address_point @_ZTT1D, offset = 3 -> !cir.ptr<!cir.ptr<!void>> // CIR-COMMON: cir.call @_ZN1CC2Ev(%[[C_ADDR]], %[[C_VTT]]) nothrow : (!cir.ptr<!rec_C> {{.*}}, !cir.ptr<!cir.ptr<!void>> {{.*}}) -> () // CIR-COMMON: %[[D_VPTR:.*]] = cir.vtable.address_point(@_ZTV1D, address_point = <index = 0, offset = 3>) : !cir.vptr // CIR-COMMON: %[[VPTR_ADDR:.*]] = cir.vtable.get_vptr %[[THIS]] : !cir.ptr<!rec_D> -> !cir.ptr<!cir.vptr> // CIR-COMMON: cir.store{{.*}} %[[D_VPTR]], %[[VPTR_ADDR]] : !cir.vptr, !cir.ptr<!cir.vptr> // CIR-COMMON: %[[A_VPTR:.*]] = cir.vtable.address_point(@_ZTV1D, address_point = <index = 2, offset = 3>) : !cir.vptr -// CIR-COMMON: %[[A_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_D> nonnull [40] -> !cir.ptr<!rec_A> +// CIR-COMMON: %[[A_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [40] : !cir.ptr<!rec_D> -> !cir.ptr<!rec_A> // CIR-COMMON: %[[A_VPTR_ADDR:.*]] = cir.vtable.get_vptr %[[A_ADDR]] : !cir.ptr<!rec_A> -> !cir.ptr<!cir.vptr> // CIR-COMMON: cir.store{{.*}} %[[A_VPTR]], %[[A_VPTR_ADDR]] : !cir.vptr, !cir.ptr<!cir.vptr> // CIR-COMMON: %[[C_VPTR:.*]] = cir.vtable.address_point(@_ZTV1D, address_point = <index = 1, offset = 3>) : !cir.vptr -// CIR-COMMON: %[[C_ADDR:.*]] = cir.base_class_addr %[[THIS]] : !cir.ptr<!rec_D> nonnull [16] -> !cir.ptr<!rec_C> +// CIR-COMMON: %[[C_ADDR:.*]] = cir.base_class_addr nonnull %[[THIS]] [16] : !cir.ptr<!rec_D> -> !cir.ptr<!rec_C> // CIR-COMMON: %[[C_VPTR_ADDR:.*]] = cir.vtable.get_vptr %[[C_ADDR]] : !cir.ptr<!rec_C> -> !cir.ptr<!cir.vptr> // CIR-COMMON: cir.store{{.*}} %[[C_VPTR]], %[[C_VPTR_ADDR]] : !cir.vptr, !cir.ptr<!cir.vptr> diff --git a/clang/test/CIR/IR/vtt-addrpoint.cir b/clang/test/CIR/IR/vtt-addrpoint.cir index 34f7663ef494a..8e255e900b450 100644 --- a/clang/test/CIR/IR/vtt-addrpoint.cir +++ b/clang/test/CIR/IR/vtt-addrpoint.cir @@ -19,7 +19,7 @@ module { cir.store %arg1, %1 : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!cir.ptr<!cir.ptr<!void>>> %2 = cir.load %0 : !cir.ptr<!cir.ptr<!rec_C>>, !cir.ptr<!rec_C> %3 = cir.load align(8) %1 : !cir.ptr<!cir.ptr<!cir.ptr<!void>>>, !cir.ptr<!cir.ptr<!void>> - %4 = cir.base_class_addr %2 : !cir.ptr<!rec_C> nonnull [0] -> !cir.ptr<!rec_B> + %4 = cir.base_class_addr nonnull %2 [0] : !cir.ptr<!rec_C> -> !cir.ptr<!rec_B> %5 = cir.vtt.address_point %3 : !cir.ptr<!cir.ptr<!void>>, offset = 1 -> !cir.ptr<!cir.ptr<!void>> // CHECK: cir.vtt.address_point %{{.*}} : !cir.ptr<!cir.ptr<!void>>, offset = 1 -> !cir.ptr<!cir.ptr<!void>> @@ -38,9 +38,9 @@ module { %0 = cir.alloca "this" align(8) init : !cir.ptr<!cir.ptr<!rec_C>> cir.store %arg0, %0 : !cir.ptr<!rec_C>, !cir.ptr<!cir.ptr<!rec_C>> %1 = cir.load %0 : !cir.ptr<!cir.ptr<!rec_C>>, !cir.ptr<!rec_C> - %2 = cir.base_class_addr %1 : !cir.ptr<!rec_C> nonnull [0] -> !cir.ptr<!rec_A> + %2 = cir.base_class_addr nonnull %1 [0] : !cir.ptr<!rec_C> -> !cir.ptr<!rec_A> cir.call @_ZN1AC2Ev(%2) : (!cir.ptr<!rec_A>) -> () - %3 = cir.base_class_addr %1 : !cir.ptr<!rec_C> nonnull [0] -> !cir.ptr<!rec_B> + %3 = cir.base_class_addr nonnull %1 [0] : !cir.ptr<!rec_C> -> !cir.ptr<!rec_B> %4 = cir.vtt.address_point @_ZTT1C, offset = 1 -> !cir.ptr<!cir.ptr<!void>> // CHECK: cir.vtt.address_point @_ZTT1C, offset = 1 -> !cir.ptr<!cir.ptr<!void>> diff --git a/clang/test/CIR/Lowering/vtt-addrpoint.cir b/clang/test/CIR/Lowering/vtt-addrpoint.cir index 37bfe5ec38151..e13a64ce3ff12 100644 --- a/clang/test/CIR/Lowering/vtt-addrpoint.cir +++ b/clang/test/CIR/Lowering/vtt-addrpoint.cir @@ -20,7 +20,7 @@ module { cir.store %arg1, %1 : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!cir.ptr<!cir.ptr<!void>>> %2 = cir.load %0 : !cir.ptr<!cir.ptr<!rec_C>>, !cir.ptr<!rec_C> %3 = cir.load align(8) %1 : !cir.ptr<!cir.ptr<!cir.ptr<!void>>>, !cir.ptr<!cir.ptr<!void>> - %4 = cir.base_class_addr %2 : !cir.ptr<!rec_C> nonnull [0] -> !cir.ptr<!rec_B> + %4 = cir.base_class_addr nonnull %2 [0] : !cir.ptr<!rec_C> -> !cir.ptr<!rec_B> %5 = cir.vtt.address_point %3 : !cir.ptr<!cir.ptr<!void>>, offset = 1 -> !cir.ptr<!cir.ptr<!void>> cir.call @_ZN1BC2Ev(%4, %5) : (!cir.ptr<!rec_B>, !cir.ptr<!cir.ptr<!void>>) -> () %6 = cir.vtt.address_point %3 : !cir.ptr<!cir.ptr<!void>>, offset = 0 -> !cir.ptr<!cir.ptr<!void>> @@ -41,9 +41,9 @@ module { %0 = cir.alloca "this" align(8) init : !cir.ptr<!cir.ptr<!rec_C>> cir.store %arg0, %0 : !cir.ptr<!rec_C>, !cir.ptr<!cir.ptr<!rec_C>> %1 = cir.load %0 : !cir.ptr<!cir.ptr<!rec_C>>, !cir.ptr<!rec_C> - %2 = cir.base_class_addr %1 : !cir.ptr<!rec_C> nonnull [0] -> !cir.ptr<!rec_A> + %2 = cir.base_class_addr nonnull %1 [0] : !cir.ptr<!rec_C> -> !cir.ptr<!rec_A> cir.call @_ZN1AC2Ev(%2) : (!cir.ptr<!rec_A>) -> () - %3 = cir.base_class_addr %1 : !cir.ptr<!rec_C> nonnull [0] -> !cir.ptr<!rec_B> + %3 = cir.base_class_addr nonnull %1 [0] : !cir.ptr<!rec_C> -> !cir.ptr<!rec_B> %4 = cir.vtt.address_point @_ZTT1C, offset = 1 -> !cir.ptr<!cir.ptr<!void>> cir.call @_ZN1BC2Ev(%3, %4) : (!cir.ptr<!rec_B>, !cir.ptr<!cir.ptr<!void>>) -> () %5 = cir.vtable.address_point(@_ZTV1C, address_point = <index = 0, offset = 3>) : !cir.vptr diff --git a/clang/test/CIR/Transforms/pure-ptr-arithmetic.cir b/clang/test/CIR/Transforms/pure-ptr-arithmetic.cir index c2fd5e4587f6f..9de8ef34a40c9 100644 --- a/clang/test/CIR/Transforms/pure-ptr-arithmetic.cir +++ b/clang/test/CIR/Transforms/pure-ptr-arithmetic.cir @@ -23,14 +23,14 @@ cir.func @dead_get_member(%arg0: !cir.ptr<!rec_S>) { // CHECK-LABEL: @dead_base_class_addr // CHECK-NOT: cir.base_class_addr cir.func @dead_base_class_addr(%arg0: !cir.ptr<!rec_Derived>) { - %0 = cir.base_class_addr %arg0 : !cir.ptr<!rec_Derived> nonnull [0] -> !cir.ptr<!rec_Base> + %0 = cir.base_class_addr nonnull %arg0 [0] : !cir.ptr<!rec_Derived> -> !cir.ptr<!rec_Base> cir.return } // CHECK-LABEL: @dead_derived_class_addr // CHECK-NOT: cir.derived_class_addr cir.func @dead_derived_class_addr(%arg0: !cir.ptr<!rec_Base>) { - %0 = cir.derived_class_addr %arg0 : !cir.ptr<!rec_Base> nonnull [0] -> !cir.ptr<!rec_Derived> + %0 = cir.derived_class_addr nonnull %arg0 [0] : !cir.ptr<!rec_Base> -> !cir.ptr<!rec_Derived> cir.return } _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
