diff options
| -rw-r--r-- | include/clang/Lex/Preprocessor.h | 2 | ||||
| -rw-r--r-- | lib/Lex/PPDirectives.cpp | 2 | ||||
| -rw-r--r-- | lib/Lex/PPLexerChange.cpp | 4 | ||||
| -rw-r--r-- | lib/Lex/Preprocessor.cpp | 7 |
4 files changed, 9 insertions, 6 deletions
diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h index cd202e5899..50d1540741 100644 --- a/include/clang/Lex/Preprocessor.h +++ b/include/clang/Lex/Preprocessor.h @@ -335,7 +335,7 @@ public: /// start lexing tokens from it instead of the current buffer. Return true /// and fill in ErrorStr with the error information on failure. bool EnterSourceFile(FileID CurFileID, const DirectoryLookup *Dir, - std::string *ErrorStr = 0); + std::string &ErrorStr); /// EnterMacro - Add a Macro to the top of the include stack and start lexing /// tokens from it instead of the current buffer. Args specifies the diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index 028593f39c..f734edfe23 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -1113,7 +1113,7 @@ void Preprocessor::HandleIncludeDirective(Token &IncludeTok, // Finally, if all is good, enter the new file! std::string ErrorStr; - if (EnterSourceFile(FID, CurDir, &ErrorStr)) + if (EnterSourceFile(FID, CurDir, ErrorStr)) Diag(FilenameTok, diag::err_pp_error_opening_file) << std::string(SourceMgr.getFileEntryForID(FID)->getName()) << ErrorStr; } diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp index 1580b87dac..5cdfeafa33 100644 --- a/lib/Lex/PPLexerChange.cpp +++ b/lib/Lex/PPLexerChange.cpp @@ -65,7 +65,7 @@ PreprocessorLexer *Preprocessor::getCurrentFileLexer() const { /// EnterSourceFile - Add a source file to the top of the include stack and /// start lexing tokens from it instead of the current buffer. bool Preprocessor::EnterSourceFile(FileID FID, const DirectoryLookup *CurDir, - std::string *ErrorStr) { + std::string &ErrorStr) { assert(CurTokenLexer == 0 && "Cannot #include a file inside a macro!"); ++NumEnteredSourceFiles; @@ -81,8 +81,8 @@ bool Preprocessor::EnterSourceFile(FileID FID, const DirectoryLookup *CurDir, // Get the MemoryBuffer for this FID, if it fails, we fail. const llvm::MemoryBuffer *InputFile = - getSourceManager().getBuffer(FID, ErrorStr); if (InputFile == 0) + getSourceManager().getBuffer(FID, &ErrorStr); return true; EnterSourceFileWithLexer(new Lexer(FID, InputFile, *this), CurDir); diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index 229826af5d..49a25f2574 100644 --- a/lib/Lex/Preprocessor.cpp +++ b/lib/Lex/Preprocessor.cpp @@ -438,7 +438,9 @@ void Preprocessor::EnterMainSourceFile() { FileID MainFileID = SourceMgr.getMainFileID(); // Enter the main file source buffer. - EnterSourceFile(MainFileID, 0); + std::string ErrorStr; + bool Res = EnterSourceFile(MainFileID, 0, ErrorStr); + assert(!Res && "Entering main file should not fail!"); // Tell the header info that the main file was entered. If the file is later // #imported, it won't be re-entered. @@ -464,7 +466,8 @@ void Preprocessor::EnterMainSourceFile() { assert(!FID.isInvalid() && "Could not create FileID for predefines?"); // Start parsing the predefines. - EnterSourceFile(FID, 0); + Res = EnterSourceFile(FID, 0, ErrorStr); + assert(!Res && "Entering predefines should not fail!"); } |