Add cleanups for the error path and add more tests

Author: ilovepi

clang/lib/CodeGen/CGCall.cpp

@@ -4976,9 +4976,12 @@ void CodeGenFunction::EmitCallArg(CallArgList &args, const Expr *E,
     if (!CGM.getCodeGenOpts().NoLifetimeMarkersForTemporaries &&
         EmitLifetimeStart(ArgSlotAlloca.getPointer())) {
       if (E->getType().isDestructedType()) {
-        pushFullExprCleanup<CallLifetimeEnd>(NormalAndEHCleanup, ArgSlotAlloca);
+        pushFullExprCleanup<CallLifetimeEnd>(NormalEHLifetimeMarker, ArgSlotAlloca);
       } else {
         args.addLifetimeCleanup({ArgSlotAlloca.getPointer()});
+        if (getInvokeDest())
+          pushFullExprCleanup<CallLifetimeEnd>(CleanupKind::EHCleanup,
+                                               ArgSlotAlloca);
       }
     }
   }

clang/test/CodeGen/lifetime-invoke-c.c

@@ -22,16 +22,14 @@ void test() {
   // CHECK-NEXT: to label %[[CONT1:.*]] unwind label %[[LPAD1:.*]]
 
   // CHECK: [[CONT1]]:
-  // CHECK-NOT: call void @llvm.lifetime.end.p0(ptr %[[AGG1]])
-
-  // CHECK: call void @llvm.lifetime.start.p0(ptr %[[AGG2]])
+  // CHECK-NEXT: call void @llvm.lifetime.end.p0(ptr %[[AGG1]])
+  // CHECK-NEXT: call void @llvm.lifetime.start.p0(ptr %[[AGG2]])
   // CHECK: invoke void @gen(ptr{{.*}} sret(%struct.Trivial) align 4 %[[AGG2]])
   // CHECK: invoke void @func(ptr{{.*}} byval(%struct.Trivial) align 8 %[[AGG2]])
   // CHECK-NEXT: to label %[[CONT2:.*]] unwind label %[[LPAD2:.*]]
 
   // CHECK: [[CONT2]]:
-  // CHECK-DAG: call void @llvm.lifetime.end.p0(ptr %[[AGG2]])
-  // CHECK-DAG: call void @llvm.lifetime.end.p0(ptr %[[AGG1]])
+  // CHECK-NEXT: call void @llvm.lifetime.end.p0(ptr %[[AGG2]])
 
   // CHECK: [[LPAD1]]:
   // CHECK: landingpad

clang/test/CodeGenCXX/aggregate-lifetime-invoke.cpp

@@ -15,27 +15,26 @@ void test() {
 
   // CHECK: call void @llvm.lifetime.start.p0(ptr{{.*}} %[[AGG1]])
   // CHECK: invoke void @func_that_throws(ptr{{.*}} %[[AGG1]])
-  // CHECK-NEXT: to label %[[CONT1:.*]] unwind label %[[LPAD:.*]]
-
-  // CHECK: [[CONT1]]:
 
+  // CHECK: [[CONT1:.*]]:
   // CHECK-NEXT: call void @llvm.lifetime.end.p0(ptr{{.*}} %[[AGG1]])
   // CHECK-NEXT: call void @llvm.lifetime.start.p0(ptr{{.*}} %[[AGG2]])
-  // CHECK: invoke void @_func_that_throws(ptr{{.*}} %[[AGG2]])
-  // CHECK-NEXT: to label %[[CONT2:.*]] unwind label %[[LPAD]]
+  // CHECK: invoke void @func_that_throws(ptr{{.*}} %[[AGG2]])
 
-  // CHECK: [[CONT2]]:
+  // CHECK: [[CONT2:.*]]:
   // CHECK-NEXT: call void @llvm.lifetime.end.p0(ptr{{.*}} %[[AGG2]])
-  // CHECK: br label %[[TRY_CONT:.*]]
 
-  // CHECK: [[LPAD]]:
+  // CHECK: [[LPAD1:lpad.*]]:
+  // CHECK: landingpad
+  // CHECK: br label %[[EHCLEANUP:.*]]
+
+  // CHECK: [[LPAD2:lpad.*]]:
   // CHECK: landingpad
-  // CHECK-NOT: call void @llvm.lifetime.end.p0(ptr{{.*}} %[[AGG1]])
-  // CHECK-NOT: call void @llvm.lifetime.end.p0(ptr{{.*}} %[[AGG2]])
-  // CHECK: br label %[[TRY_CONT]]
+  // CHECK: call void @llvm.lifetime.end.p0(ptr{{.*}} %[[AGG2]])
+  // CHECK: br label %[[EHCLEANUP]]
 
-  // CHECK: [[TRY_CONT]]:
-  // CHECK-NEXT: ret void
+  // CHECK: [[EHCLEANUP]]:
+  // CHECK: call void @llvm.lifetime.end.p0(ptr{{.*}} %[[AGG1]])
   try {
     func_that_throws(Trivial{0});
     func_that_throws(Trivial{0});