Author: jfb Date: Thu Jul 25 13:50:09 2019 New Revision: 367051 URL: http://llvm.org/viewvc/llvm-project?rev=367051&view=rev Log: Revert "CodeGen: ensure placeholder instruction for cleanup is created"
Originally in https://reviews.llvm.org/D64656 Causes bot failures: /home/buildslave/buildslave/clang-cmake-armv8-full/llvm/tools/clang/test/CodeGenCXX/pr40771-ctad-with-lambda-copy-capture.cpp:20:16: error: CHECK-NEXT: expected string not found in input // CHECK-NEXT: call void @_ZN1RC1E1Q(%struct.R* [[TMP_R]]) ^ <stdin>:37:2: note: scanning from here %8 = call %struct.R* @_ZN1RC1E1Q(%struct.R* %1) ^ <stdin>:37:2: note: with "TMP_R" equal to "%1" %8 = call %struct.R* @_ZN1RC1E1Q(%struct.R* %1) ^ <stdin>:37:17: note: possible intended match here %8 = call %struct.R* @_ZN1RC1E1Q(%struct.R* %1) ^ Removed: cfe/trunk/test/CodeGenCXX/pr40771-ctad-with-lambda-copy-capture.cpp Modified: cfe/trunk/lib/CodeGen/CGExprAgg.cpp Modified: cfe/trunk/lib/CodeGen/CGExprAgg.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprAgg.cpp?rev=367051&r1=367050&r2=367051&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGExprAgg.cpp (original) +++ cfe/trunk/lib/CodeGen/CGExprAgg.cpp Thu Jul 25 13:50:09 2019 @@ -1495,13 +1495,6 @@ void AggExprEmitter::VisitInitListExpr(I // initializers throws an exception. SmallVector<EHScopeStack::stable_iterator, 16> cleanups; llvm::Instruction *cleanupDominator = nullptr; - auto addCleanup = [&](const EHScopeStack::stable_iterator &cleanup) { - cleanups.push_back(cleanup); - if (!cleanupDominator) // create placeholder once needed - cleanupDominator = CGF.Builder.CreateAlignedLoad( - CGF.Int8Ty, llvm::Constant::getNullValue(CGF.Int8PtrTy), - CharUnits::One()); - }; unsigned curInitIndex = 0; @@ -1526,7 +1519,7 @@ void AggExprEmitter::VisitInitListExpr(I if (QualType::DestructionKind dtorKind = Base.getType().isDestructedType()) { CGF.pushDestroy(dtorKind, V, Base.getType()); - addCleanup(CGF.EHStack.stable_begin()); + cleanups.push_back(CGF.EHStack.stable_begin()); } } } @@ -1603,9 +1596,15 @@ void AggExprEmitter::VisitInitListExpr(I = field->getType().isDestructedType()) { assert(LV.isSimple()); if (CGF.needsEHCleanup(dtorKind)) { + if (!cleanupDominator) + cleanupDominator = CGF.Builder.CreateAlignedLoad( + CGF.Int8Ty, + llvm::Constant::getNullValue(CGF.Int8PtrTy), + CharUnits::One()); // placeholder + CGF.pushDestroy(EHCleanup, LV.getAddress(), field->getType(), CGF.getDestroyer(dtorKind), false); - addCleanup(CGF.EHStack.stable_begin()); + cleanups.push_back(CGF.EHStack.stable_begin()); pushedCleanup = true; } } @@ -1621,8 +1620,6 @@ void AggExprEmitter::VisitInitListExpr(I // Deactivate all the partial cleanups in reverse order, which // generally means popping them. - assert((cleanupDominator || cleanups.empty()) && - "Missing cleanupDominator before deactivating cleanup blocks"); for (unsigned i = cleanups.size(); i != 0; --i) CGF.DeactivateCleanupBlock(cleanups[i-1], cleanupDominator); Removed: cfe/trunk/test/CodeGenCXX/pr40771-ctad-with-lambda-copy-capture.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/pr40771-ctad-with-lambda-copy-capture.cpp?rev=367050&view=auto ============================================================================== --- cfe/trunk/test/CodeGenCXX/pr40771-ctad-with-lambda-copy-capture.cpp (original) +++ cfe/trunk/test/CodeGenCXX/pr40771-ctad-with-lambda-copy-capture.cpp (removed) @@ -1,56 +0,0 @@ -// RUN: %clang_cc1 -emit-llvm --std=c++17 -fcxx-exceptions -fexceptions \ -// RUN: -discard-value-names %s -o - | FileCheck %s - -struct Q { Q(); }; -struct R { R(Q); ~R(); }; -struct S { S(Q); ~S(); }; -struct T : R, S {}; - -Q q; -T t { R{q}, S{q} }; - -// CHECK-LABEL: define internal void @__cxx_global_var_init.1() {{.*}} { -// CHECK-NEXT: [[TMP_R:%[a-z0-9.]+]] = alloca %struct.R, align 1 -// CHECK-NEXT: [[TMP_Q1:%[a-z0-9.]+]] = alloca %struct.Q, align 1 -// CHECK-NEXT: [[TMP_S:%[a-z0-9.]+]] = alloca %struct.S, align 1 -// CHECK-NEXT: [[TMP_Q2:%[a-z0-9.]+]] = alloca %struct.Q, align 1 -// CHECK-NEXT: [[XPT:%[a-z0-9.]+]] = alloca i8* -// CHECK-NEXT: [[SLOT:%[a-z0-9.]+]] = alloca i32 -// CHECK-NEXT: [[ACTIVE:%[a-z0-9.]+]] = alloca i1, align 1 -// CHECK-NEXT: call void @_ZN1RC1E1Q(%struct.R* [[TMP_R]]) -// CHECK-NEXT: store i1 true, i1* [[ACTIVE]], align 1 -// CHECK-NEXT: invoke void @_ZN1SC1E1Q(%struct.S* [[TMP_S]]) -// CHECK-NEXT: to label %[[L1:[a-z0-9.]+]] unwind label %[[L2:[a-z0-9.]+]] -// CHECK-EMPTY: -// CHECK-NEXT: [[L1]]: -// CHECK-NEXT: store i1 false, i1* [[ACTIVE]], align 1 -// CHECK-NEXT: call void @_ZN1SD1Ev(%struct.S* -// CHECK-NEXT: call void @_ZN1RD1Ev(%struct.R* -// CHECK-NEXT: [[EXIT:%[a-z0-9.]+]] = call i32 @__cxa_atexit( -// CHECK-NEXT: ret void -// CHECK-EMPTY: -// CHECK-NEXT: [[L2]]: -// CHECK-NEXT: [[LP:%[a-z0-9.]+]] = landingpad { i8*, i32 } -// CHECK-NEXT: cleanup -// CHECK-NEXT: [[X1:%[a-z0-9.]+]] = extractvalue { i8*, i32 } [[LP]], 0 -// CHECK-NEXT: store i8* [[X1]], i8** [[XPT]], align 8 -// CHECK-NEXT: [[X2:%[a-z0-9.]+]] = extractvalue { i8*, i32 } [[LP]], 1 -// CHECK-NEXT: store i32 [[X2]], i32* [[SLOT]], align 4 -// CHECK-NEXT: [[IS_ACT:%[a-z0-9.]+]] = load i1, i1* [[ACTIVE]], align 1 -// CHECK-NEXT: br i1 [[IS_ACT]], label %[[L3:[a-z0-9.]+]], label %[[L4:[a-z0-9.]+]] -// CHECK-EMPTY: -// CHECK-NEXT: [[L3]]: -// CHECK-NEXT: call void @_ZN1RD1Ev(%struct.R* -// CHECK-NEXT: br label %[[L4]] -// CHECK-EMPTY: -// CHECK-NEXT: [[L4]]: -// CHECK-NEXT: call void @_ZN1RD1Ev(%struct.R* [[TMP_R]]) -// CHECK-NEXT: br label %[[L5:[a-z0-9.]+]] -// CHECK-EMPTY: -// CHECK-NEXT: [[L5]]: -// CHECK-NEXT: [[EXN:%[a-z0-9.]+]] = load i8*, i8** [[XPT]], align 8 -// CHECK-NEXT: [[SEL:%[a-z0-9.]+]] = load i32, i32* [[SLOT]], align 4 -// CHECK-NEXT: [[LV1:%[a-z0-9.]+]] = insertvalue { i8*, i32 } undef, i8* [[EXN]], 0 -// CHECK-NEXT: [[LV2:%[a-z0-9.]+]] = insertvalue { i8*, i32 } [[LV1]], i32 [[SEL]], 1 -// CHECK-NEXT: resume { i8*, i32 } [[LV2]] -// CHECK-NEXT: } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
