[PATCH] D39342: [Bash-autocompletion] Pass all flags in shell command-line to Clang
This revision was automatically updated to reflect the committed changes. Closed by commit rL326684: [Bash-autocompletion] Pass all flags in shell command-line to Clang (authored by yamaguchi, committed by ). Herald added a subscriber: llvm-commits. Changed prior to commit: https://reviews.llvm.org/D39342?vs=121449=136955#toc Repository: rL LLVM https://reviews.llvm.org/D39342 Files: cfe/trunk/include/clang/Driver/Driver.h cfe/trunk/lib/Driver/Driver.cpp cfe/trunk/test/Driver/autocomplete.c cfe/trunk/utils/bash-autocomplete.sh llvm/trunk/lib/Option/OptTable.cpp Index: llvm/trunk/lib/Option/OptTable.cpp === --- llvm/trunk/lib/Option/OptTable.cpp +++ llvm/trunk/lib/Option/OptTable.cpp @@ -219,7 +219,7 @@ std::vector Result; for (StringRef Val : Candidates) - if (Val.startswith(Arg)) + if (Val.startswith(Arg) && Arg.compare(Val)) Result.push_back(Val); return Result; } @@ -240,7 +240,7 @@ std::string S = std::string(In.Prefixes[I]) + std::string(In.Name) + "\t"; if (In.HelpText) S += In.HelpText; - if (StringRef(S).startswith(Cur)) + if (StringRef(S).startswith(Cur) && S.compare(std::string(Cur) + "\t")) Ret.push_back(S); } } Index: cfe/trunk/include/clang/Driver/Driver.h === --- cfe/trunk/include/clang/Driver/Driver.h +++ cfe/trunk/include/clang/Driver/Driver.h @@ -442,9 +442,9 @@ // FIXME: This should be in CompilationInfo. std::string GetProgramPath(StringRef Name, const ToolChain ) const; - /// handleAutocompletions - Handle --autocomplete by searching and printing + /// HandleAutocompletions - Handle --autocomplete by searching and printing /// possible flags, descriptions, and its arguments. - void handleAutocompletions(StringRef PassedFlags) const; + void HandleAutocompletions(StringRef PassedFlags) const; /// HandleImmediateArgs - Handle any arguments which should be /// treated before building actions or binding tools. Index: cfe/trunk/test/Driver/autocomplete.c === --- cfe/trunk/test/Driver/autocomplete.c +++ cfe/trunk/test/Driver/autocomplete.c @@ -3,41 +3,36 @@ // add/modify flags, change HelpTexts or the values of some flags. // Some corner cases. -// RUN: %clang --autocomplete= | FileCheck %s -check-prefix=ALL_FLAGS -// RUN: %clang --autocomplete=# | FileCheck %s -check-prefix=ALL_FLAGS -// Let's pick some example flags that are hopefully unlikely to change. -// ALL_FLAGS: -fast -// ALL_FLAGS: -fastcp -// ALL_FLAGS: -fastf // Just test that this doesn't crash: +// RUN: %clang --autocomplete= // RUN: %clang --autocomplete=, // RUN: %clang --autocomplete== // RUN: %clang --autocomplete=,, // RUN: %clang --autocomplete=- // RUN: %clang --autocomplete=-fsyn | FileCheck %s -check-prefix=FSYN // FSYN: -fsyntax-only -// RUN: %clang --autocomplete=-std= | FileCheck %s -check-prefix=STD +// RUN: %clang --autocomplete=-std | FileCheck %s -check-prefix=STD // STD: -std= Language standard to compile for // RUN: %clang --autocomplete=foo | FileCheck %s -check-prefix=FOO // FOO-NOT: foo // RUN: %clang --autocomplete=-stdlib=,l | FileCheck %s -check-prefix=STDLIB // STDLIB: libc++ // STDLIB-NEXT: libstdc++ -// RUN: %clang --autocomplete=-stdlib=, | FileCheck %s -check-prefix=STDLIBALL +// RUN: %clang --autocomplete=-stdlib= | FileCheck %s -check-prefix=STDLIBALL // STDLIBALL: libc++ // STDLIBALL-NEXT: libstdc++ // STDLIBALL-NEXT: platform // RUN: %clang --autocomplete=-meabi,d | FileCheck %s -check-prefix=MEABI // MEABI: default -// RUN: %clang --autocomplete=-meabi, | FileCheck %s -check-prefix=MEABIALL +// RUN: %clang --autocomplete=-meabi | FileCheck %s -check-prefix=MEABIALL // MEABIALL: 4 // MEABIALL-NEXT: 5 // MEABIALL-NEXT: default // MEABIALL-NEXT: gnu // RUN: %clang --autocomplete=-cl-std=,CL2 | FileCheck %s -check-prefix=CLSTD // CLSTD: CL2.0 -// RUN: %clang --autocomplete=-cl-std=, | FileCheck %s -check-prefix=CLSTDALL +// RUN: %clang --autocomplete=-cl-std= | FileCheck %s -check-prefix=CLSTDALL // CLSTDALL: cl // CLSTDALL-NEXT: CL // CLSTDALL-NEXT: cl1.1 @@ -48,7 +43,7 @@ // CLSTDALL-NEXT: CL2.0 // RUN: %clang --autocomplete=-fno-sanitize-coverage=,f | FileCheck %s -check-prefix=FNOSANICOVER // FNOSANICOVER: func -// RUN: %clang --autocomplete=-fno-sanitize-coverage=, | FileCheck %s -check-prefix=FNOSANICOVERALL +// RUN: %clang --autocomplete=-fno-sanitize-coverage= | FileCheck %s -check-prefix=FNOSANICOVERALL // FNOSANICOVERALL: 8bit-counters // FNOSANICOVERALL-NEXT: bb // FNOSANICOVERALL-NEXT: edge @@ -62,41 +57,37 @@ // FNOSANICOVERALL-NEXT: trace-gep // FNOSANICOVERALL-NEXT: trace-pc // FNOSANICOVERALL-NEXT: trace-pc-guard -// RUN: %clang --autocomplete=-ffp-contract=, | FileCheck %s -check-prefix=FFPALL +// RUN: %clang
[PATCH] D39342: [Bash-autocompletion] Pass all flags in shell command-line to Clang
teemperor accepted this revision. teemperor added a comment. This revision is now accepted and ready to land. As this will land in clang 7, can you add a note to the release notes that this breaks backwards compatibility for this interface (can be another commit)? Also, we should point out that this is the only API change this interface will have in the foreseeable future. https://reviews.llvm.org/D39342 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D39342: [Bash-autocompletion] Pass all flags in shell command-line to Clang
yamaguchi updated this revision to Diff 121449.
yamaguchi added a comment.
Made a trivial fix in the testcase
https://reviews.llvm.org/D39342
Files:
clang/include/clang/Driver/Driver.h
clang/lib/Driver/Driver.cpp
clang/test/Driver/autocomplete.c
clang/utils/bash-autocomplete.sh
llvm/lib/Option/OptTable.cpp
Index: llvm/lib/Option/OptTable.cpp
===
--- llvm/lib/Option/OptTable.cpp
+++ llvm/lib/Option/OptTable.cpp
@@ -219,7 +219,7 @@
std::vector Result;
for (StringRef Val : Candidates)
- if (Val.startswith(Arg))
+ if (Val.startswith(Arg) && Arg.compare(Val))
Result.push_back(Val);
return Result;
}
@@ -240,7 +240,7 @@
std::string S = std::string(In.Prefixes[I]) + std::string(In.Name) + "\t";
if (In.HelpText)
S += In.HelpText;
- if (StringRef(S).startswith(Cur))
+ if (StringRef(S).startswith(Cur) && S.compare(std::string(Cur) + "\t"))
Ret.push_back(S);
}
}
Index: clang/utils/bash-autocomplete.sh
===
--- clang/utils/bash-autocomplete.sh
+++ clang/utils/bash-autocomplete.sh
@@ -25,35 +25,16 @@
w2="${COMP_WORDS[$cword - 2]}"
fi
- # Clang want to know if -cc1 or -Xclang option is specified or not, because we don't want to show
- # cc1 options otherwise.
- if [[ "${COMP_WORDS[1]}" == "-cc1" || "$w1" == "-Xclang" ]]; then
-arg="#"
- fi
-
- # bash always separates '=' as a token even if there's no space before/after '='.
- # On the other hand, '=' is just a regular character for clang options that
- # contain '='. For example, "-stdlib=" is defined as is, instead of "-stdlib" and "=".
- # So, we need to partially undo bash tokenization here for integrity.
- if [[ "$cur" == -* ]]; then
-# -foo
-arg="$arg$cur"
- elif [[ "$w1" == -* && "$cur" == '=' ]]; then
-# -foo=
-arg="$arg$w1=,"
- elif [[ "$cur" == -*= ]]; then
-# -foo=
-arg="$arg$cur,"
- elif [[ "$w1" == -* ]]; then
-# -foo or -foo bar
-arg="$arg$w1,$cur"
- elif [[ "$w2" == -* && "$w1" == '=' ]]; then
-# -foo=bar
-arg="$arg$w2=,$cur"
- elif [[ ${cur: -1} != '=' && ${cur/=} != $cur ]]; then
-# -foo=bar
-arg="$arg${cur%=*}=,${cur#*=}"
- fi
+ # Pass all the current command-line flags to clang, so that clang can handle
+ # these internally.
+ # '=' is separated differently by bash, so we have to concat them without ','
+ for i in `seq 1 $cword`; do
+if [[ $i == $cword || "${COMP_WORDS[$(($i+1))]}" == '=' ]]; then
+ arg="$arg${COMP_WORDS[$i]}"
+else
+ arg="$arg${COMP_WORDS[$i]},"
+fi
+ done
# expand ~ to $HOME
eval local path=${COMP_WORDS[0]}
@@ -67,7 +48,7 @@
# When clang does not emit any possible autocompletion, or user pushed tab after " ",
# just autocomplete files.
- if [[ "$flags" == "$(echo -e '\n')" || "$arg" == "" ]]; then
+ if [[ "$flags" == "$(echo -e '\n')" ]]; then
# If -foo= and there was no possible values, autocomplete files.
[[ "$cur" == '=' || "$cur" == -*= ]] && cur=""
_clang_filedir
Index: clang/test/Driver/autocomplete.c
===
--- clang/test/Driver/autocomplete.c
+++ clang/test/Driver/autocomplete.c
@@ -3,41 +3,36 @@
// add/modify flags, change HelpTexts or the values of some flags.
// Some corner cases.
-// RUN: %clang --autocomplete= | FileCheck %s -check-prefix=ALL_FLAGS
-// RUN: %clang --autocomplete=# | FileCheck %s -check-prefix=ALL_FLAGS
-// Let's pick some example flags that are hopefully unlikely to change.
-// ALL_FLAGS: -fast
-// ALL_FLAGS: -fastcp
-// ALL_FLAGS: -fastf
// Just test that this doesn't crash:
+// RUN: %clang --autocomplete=
// RUN: %clang --autocomplete=,
// RUN: %clang --autocomplete==
// RUN: %clang --autocomplete=,,
// RUN: %clang --autocomplete=-
// RUN: %clang --autocomplete=-fsyn | FileCheck %s -check-prefix=FSYN
// FSYN: -fsyntax-only
-// RUN: %clang --autocomplete=-std= | FileCheck %s -check-prefix=STD
+// RUN: %clang --autocomplete=-std | FileCheck %s -check-prefix=STD
// STD: -std= Language standard to compile for
// RUN: %clang --autocomplete=foo | FileCheck %s -check-prefix=FOO
// FOO-NOT: foo
// RUN: %clang --autocomplete=-stdlib=,l | FileCheck %s -check-prefix=STDLIB
// STDLIB: libc++
// STDLIB-NEXT: libstdc++
-// RUN: %clang --autocomplete=-stdlib=, | FileCheck %s -check-prefix=STDLIBALL
+// RUN: %clang --autocomplete=-stdlib= | FileCheck %s -check-prefix=STDLIBALL
// STDLIBALL: libc++
// STDLIBALL-NEXT: libstdc++
// STDLIBALL-NEXT: platform
// RUN: %clang --autocomplete=-meabi,d | FileCheck %s -check-prefix=MEABI
// MEABI: default
-// RUN: %clang --autocomplete=-meabi, | FileCheck %s -check-prefix=MEABIALL
+// RUN: %clang --autocomplete=-meabi | FileCheck %s -check-prefix=MEABIALL
// MEABIALL: 4
// MEABIALL-NEXT: 5
// MEABIALL-NEXT: default
//
[PATCH] D39342: [Bash-autocompletion] Pass all flags in shell command-line to Clang
yamaguchi updated this revision to Diff 121444.
yamaguchi added a comment.
Herald added a subscriber: hiraditya.
Update diff. Pass all flags just with "," including values.
https://reviews.llvm.org/D39342
Files:
clang/include/clang/Driver/Driver.h
clang/lib/Driver/Driver.cpp
clang/test/Driver/autocomplete.c
clang/utils/bash-autocomplete.sh
llvm/lib/Option/OptTable.cpp
Index: llvm/lib/Option/OptTable.cpp
===
--- llvm/lib/Option/OptTable.cpp
+++ llvm/lib/Option/OptTable.cpp
@@ -219,7 +219,7 @@
std::vector Result;
for (StringRef Val : Candidates)
- if (Val.startswith(Arg))
+ if (Val.startswith(Arg) && Arg.compare(Val))
Result.push_back(Val);
return Result;
}
@@ -240,7 +240,7 @@
std::string S = std::string(In.Prefixes[I]) + std::string(In.Name) + "\t";
if (In.HelpText)
S += In.HelpText;
- if (StringRef(S).startswith(Cur))
+ if (StringRef(S).startswith(Cur) && S.compare(std::string(Cur) + "\t"))
Ret.push_back(S);
}
}
Index: clang/utils/bash-autocomplete.sh
===
--- clang/utils/bash-autocomplete.sh
+++ clang/utils/bash-autocomplete.sh
@@ -25,35 +25,16 @@
w2="${COMP_WORDS[$cword - 2]}"
fi
- # Clang want to know if -cc1 or -Xclang option is specified or not, because we don't want to show
- # cc1 options otherwise.
- if [[ "${COMP_WORDS[1]}" == "-cc1" || "$w1" == "-Xclang" ]]; then
-arg="#"
- fi
-
- # bash always separates '=' as a token even if there's no space before/after '='.
- # On the other hand, '=' is just a regular character for clang options that
- # contain '='. For example, "-stdlib=" is defined as is, instead of "-stdlib" and "=".
- # So, we need to partially undo bash tokenization here for integrity.
- if [[ "$cur" == -* ]]; then
-# -foo
-arg="$arg$cur"
- elif [[ "$w1" == -* && "$cur" == '=' ]]; then
-# -foo=
-arg="$arg$w1=,"
- elif [[ "$cur" == -*= ]]; then
-# -foo=
-arg="$arg$cur,"
- elif [[ "$w1" == -* ]]; then
-# -foo or -foo bar
-arg="$arg$w1,$cur"
- elif [[ "$w2" == -* && "$w1" == '=' ]]; then
-# -foo=bar
-arg="$arg$w2=,$cur"
- elif [[ ${cur: -1} != '=' && ${cur/=} != $cur ]]; then
-# -foo=bar
-arg="$arg${cur%=*}=,${cur#*=}"
- fi
+ # Pass all the current command-line flags to clang, so that clang can handle
+ # these internally.
+ # '=' is separated differently by bash, so we have to concat them without ','
+ for i in `seq 1 $cword`; do
+if [[ $i == $cword || "${COMP_WORDS[$(($i+1))]}" == '=' ]]; then
+ arg="$arg${COMP_WORDS[$i]}"
+else
+ arg="$arg${COMP_WORDS[$i]},"
+fi
+ done
# expand ~ to $HOME
eval local path=${COMP_WORDS[0]}
@@ -67,7 +48,7 @@
# When clang does not emit any possible autocompletion, or user pushed tab after " ",
# just autocomplete files.
- if [[ "$flags" == "$(echo -e '\n')" || "$arg" == "" ]]; then
+ if [[ "$flags" == "$(echo -e '\n')" ]]; then
# If -foo= and there was no possible values, autocomplete files.
[[ "$cur" == '=' || "$cur" == -*= ]] && cur=""
_clang_filedir
Index: clang/test/Driver/autocomplete.c
===
--- clang/test/Driver/autocomplete.c
+++ clang/test/Driver/autocomplete.c
@@ -3,21 +3,16 @@
// add/modify flags, change HelpTexts or the values of some flags.
// Some corner cases.
-// RUN: %clang --autocomplete= | FileCheck %s -check-prefix=ALL_FLAGS
-// RUN: %clang --autocomplete=# | FileCheck %s -check-prefix=ALL_FLAGS
-// Let's pick some example flags that are hopefully unlikely to change.
-// ALL_FLAGS: -fast
-// ALL_FLAGS: -fastcp
-// ALL_FLAGS: -fastf
// Just test that this doesn't crash:
+// RUN: %clang --autocomplete=
// RUN: %clang --autocomplete=,
// RUN: %clang --autocomplete==
// RUN: %clang --autocomplete=,,
// RUN: %clang --autocomplete=-
// RUN: %clang --autocomplete=-fsyn | FileCheck %s -check-prefix=FSYN
// FSYN: -fsyntax-only
-// RUN: %clang --autocomplete=-std= | FileCheck %s -check-prefix=STD
+// RUN: %clang --autocomplete=-std | FileCheck %s -check-prefix=STD
// STD: -std= Language standard to compile for
// RUN: %clang --autocomplete=foo | FileCheck %s -check-prefix=FOO
// FOO-NOT: foo
@@ -30,14 +25,14 @@
// STDLIBALL-NEXT: platform
// RUN: %clang --autocomplete=-meabi,d | FileCheck %s -check-prefix=MEABI
// MEABI: default
-// RUN: %clang --autocomplete=-meabi, | FileCheck %s -check-prefix=MEABIALL
+// RUN: %clang --autocomplete=-meabi | FileCheck %s -check-prefix=MEABIALL
// MEABIALL: 4
// MEABIALL-NEXT: 5
// MEABIALL-NEXT: default
// MEABIALL-NEXT: gnu
// RUN: %clang --autocomplete=-cl-std=,CL2 | FileCheck %s -check-prefix=CLSTD
// CLSTD: CL2.0
-// RUN: %clang --autocomplete=-cl-std=, | FileCheck %s -check-prefix=CLSTDALL
+// RUN: %clang --autocomplete=-cl-std= | FileCheck %s
[PATCH] D39342: [Bash-autocompletion] Pass all flags in shell command-line to Clang
yamaguchi added inline comments.
Comment at: clang/lib/Driver/Driver.cpp:1171
+ StringRef TargetFlag = PassedFlags;
+ for (; TargetFlag.find(':') != StringRef::npos;) {
+StringRef CurFlag;
v.g.vassilev wrote:
> Why not a `while` loop?
I didn't have special reason, I'll change it to while if it fits better.
https://reviews.llvm.org/D39342
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D39342: [Bash-autocompletion] Pass all flags in shell command-line to Clang
v.g.vassilev added inline comments.
Comment at: clang/lib/Driver/Driver.cpp:1171
+ StringRef TargetFlag = PassedFlags;
+ for (; TargetFlag.find(':') != StringRef::npos;) {
+StringRef CurFlag;
Why not a `while` loop?
https://reviews.llvm.org/D39342
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D39342: [Bash-autocompletion] Pass all flags in shell command-line to Clang
yamaguchi created this revision.
Previously, we passed "#" to --autocomplete to indicate to enable cc1
flags. For example, when -cc1 or -Xclang was passed to bash, bash
executed `clang --autocomplete=#-`.
However, this was not a good implementation because it depends -Xclang
and -cc1 parsing to shell. So I changed this to pass all flags shell
has, so that Clang can handle them internally.
I'll leave exsisting testcase as it is inorder to test backward
compatibility.
https://reviews.llvm.org/D39342
Files:
clang/lib/Driver/Driver.cpp
clang/test/Driver/autocomplete.c
clang/utils/bash-autocomplete.sh
Index: clang/utils/bash-autocomplete.sh
===
--- clang/utils/bash-autocomplete.sh
+++ clang/utils/bash-autocomplete.sh
@@ -25,11 +25,11 @@
w2="${COMP_WORDS[$cword - 2]}"
fi
- # Clang want to know if -cc1 or -Xclang option is specified or not, because we don't want to show
- # cc1 options otherwise.
- if [[ "${COMP_WORDS[1]}" == "-cc1" || "$w1" == "-Xclang" ]]; then
-arg="#"
- fi
+ # Pass all the current command-line flags to clang, so that clang can handle
+ # these internally.
+ for i in `seq 1 $(($cword-1))`; do
+arg="$arg${COMP_WORDS[$i]}:"
+ done
# bash always separates '=' as a token even if there's no space before/after '='.
# On the other hand, '=' is just a regular character for clang options that
Index: clang/test/Driver/autocomplete.c
===
--- clang/test/Driver/autocomplete.c
+++ clang/test/Driver/autocomplete.c
@@ -4,7 +4,6 @@
// Some corner cases.
// RUN: %clang --autocomplete= | FileCheck %s -check-prefix=ALL_FLAGS
-// RUN: %clang --autocomplete=# | FileCheck %s -check-prefix=ALL_FLAGS
// Let's pick some example flags that are hopefully unlikely to change.
// ALL_FLAGS: -fast
// ALL_FLAGS: -fastcp
@@ -93,10 +92,6 @@
// MRELOCMODELALL-NEXT: ropi-rwpi
// MRELOCMODELALL-NEXT: rwpi
// MRELOCMODELALL-NEXT: static
-// RUN: %clang --autocomplete=-mrelocation-mode | FileCheck %s -check-prefix=MRELOCMODEL_CLANG
-// MRELOCMODEL_CLANG-NOT: -mrelocation-model
-// RUN: %clang --autocomplete=#-mrelocation-mode | FileCheck %s -check-prefix=MRELOCMODEL_CC1
-// MRELOCMODEL_CC1: -mrelocation-model
// RUN: %clang --autocomplete=-Wma | FileCheck %s -check-prefix=WARNING
// WARNING: -Wmacro-redefined
// WARNING-NEXT: -Wmain
@@ -110,3 +105,16 @@
// ANALYZER: unix.Malloc
// RUN: %clang --autocomplete=-std=, | FileCheck %s -check-prefix=STDVAL
// STDVAL: c99
+//
+// Clang shouldn't autocomplete CC1 options unless -cc1 or -Xclang were provided
+// RUN: %clang --autocomplete=-mrelocation-mode | FileCheck %s -check-prefix=MRELOCMODEL_CLANG
+// MRELOCMODEL_CLANG-NOT: -mrelocation-model
+// RUN: %clang --autocomplete=-Xclang:-mrelocation-mode | FileCheck %s -check-prefix=MRELOCMODEL_CC1
+// RUN: %clang --autocomplete=-cc1:-mrelocation-mode | FileCheck %s -check-prefix=MRELOCMODEL_CC1
+// MRELOCMODEL_CC1: -mrelocation-model
+// Make sure it ignores passed flags unlesss they are -Xclang or -cc1
+// RUN: %clang --autocomplete=foo:bar::-fsyn | FileCheck %s -check-prefix=FSYN-CORON
+// FSYN-CORON: -fsyntax-only
+// Check if they can autocomplete values with coron
+// RUN: %clang --autocomplete=foo::bar-fno-sanitize-coverage=,f | FileCheck %s -check-prefix=FNOSANICOVER-CORON
+// FNOSANICOVER-CORON: func
Index: clang/lib/Driver/Driver.cpp
===
--- clang/lib/Driver/Driver.cpp
+++ clang/lib/Driver/Driver.cpp
@@ -1164,34 +1164,38 @@
unsigned short DisableFlags =
options::NoDriverOption | options::Unsupported | options::Ignored;
- // We want to show cc1-only options only when clang is invoked as "clang
- // -cc1". When clang is invoked as "clang -cc1", we add "#" to the beginning
- // of an --autocomplete option so that the clang driver can distinguish
- // whether it is requested to show cc1-only options or not.
- if (PassedFlags.size() > 0 && PassedFlags[0] == '#') {
-DisableFlags &= ~options::NoDriverOption;
-PassedFlags = PassedFlags.substr(1);
+
+ // Parse PassedFlags by ":" as all the command-line flags are passed to this
+ // function separated by ":"
+ StringRef TargetFlag = PassedFlags;
+ for (; TargetFlag.find(':') != StringRef::npos;) {
+StringRef CurFlag;
+std::tie(CurFlag, TargetFlag) = TargetFlag.split(":");
+// We want to show cc1-only options only when clang is invoked with -cc1 or
+// -Xclang.
+if (CurFlag == "-Xclang" || CurFlag == "-cc1")
+ DisableFlags &= ~options::NoDriverOption;
}
- if (PassedFlags.find(',') == StringRef::npos) {
+ if (TargetFlag.find(',') == StringRef::npos) {
// If the flag is in the form of "--autocomplete=-foo",
// we were requested to print out all option names that start with "-foo".
// For example, "--autocomplete=-fsyn" is expanded to "-fsyntax-only".
-
