Driver: Restore proper naming of crashdump files

Based on a review of r211411 by Jordan Rose.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@211572 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 4698999cb776f505f90da0bb31dcba06d18b3d18..d4c03130ba859cef8213d29bf5da2cf9fffb3ab1 100644 (file)
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -1303,7 +1303,8 @@ Action *Driver::ConstructPhaseAction(const ArgList &Args, phases::ID Phase,
     } else {
       OutputTy = Input->getType();
       if (!Args.hasFlag(options::OPT_frewrite_includes,
-                        options::OPT_fno_rewrite_includes, false))
+                        options::OPT_fno_rewrite_includes, false) &&
+          !CCGenDiagnostics)
         OutputTy = types::getPreprocessedType(OutputTy);
       assert(OutputTy != types::TY_INVALID &&
              "Cannot preprocess this input type!");

diff --git a/test/Driver/crash-report-modules.m b/test/Driver/crash-report-modules.m
index 4487a3407b1997cde26e5a53340b690ee8ff80bc..ff805ed453a483ff09c1f3da46065fe4decdb1a9 100644 (file)
--- a/test/Driver/crash-report-modules.m
+++ b/test/Driver/crash-report-modules.m
@@ -5,11 +5,11 @@
 // RUN: %clang -fsyntax-only %s -I %S/Inputs/module                     \
 // RUN: -fmodules -fmodules-cache-path=/tmp/ -DFOO=BAR 2>&1 | FileCheck %s
 
-// RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crash-report-*.mi
+// RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crash-report-*.m
 // RUN: FileCheck --check-prefix=CHECKSH %s -input-file %t/crash-report-*.sh
 // REQUIRES: crash-recovery
 
-// because of the glob (*.mi, *.sh)
+// because of the glob (*.m, *.sh)
 // REQUIRES: shell
 
 // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
@@ -19,7 +19,7 @@
 const int x = MODULE_MACRO;
 
 // CHECK: Preprocessed source(s) and associated run script(s) are located at:
-// CHECK-NEXT: note: diagnostic msg: {{.*}}.mi
+// CHECK-NEXT: note: diagnostic msg: {{.*}}.m
 // CHECK-NEXT: note: diagnostic msg: {{.*}}.cache
 
 // CHECKSRC: @import simple;

diff --git a/test/Driver/crash-report.c b/test/Driver/crash-report.c
index 5a414e4d1ab71bc7556dc24f86aba18399dfaa68..f3c2e472e4180e3ea535b514d2424e171f2fcfed 100644 (file)
--- a/test/Driver/crash-report.c
+++ b/test/Driver/crash-report.c
@@ -6,11 +6,11 @@
 // RUN:  -Xclang -internal-isystem -Xclang /tmp/                         \
 // RUN:  -Xclang -internal-externc-isystem -Xclang /tmp/                 \
 // RUN:  -DFOO=BAR 2>&1 | FileCheck %s
-// RUN: cat %t/crash-report-*.i | FileCheck --check-prefix=CHECKSRC %s
+// RUN: cat %t/crash-report-*.c | FileCheck --check-prefix=CHECKSRC %s
 // RUN: cat %t/crash-report-*.sh | FileCheck --check-prefix=CHECKSH %s
 // REQUIRES: crash-recovery
 
-// because of the glob (*.i, *.sh)
+// because of the glob (*.c, *.sh)
 // REQUIRES: shell
 
 // RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH=1 %clang -fsyntax-only -x c /dev/null -lstdc++ 2>&1 | FileCheck %s
@@ -20,7 +20,7 @@
 
 #pragma clang __debug parser_crash
 // CHECK: Preprocessed source(s) and associated run script(s) are located at:
-// CHECK-NEXT: note: diagnostic msg: {{.*}}.i
+// CHECK-NEXT: note: diagnostic msg: {{.*}}.c
 FOO
 // CHECKSRC: FOO
 // CHECKSH: -cc1