[Clang] Don't let gen crash diagnostics fail when '#pragma clang __debug crash' is used
ClosedPublic
Actions

Authored by aganea on Feb 5 2020, 9:54 AM.

Details

Reviewers

hans
rnk

Commits

rG5fedc2b41085: [Clang] Avoid crashing when generating crash diagnostics when '#pragma clang…

Summary

When #pragma clang __debug crash is used, currently Driver::generateCompilationDiagnostics() doesn't work. The clang -E created for diagnostics would crash again, because it reaches Pragma.cpp, L1043 again.

We simply disable the intended crashing behavior with a new cc1 flag -disable-pragma-debug-crash.

Notes:

#pragma clang __debug llvm_report_fatal isn't currently tested below, because it needs exit() to be handled differently in -fintegrated-cc1 mode.
This patch is also needed to further test that -MF is removed from the gen crash diagnostic cmd-line (currently not the case).

This patch is point 1. in D73742

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

aganea created this revision.Feb 5 2020, 9:54 AM

Herald added a project: Restricted Project. · View Herald TranscriptFeb 5 2020, 9:54 AM

Herald added a subscriber: cfe-commits. · View Herald Transcript

aganea mentioned this in D74076: [Clang][Driver] Remove -M group options before generating crash diagnostics.Feb 5 2020, 10:20 AM

aganea mentioned this in D73742: [Clang][Driver] After default -fintegrated-cc1, fix report_fatal_error no longer generates preprocessed source + reproducer.sh.Feb 5 2020, 11:04 AM

hans accepted this revision.Feb 6 2020, 12:59 AM

hans added inline comments.

clang/lib/Lex/Pragma.cpp
1106–1107	Maybe also add to the description that you're removing this one. And does this mean we can drop the CrashRecoveryContext.h include?

This revision is now accepted and ready to land.Feb 6 2020, 12:59 AM

hans added inline comments.Feb 6 2020, 2:46 AM

clang/lib/Lex/Pragma.cpp
1106–1107	Oh, I see, that's in D74063.

Closed by commit rG5fedc2b41085: [Clang] Avoid crashing when generating crash diagnostics when '#pragma clang… (authored by aganea). · Explain WhyFeb 6 2020, 12:52 PM

This revision was automatically updated to reflect the committed changes.

aganea marked 2 inline comments as done.

aganea mentioned this in rGf41ec709d9d3: [Clang][Driver] Remove -M group options before generating crash diagnostics.Feb 6 2020, 1:29 PM

FYI, temporarily reverted this in fafddbd956dbe439787f6d717c247e648bb07ff5 since it was causing failures in Clang :: Driver/crash-report.c. I didn't see the failure on all buildbots (otherwise I could have just marked it XFAIL), though I may have been looking in the wrong place.

Sample breakage: http://lab.llvm.org:8011/builders/clang-with-thin-lto-ubuntu/builds/21321/steps/test-stage1-compiler/logs/stdio

Logs:

Command Output (stderr):
--
/home/buildslave/ps4-buildslave1/clang-with-thin-lto-ubuntu/llvm-project/clang/test/Driver/crash-report.c:48:11: error: CHECK: expected string not found in input
// CHECK: Preprocessed source(s) and associated run script(s) are located at:
          ^
<stdin>:1:1: note: scanning from here
/home/buildslave/ps4-buildslave1/clang-with-thin-lto-ubuntu/llvm-project/clang/test/Driver/crash-report.c:50:1: error: unknown type name 'BAZ'
^

Relanded as rG75f09b54429bee17a96e2ba7a2ac0f0a8a7f7e74.

In D74070#1863989, @aganea wrote:

Relanded as rG75f09b54429bee17a96e2ba7a2ac0f0a8a7f7e74.

Pushed that to 10.x as 0e1c734fa5b88ec7efc2bcf8d45ed58f6ba48b91

Revision Contents
Changeset List

			Path	Packages
M			clang/include/clang/Driver/CC1Options.td (2 lines)
M			clang/include/clang/Lex/PreprocessorOptions.h (3 lines)
M			clang/lib/Driver/ToolChains/Clang.cpp (5 lines)
M			clang/lib/Frontend/CompilerInvocation.cpp (1 line)
M			clang/lib/Lex/Pragma.cpp (28 lines)
M			clang/test/Driver/crash-report.c (41 lines)
M			clang/test/Driver/output-file-cleanup.c (4 lines)