[cfe-commits] r161019 - in /cfe/trunk: lib/Driver/Driver.cpp lib/Driver/Tools.cpp test/Driver/clang_f_opts.h

[Aaron Ballman]

Author: aaronballman
Date: Mon Jul 30 20:21:00 2012
New Revision: 161019

URL: http://llvm.org/viewvc/llvm-project?rev=161019&view=rev
Log:
No longer emitting a PCH file when using -fsyntax-only on a header file.  Fixes PR13343.

Added:
    cfe/trunk/test/Driver/clang_f_opts.h
Modified:
    cfe/trunk/lib/Driver/Driver.cpp
    cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=161019&r1=161018&r2=161019&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Mon Jul 30 20:21:00 2012
@@ -1210,8 +1210,14 @@
     }
     return new PreprocessJobAction(Input, OutputTy);
   }
-  case phases::Precompile:
-    return new PrecompileJobAction(Input, types::TY_PCH);
+  case phases::Precompile: {
+    types::ID OutputTy = types::TY_PCH;
+    if (Args.hasArg(options::OPT_fsyntax_only)) {
+      // Syntax checks should not emit a PCH file
+      OutputTy = types::TY_Nothing;
+    }
+    return new PrecompileJobAction(Input, OutputTy);
+  }
   case phases::Compile: {
     if (Args.hasArg(options::OPT_fsyntax_only)) {
       return new CompileJobAction(Input, types::TY_Nothing);

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=161019&r1=161018&r2=161019&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Mon Jul 30 20:21:00 2012
@@ -1537,7 +1537,9 @@
     // Use PCH if the user requested it.
     bool UsePCH = D.CCCUsePCH;
 
-    if (UsePCH)
+    if (JA.getType() == types::TY_Nothing)
+      CmdArgs.push_back("-fsyntax-only");
+    else if (UsePCH)
       CmdArgs.push_back("-emit-pch");
     else
       CmdArgs.push_back("-emit-pth");

Added: cfe/trunk/test/Driver/clang_f_opts.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/clang_f_opts.h?rev=161019&view=auto
==============================================================================
--- cfe/trunk/test/Driver/clang_f_opts.h (added)
+++ cfe/trunk/test/Driver/clang_f_opts.h Mon Jul 30 20:21:00 2012
@@ -0,0 +1,2 @@
+// RUN: %clang -### -fsyntax-only %s 2>&1 | FileCheck %s
+// CHECK: -fsyntax-only