remove my hacks that aggressively threw away multiple

instantiation history in an effort to speed up c99-intconst-1.c.
Now that multiple nested instantiations are allowed, we just
make them and don't pay the cost of lookups.  With the other
changes that went in before this, reverting this is actually
a speedup for c99-intconst-1.c, speeding it up from 1.96s to 1.80s,
and preserves much better loc info.

llvm-svn: 63036

1 files changed, 0 insertions, 6 deletions

diff --git a/clang/lib/Lex/TokenLexer.cpp b/clang/lib/Lex/TokenLexer.cpp
index 7ae61beb888..40f6640cd75 100644
--- a/clang/lib/Lex/TokenLexer.cpp
+++ b/clang/lib/Lex/TokenLexer.cpp
@@ -33,12 +33,6 @@ void TokenLexer::Init(Token &Tok, MacroArgs *Actuals) {
   CurToken = 0;
   
   InstantiateLoc = Tok.getLocation();
-
-  // If the instantiation loc is not already a FileID, resolve it here.  If we
-  // don't do this, we end up doing it once per token lexed.
-  if (!InstantiateLoc.isFileID())
-    InstantiateLoc = PP.getSourceManager().getInstantiationLoc(InstantiateLoc);
-  
   AtStartOfLine = Tok.isAtStartOfLine();
   HasLeadingSpace = Tok.hasLeadingSpace();
   Tokens = &*Macro->tokens_begin();