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

[Daniel Dunbar]

Author: ddunbar
Date: Thu Aug 12 17:40:30 2010
New Revision: 110966

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


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

Propchange: cfe/branches/Apple/whitney-IB/src/tools/clang/
------------------------------------------------------------------------------
    svn:mergeinfo = /cfe/trunk:110882

Modified: cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaLookup.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaLookup.cpp?rev=110966&r1=110965&r2=110966&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaLookup.cpp (original)
+++ cfe/branches/Apple/whitney-IB/src/tools/clang/lib/Sema/SemaLookup.cpp Thu Aug 12 17:40:30 2010
@@ -469,6 +469,10 @@
 /// the class at this point.
 static bool CanDeclareSpecialMemberFunction(ASTContext &Context,
                                             const CXXRecordDecl *Class) {
+  // Don't do it if the class is invalid.
+  if (Class->isInvalidDecl())
+    return false;
+  
   // We need to have a definition for the class.
   if (!Class->getDefinition() || Class->isDependentContext())
     return false;