maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Driver: Restore proper naming of crashdump files 

Based on a review of r211411 by Jordan Rose.

llvm-svn: 211572
This commit is contained in:
Justin Bogner 2014-06-24 08:01:01 +00:00
parent 23fc9afa4d
commit ce8245b5fd
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Driver/Driver.cpp
View File

@ -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!");

6
clang/test/Driver/crash-report-modules.m
View File

@ -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;

6
clang/test/Driver/crash-report.c
View File

@ -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