Commit 1696eef2 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r340025: 

------------------------------------------------------------------------
r340025 | erichkeane | 2018-08-17 06:43:39 -0700 (Fri, 17 Aug 2018) | 8 lines

Fix for bug 38508 - Don't do PCH processing when only generating preprocessor output

This clang-cl driver change removes the PCH options when we are only generating
preprocessed output. This is similar to the behavior of Y-.

Patch by: mikerice
Differential Revision: https://reviews.llvm.org/D50640

------------------------------------------------------------------------

llvm-svn: 345311
parent ccf7f511

clang/lib/Driver/Driver.cpp

+4 −3
Original line number Diff line number Diff line
@@ -2998,9 +2998,10 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args, 
    Args.eraseArg(options::OPT__SLASH_Yc);

    YcArg = nullptr;

  }

  if (Args.hasArg(options::OPT__SLASH_Y_)) {

    // /Y- disables all pch handling.  Rather than check for it everywhere,

    // just remove clang-cl pch-related flags here.

  if (FinalPhase == phases::Preprocess || Args.hasArg(options::OPT__SLASH_Y_)) {

    // If only preprocessing or /Y- is used, all pch handling is disabled.

    // Rather than check for it everywhere, just remove clang-cl pch-related

    // flags here.

    Args.eraseArg(options::OPT__SLASH_Fp);

    Args.eraseArg(options::OPT__SLASH_Yc);

    Args.eraseArg(options::OPT__SLASH_Yu);

clang/test/Driver/cl-pch.cpp

+21 −0
Original line number Diff line number Diff line
@@ -345,3 +345,24 @@ 
// CHECK-NoSourceTP: pchfile.pch

// CHECK-NoSourceTP: -x

// CHECK-NoSourceTP: "c++"



// If only preprocessing, PCH options are ignored.

// RUN: %clang_cl /P /Ycpchfile.h /FIpchfile.h /c -### -- %s 2>&1 \

// RUN:   | FileCheck -check-prefix=CHECK-YC-P %s

// CHECK-YC-P-NOT: -emit-pch

// CHECK-YC-P-NOT: -include-pch



// RUN: %clang_cl /E /Ycpchfile.h /FIpchfile.h /c -### -- %s 2>&1 \

// RUN:   | FileCheck -check-prefix=CHECK-YC-E %s

// CHECK-YC-E-NOT: -emit-pch

// CHECK-YC-E-NOT: -include-pch



// RUN: %clang_cl /P /Ycpchfile.h /FIpchfile.h /c -### -- %s 2>&1 \

// RUN:   | FileCheck -check-prefix=CHECK-YU-P %s

// CHECK-YU-P-NOT: -emit-pch

// CHECK-YU-P-NOT: -include-pch



// RUN: %clang_cl /E /Ycpchfile.h /FIpchfile.h /c -### -- %s 2>&1 \

// RUN:   | FileCheck -check-prefix=CHECK-YU-E %s

// CHECK-YU-E-NOT: -emit-pch

// CHECK-YU-E-NOT: -include-pch

clang/test/PCH/Inputs/pch-through-use3c.cpp

0 → 100644
+2 −0
Original line number Diff line number Diff line 
int a = A;

// expected-no-diagnostics

clang/test/PCH/Inputs/pch-through3c.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#define A 1

clang/test/PCH/pch-through3c.cpp

0 → 100644
+8 −0
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -I %S -emit-pch \

// RUN:   -include Inputs/pch-through3c.h \

// RUN:   -pch-through-header=Inputs/pch-through3c.h -o %t.3c %s



// RUN: %clang_cc1 -verify -I %S -include-pch %t.3c \

// RUN:   -include Inputs/pch-through3c.h \

// RUN:   -pch-through-header=Inputs/pch-through3c.h \

// RUN:   %S/Inputs/pch-through-use3c.cpp 2>&1