Revert most of the functionality in r165001. Instead, make sure that
the ASTReader doesn't attach a body to a function that is already
defined elsewhere.
llvm-svn: 165137
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index cc6d073..f5de6c4 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -5614,10 +5614,7 @@
SourceLocation Loc
= SourceLocation::getFromRawEncoding(PendingInstantiations[Idx++]);
- // For modules, find out whether an instantiation already exists
- if (!getContext().getLangOpts().Modules
- || needPendingInstantiation(D))
- Pending.push_back(std::make_pair(D, Loc));
+ Pending.push_back(std::make_pair(D, Loc));
}
PendingInstantiations.clear();
}
@@ -6528,5 +6525,4 @@
J != F; ++J)
delete J->first;
}
- assert(RedeclsAddedToAST.empty() && "RedeclsAddedToAST not empty!");
}