[llvm-branch-commits] [cfe-branch] r110967 - in /cfe/branches/Apple/whitney-IB/src/tools/clang: ./ lib/Sema/SemaExprCXX.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Aug 12 17:42:18 2010
New Revision: 110967

URL: http://llvm.org/viewvc/llvm-project?rev=110967&view=rev
Log:
--- Merging r110901 into 'src/tools/clang':
U    src/tools/clang/lib/Sema/SemaExprCXX.cpp


Modified:
    cfe/branches/Apple/whitney-IB/src/tools/clang/   (props changed)
    cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaExprCXX.cpp

Propchange: cfe/branches/Apple/whitney-IB/src/tools/clang/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 12 17:42:18 2010
@@ -1 +1 @@
-/cfe/trunk:110882
+/cfe/trunk:110882,110901

Modified: cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaExprCXX.cpp?rev=110967&r1=110966&r2=110967&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaExprCXX.cpp (original)
+++ cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaExprCXX.cpp Thu Aug 12 17:42:18 2010
@@ -2619,7 +2619,7 @@
   // That should be enough to guarantee that this type is complete.
   // If it has a trivial destructor, we can avoid the extra copy.
   CXXRecordDecl *RD = cast<CXXRecordDecl>(RT->getDecl());
-  if (RD->hasTrivialDestructor())
+  if (RD->isInvalidDecl() || RD->hasTrivialDestructor())
     return Owned(E);
 
   CXXTemporary *Temp = CXXTemporary::Create(Context, LookupDestructor(RD));