From 7de82546dccd36c6e0f3b04fc055b870045d9b04 Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Tue, 22 Apr 2014 21:30:17 +0000 Subject: [PATCH] Driver: Skip the -fmodules-cache-path argument in driver crash diags The modules cache path shouldn't be included in crash reports, as it's a system (or run) specific directory. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@206922 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Job.cpp | 3 ++- test/Driver/crash-report.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Driver/Job.cpp b/lib/Driver/Job.cpp index 2775d892f7..e5292719df 100644 --- a/lib/Driver/Job.cpp +++ b/lib/Driver/Job.cpp @@ -62,7 +62,8 @@ static int skipArgs(const char *Flag) { // These flags are treated as a single argument (e.g., -F). StringRef FlagRef(Flag); - if (FlagRef.startswith("-F") || FlagRef.startswith("-I")) + if (FlagRef.startswith("-F") || FlagRef.startswith("-I") || + FlagRef.startswith("-fmodules-cache-path=")) return 1; return 0; diff --git a/test/Driver/crash-report.c b/test/Driver/crash-report.c index 95c57f238e..acc1abdc4e 100644 --- a/test/Driver/crash-report.c +++ b/test/Driver/crash-report.c @@ -3,6 +3,7 @@ // RUN: not env TMPDIR=%t TEMP=%t TMP=%t RC_DEBUG_OPTIONS=1 %clang -fsyntax-only %s \ // RUN: -F/tmp/ -I /tmp/ -idirafter /tmp/ -iquote /tmp/ -isystem /tmp/ \ // RUN: -iprefix /the/prefix -iwithprefix /tmp -iwithprefixbefore /tmp/ \ +// RUN: -fmodules -fcxx-modules -fmodules-cache-path=/tmp/ \ // RUN: -Xclang -internal-isystem -Xclang /tmp/ \ // RUN: -Xclang -internal-externc-isystem -Xclang /tmp/ \ // RUN: -DFOO=BAR 2>&1 | FileCheck %s @@ -33,6 +34,7 @@ FOO // CHECKSH-NOT: -iprefix /the/prefix // CHECKSH-NOT: -iwithprefix /tmp/ // CHECKSH-NOT: -iwithprefixbefore /tmp/ +// CHECKSH-NOT: -fmodules-cache-path=/tmp/ // CHECKSH-NOT: -internal-isystem /tmp/ // CHECKSH-NOT: -internal-externc-isystem /tmp/ // CHECKSH-NOT: -dwarf-debug-flags -- 2.40.0