replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix processing of -Ufoo to not inject "#undef foo 1" into the predefines 

buffer.  This caused exciting nonsense like this:

$ clang t.c -fsyntax-only -UMACRO
In file included from <built-in>:104:
<command line>:1:14: warning: extra tokens at end of #undef directive [-Wextra-tokens]
#undef MACRO 1
             ^
             //
1 diagnostic generated.

rdar://6891800

llvm-svn: 71860
This commit is contained in:
Chris Lattner 2009-05-15 16:08:43 +00:00
parent 3281977dbb
commit 4579b76ff6
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/Frontend/InitPreprocessor.cpp
View File

@ -51,6 +51,16 @@ static void DefineBuiltinMacro(std::vector<char> &Buf, const char *Macro,
Buf.push_back('\n');
}
// Append a #undef line to Buf for Macro. Macro should be of the form XXX
// and we emit "#undef XXX".
static void UndefineBuiltinMacro(std::vector<char> &Buf, const char *Macro) {
// Push "macroname".
const char *Command = "#undef ";
Buf.insert(Buf.end(), Command, Command+strlen(Command));
Buf.insert(Buf.end(), Macro, Macro+strlen(Macro));
Buf.push_back('\n');
}
/// Add the quoted name of an implicit include file.
static void AddQuotedIncludePath(std::vector<char> &Buf,
const std::string &File) {
@ -441,7 +451,7 @@ bool InitializePreprocessor(Preprocessor &PP,
for (PreprocessorInitOptions::macro_iterator I = InitOpts.macro_begin(),
E = InitOpts.macro_end(); I != E; ++I) {
if (I->second) // isUndef
DefineBuiltinMacro(PredefineBuffer, I->first.c_str(), "#undef ");
UndefineBuiltinMacro(PredefineBuffer, I->first.c_str());
else
DefineBuiltinMacro(PredefineBuffer, I->first.c_str());
}