Revert r95363 and r95375, which broke self-host.

llvm-svn: 95389

1 files changed, 1 insertions, 11 deletions

diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
index a2073e66738..a358b54fa3c 100644
--- a/clang/lib/CodeGen/CGExprConstant.cpp
+++ b/clang/lib/CodeGen/CGExprConstant.cpp
@@ -675,19 +675,9 @@ public:
     if (!E->getConstructor()->isTrivial())
       return 0;
 
-    // FIXME: We should not have to call getBaseElementType here.
-    QualType Ty = CGM.getContext().getBaseElementType(E->getType());
-
-    const CXXRecordDecl *RD = 
-      cast<CXXRecordDecl>(Ty->getAs<RecordType>()->getDecl());
-    
-    // If the class doesn't have a trivial destructor, we can't emit it as a
-    // constant expr.
-    if (!RD->hasTrivialDestructor())
-      return 0;
-    
     // Only copy and default constructors can be trivial.
 
+    QualType Ty = E->getType();
 
     if (E->getNumArgs()) {
       assert(E->getNumArgs() == 1 && "trivial ctor with > 1 argument");