[cfe-commits] r85932 - in /cfe/trunk: include/clang/Frontend/InitPreprocessor.h lib/Driver/Tools.cpp lib/Frontend/InitPreprocessor.cpp test/Preprocessor/macro_undef.c tools/clang-cc/clang-cc.cpp

[Chris Lattner]

Author: lattner
Date: Tue Nov  3 13:50:27 2009
New Revision: 85932

URL: http://llvm.org/viewvc/llvm-project?rev=85932&view=rev
Log:
Implement support for the -undef command line option, patch by
Roman Divacky! PR5363

Added:
    cfe/trunk/test/Preprocessor/macro_undef.c
Modified:
    cfe/trunk/include/clang/Frontend/InitPreprocessor.h
    cfe/trunk/lib/Driver/Tools.cpp
    cfe/trunk/lib/Frontend/InitPreprocessor.cpp
    cfe/trunk/tools/clang-cc/clang-cc.cpp

Modified: cfe/trunk/include/clang/Frontend/InitPreprocessor.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/InitPreprocessor.h?rev=85932&r1=85931&r2=85932&view=diff

==============================================================================
--- cfe/trunk/include/clang/Frontend/InitPreprocessor.h (original)
+++ cfe/trunk/include/clang/Frontend/InitPreprocessor.h Tue Nov  3 13:50:27 2009
@@ -63,7 +63,8 @@
 /// environment ready to process a single file. This returns true on error.
 ///
 bool InitializePreprocessor(Preprocessor &PP,
-                            const PreprocessorInitOptions& InitOptions);
+                            const PreprocessorInitOptions& InitOptions,
+                            bool undef_macros);
 
 } // end namespace clang
 

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=85932&r1=85931&r2=85932&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Tue Nov  3 13:50:27 2009
@@ -1015,6 +1015,8 @@
       II.getInputArg().renderAsInput(Args, CmdArgs);
   }
 
+  Args.AddAllArgs(CmdArgs, options::OPT_undef);
+
   const char *Exec =
     Args.MakeArgString(getToolChain().GetProgramPath(C, "clang-cc"));
   Dest.addCommand(new Command(JA, Exec, CmdArgs));

Modified: cfe/trunk/lib/Frontend/InitPreprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=85932&r1=85931&r2=85932&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/InitPreprocessor.cpp (original)
+++ cfe/trunk/lib/Frontend/InitPreprocessor.cpp Tue Nov  3 13:50:27 2009
@@ -443,7 +443,8 @@
 /// environment ready to process a single file. This returns true on error.
 ///
 bool clang::InitializePreprocessor(Preprocessor &PP,
-                                   const PreprocessorInitOptions &InitOpts) {
+                                   const PreprocessorInitOptions &InitOpts,
+                                   bool undef_macros) {
   std::vector<char> PredefineBuffer;
 
   const char *LineDirective = "# 1 \"<built-in>\" 3\n";
@@ -451,8 +452,9 @@
                          LineDirective, LineDirective+strlen(LineDirective));
 
   // Install things like __POWERPC__, __GNUC__, etc into the macro table.
-  InitializePredefinedMacros(PP.getTargetInfo(), PP.getLangOptions(),
-                             PredefineBuffer);
+  if (!undef_macros)
+    InitializePredefinedMacros(PP.getTargetInfo(), PP.getLangOptions(),
+                               PredefineBuffer);
 
   // Add on the predefines from the driver.  Wrap in a #line directive to report
   // that they come from the command line.

Added: cfe/trunk/test/Preprocessor/macro_undef.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/macro_undef.c?rev=85932&view=auto

==============================================================================
--- cfe/trunk/test/Preprocessor/macro_undef.c (added)
+++ cfe/trunk/test/Preprocessor/macro_undef.c Tue Nov  3 13:50:27 2009
@@ -0,0 +1,4 @@
+// RUN: clang-cc -dM -undef -Dfoo=1 -E %s | FileCheck %s
+
+// CHECK-NOT: #define __clang__
+// CHECK: #define foo 1

Modified: cfe/trunk/tools/clang-cc/clang-cc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-cc/clang-cc.cpp?rev=85932&r1=85931&r2=85932&view=diff

==============================================================================
--- cfe/trunk/tools/clang-cc/clang-cc.cpp (original)
+++ cfe/trunk/tools/clang-cc/clang-cc.cpp Tue Nov  3 13:50:27 2009
@@ -932,6 +932,9 @@
 //   -A...    - Play with #assertions
 //   -undef   - Undefine all predefined macros
 
+static llvm::cl::opt<bool>
+undef_macros("undef", llvm::cl::value_desc("macro"), llvm::cl::desc("undef all system defines"));
+
 static llvm::cl::list<std::string>
 D_macros("D", llvm::cl::value_desc("macro"), llvm::cl::Prefix,
        llvm::cl::desc("Predefine the specified macro"));
@@ -1243,7 +1246,7 @@
 
     PreprocessorInitOptions InitOpts;
     InitializePreprocessorInitOptions(InitOpts);
-    if (InitializePreprocessor(*PP, InitOpts))
+    if (InitializePreprocessor(*PP, InitOpts, undef_macros))
       return 0;
 
     return PP.take();