From 1569ce68681d909594d64f9b056d71f5dd7563bf Mon Sep 17 00:00:00 2001 From: Roman Divacky Date: Tue, 1 Dec 2009 11:08:04 +0000 Subject: Update clang to r90226. --- lib/Frontend/CacheTokens.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/Frontend/CacheTokens.cpp') diff --git a/lib/Frontend/CacheTokens.cpp b/lib/Frontend/CacheTokens.cpp index 339a1c466bc9..7296246df21a 100644 --- a/lib/Frontend/CacheTokens.cpp +++ b/lib/Frontend/CacheTokens.cpp @@ -22,7 +22,6 @@ #include "clang/Lex/Preprocessor.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringMap.h" -#include "llvm/Support/Compiler.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Path.h" @@ -40,7 +39,7 @@ using namespace clang::io; //===----------------------------------------------------------------------===// namespace { -class VISIBILITY_HIDDEN PTHEntry { +class PTHEntry { Offset TokenData, PPCondData; public: @@ -54,7 +53,7 @@ public: }; -class VISIBILITY_HIDDEN PTHEntryKeyVariant { +class PTHEntryKeyVariant { union { const FileEntry* FE; const char* Path; }; enum { IsFE = 0x1, IsDE = 0x2, IsNoExist = 0x0 } Kind; struct stat *StatBuf; @@ -105,7 +104,7 @@ public: } }; -class VISIBILITY_HIDDEN FileEntryPTHEntryInfo { +class FileEntryPTHEntryInfo { public: typedef PTHEntryKeyVariant key_type; typedef key_type key_type_ref; @@ -169,7 +168,7 @@ typedef llvm::DenseMap IDMap; typedef llvm::StringMap CachedStrsTy; namespace { -class VISIBILITY_HIDDEN PTHWriter { +class PTHWriter { IDMap IM; llvm::raw_fd_ostream& Out; Preprocessor& PP; @@ -483,7 +482,8 @@ void PTHWriter::GeneratePTH(const std::string *MainFile) { if (!B) continue; FileID FID = SM.createFileID(FE, SourceLocation(), SrcMgr::C_User); - Lexer L(FID, SM, LOpts); + const llvm::MemoryBuffer *FromFile = SM.getBuffer(FID); + Lexer L(FID, FromFile, SM, LOpts); PM.insert(FE, LexTokens(L)); } @@ -577,7 +577,7 @@ public: }; namespace { -class VISIBILITY_HIDDEN PTHIdentifierTableTrait { +class PTHIdentifierTableTrait { public: typedef PTHIdKey* key_type; typedef key_type key_type_ref; -- cgit v1.2.3