Commit 7dd0d28f authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r367055: 

------------------------------------------------------------------------
r367055 | compnerd | 2019-07-25 22:59:48 +0200 (Thu, 25 Jul 2019) | 6 lines

Revert "Revert "CodeGen: ensure placeholder instruction for cleanup is created""

This reverts commit fd1274fa78cb0fd32cc1fa2e6f5bb8e62d29df19.

Add an explicit triple for the test which is pattern matching overly
aggressively.
------------------------------------------------------------------------

llvm-svn: 367209
parent 1634b4bc

clang/lib/CodeGen/CGExprAgg.cpp

+11 −8
Original line number Diff line number Diff line
@@ -1495,6 +1495,13 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E) { 
  // 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;
@@ -1519,7 +1526,7 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E) { 
      if (QualType::DestructionKind dtorKind =

              Base.getType().isDestructedType()) {

        CGF.pushDestroy(dtorKind, V, Base.getType());

        cleanups.push_back(CGF.EHStack.stable_begin());

        addCleanup(CGF.EHStack.stable_begin());

      }

    }

  }
@@ -1596,15 +1603,9 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E) { 
          = 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);

        cleanups.push_back(CGF.EHStack.stable_begin());

        addCleanup(CGF.EHStack.stable_begin());

        pushedCleanup = true;

      }

    }
@@ -1620,6 +1621,8 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E) { 


  // 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);

clang/test/CodeGenCXX/pr40771-ctad-with-lambda-copy-capture.cpp

0 → 100644
+55 −0
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm --std=c++17 -fcxx-exceptions -fexceptions -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: }