[cfe-commits] r116974 - /cfe/trunk/lib/Serialization/ASTReaderDecl.cpp

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Wed Oct 20 18:48:40 2010
New Revision: 116974

URL: http://llvm.org/viewvc/llvm-project?rev=116974&view=rev
Log:
Modify the assumptions of an assert; the updated latest redeclaration can have the same location
if it's a template specialization pointing at the template.

Modified:
    cfe/trunk/lib/Serialization/ASTReaderDecl.cpp

Modified: cfe/trunk/lib/Serialization/ASTReaderDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderDecl.cpp?rev=116974&r1=116973&r2=116974&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReaderDecl.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReaderDecl.cpp Wed Oct 20 18:48:40 2010
@@ -989,9 +989,9 @@
       Decl *NewLatest = Reader.GetDecl(I->second);
       assert((LatestDecl->getLocation().isInvalid() ||
               NewLatest->getLocation().isInvalid()  ||
-              Reader.SourceMgr.isBeforeInTranslationUnit(
-                                                   LatestDecl->getLocation(),
-                                                   NewLatest->getLocation())) &&
+              !Reader.SourceMgr.isBeforeInTranslationUnit(
+                                                  NewLatest->getLocation(),
+                                                  LatestDecl->getLocation())) &&
              "The new latest is supposed to come after the previous latest");
       LatestDecl = cast<RedeclarableTemplateDecl>(NewLatest);
     }
@@ -1203,9 +1203,9 @@
     Decl *NewLatest = Reader.GetDecl(I->second);
     assert((D->getMostRecentDeclaration()->getLocation().isInvalid() ||
             NewLatest->getLocation().isInvalid() ||
-            Reader.SourceMgr.isBeforeInTranslationUnit(
-                                   D->getMostRecentDeclaration()->getLocation(),
-                                   NewLatest->getLocation())) &&
+            !Reader.SourceMgr.isBeforeInTranslationUnit(
+                               NewLatest->getLocation(),
+                               D->getMostRecentDeclaration()->getLocation())) &&
            "The new latest is supposed to come after the previous latest");
     D->RedeclLink
         = typename Redeclarable<T>::LatestDeclLink(cast_or_null<T>(NewLatest));