[PATCH] D140224: [Driver] Revert D139717 and add -Xparser instead

[Fangrui Song via Phabricator via cfe-commits]

MaskRay updated this revision to Diff 483565.
MaskRay added a comment.

.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D140224/new/

https://reviews.llvm.org/D140224

Files:
  clang/include/clang/Driver/Options.td
  clang/test/Driver/warn-Xparser.c
  clang/test/Misc/warn-not-error-Xfoo.c


Index: clang/test/Misc/warn-not-error-Xfoo.c
===================================================================
--- clang/test/Misc/warn-not-error-Xfoo.c
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %clang -c -Xfoo %s 2>&1 | FileCheck 
--check-prefix=CHECK_STANDALONE_FOO %s
-// RUN: %clang -c -Xfoo=bar %s 2>&1 | FileCheck 
--check-prefix=CHECK_JOINED_FOO %s
-
-// This test ensures that we only warn on -X<unknown> and -X<unknown=value>
-// in case it is used downstream. If we error, we can't ignore it and some
-// use of these (ignored) flags are in legacy use.
-// TODO: Deprecate with timebox warning so consumers can respond.
-
-// CHECK_STANDALONE_FOO: warning: argument unused during compilation: '-Xfoo' 
[-Wunused-command-line-argument]
-// CHECK_JOINED_FOO: warning: argument unused during compilation: '-Xfoo=bar' 
[-Wunused-command-line-argument]
-
-// CHECK-NOT: clang{.*}: error: unknown argument:
-
-void f(void) {}
Index: clang/test/Driver/warn-Xparser.c
===================================================================
--- /dev/null
+++ clang/test/Driver/warn-Xparser.c
@@ -0,0 +1,6 @@
+/// Some macOS projects use -Xparser
+// RUN: %clang -c -Xparser %s 2>&1 | FileCheck %s
+
+// CHECK: warning: argument unused during compilation: '-Xparser' 
[-Wunused-command-line-argument]
+
+void f(void) {}
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -846,7 +846,8 @@
 def Xpreprocessor : Separate<["-"], "Xpreprocessor">, 
Group<Preprocessor_Group>,
   HelpText<"Pass <arg> to the preprocessor">, MetaVarName<"<arg>">;
 def X_Flag : Flag<["-"], "X">, Group<Link_Group>;
-def X_Joined : Joined<["-"], "X">, IgnoredGCCCompat;
+// Used by some macOS projects
+def : Flag<["-"], "Xparser">, IgnoredGCCCompat;
 def Z_Flag : Flag<["-"], "Z">, Group<Link_Group>;
 def all__load : Flag<["-"], "all_load">;
 def allowable__client : Separate<["-"], "allowable_client">;



Index: clang/test/Misc/warn-not-error-Xfoo.c
===================================================================
--- clang/test/Misc/warn-not-error-Xfoo.c
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %clang -c -Xfoo %s 2>&1 | FileCheck --check-prefix=CHECK_STANDALONE_FOO %s
-// RUN: %clang -c -Xfoo=bar %s 2>&1 | FileCheck --check-prefix=CHECK_JOINED_FOO %s
-
-// This test ensures that we only warn on -X<unknown> and -X<unknown=value>
-// in case it is used downstream. If we error, we can't ignore it and some
-// use of these (ignored) flags are in legacy use.
-// TODO: Deprecate with timebox warning so consumers can respond.
-
-// CHECK_STANDALONE_FOO: warning: argument unused during compilation: '-Xfoo' [-Wunused-command-line-argument]
-// CHECK_JOINED_FOO: warning: argument unused during compilation: '-Xfoo=bar' [-Wunused-command-line-argument]
-
-// CHECK-NOT: clang{.*}: error: unknown argument:
-
-void f(void) {}
Index: clang/test/Driver/warn-Xparser.c
===================================================================
--- /dev/null
+++ clang/test/Driver/warn-Xparser.c
@@ -0,0 +1,6 @@
+/// Some macOS projects use -Xparser
+// RUN: %clang -c -Xparser %s 2>&1 | FileCheck %s
+
+// CHECK: warning: argument unused during compilation: '-Xparser' [-Wunused-command-line-argument]
+
+void f(void) {}
Index: clang/include/clang/Driver/Options.td
===================================================================
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -846,7 +846,8 @@
 def Xpreprocessor : Separate<["-"], "Xpreprocessor">, Group<Preprocessor_Group>,
   HelpText<"Pass <arg> to the preprocessor">, MetaVarName<"<arg>">;
 def X_Flag : Flag<["-"], "X">, Group<Link_Group>;
-def X_Joined : Joined<["-"], "X">, IgnoredGCCCompat;
+// Used by some macOS projects
+def : Flag<["-"], "Xparser">, IgnoredGCCCompat;
 def Z_Flag : Flag<["-"], "Z">, Group<Link_Group>;
 def all__load : Flag<["-"], "all_load">;
 def allowable__client : Separate<["-"], "allowable_client">;

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits