1 files changed, 0 insertions, 16 deletions
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index d4374ff6e09..392c7b1ded5 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -3063,22 +3063,6 @@ void CodeGenFunction::EmitDelegateCallArg(CallArgList &args,
   } else {
     args.add(convertTempToRValue(local, type, loc), type);
   }
-
-  // Deactivate the cleanup for the callee-destructed param that was pushed.
-  if (hasAggregateEvaluationKind(type) &&
-      getContext().isParamDestroyedInCallee(type)) {
-    EHScopeStack::stable_iterator cleanup =
-        CalleeDestructedParamCleanups.lookup(cast<ParmVarDecl>(param));
-    if (cleanup.isValid()) {
-      // This unreachable is a temporary marker which will be removed later.
-      llvm::Instruction *isActive = Builder.CreateUnreachable();
-      args.addArgCleanupDeactivation(cleanup, isActive);
-    } else
-      // A param cleanup should have been pushed unless we are code-generating
-      // a thunk.
-      assert(CurFuncIsThunk &&
-             "cleanup for callee-destructed param not recorded");
-  }
 }
 
 static bool isProvablyNull(llvm::Value *addr) {