diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -1618,6 +1618,14 @@
           GEP->eraseFromParent();
   }
 
+  // Base class has a destructor and there's no fields in the class itself,
+  // create a placeholder here since we did not create one earlier.
+  if (!cleanupDominator && !cleanups.empty())
+    cleanupDominator = CGF.Builder.CreateAlignedLoad(
+        CGF.Int8Ty,
+        llvm::Constant::getNullValue(CGF.Int8PtrTy),
+        CharUnits::One()); // placeholder
+
   // Deactivate all the partial cleanups in reverse order, which
   // generally means popping them.
   for (unsigned i = cleanups.size(); i != 0; --i)