r199451 - Split out -verify into two distinct option flags

[Alp Toker]

Hi Bob,

Eric asked me to give you a heads up after landing this change.

The driver flag that verifies binary output is now renamed from -verify 
to --verify-debug-info.

Feel free to tweak that if you prefer something more general like 
--verify-output. Main goal here is to avoid confusion with diagnostic 
-verify in the test suite so anything else goes.

Alp.


On 17/01/2014 02:06, Alp Toker wrote:
> Author: alp
> Date: Thu Jan 16 20:06:23 2014
> New Revision: 199451
>
> URL: http://llvm.org/viewvc/llvm-project?rev=199451&view=rev
> Log:
> Split out -verify into two distinct option flags
>
> Instead of dual-purposing a single flag, rename the driver option to
> --verify-debug-info.
>
> The frontend -verify option that enables diagnostic verification remains
> unchanged except that it's now a pure CC1Option.
>
> Both have been given proper help text.
>
> Modified:
>      cfe/trunk/include/clang/Driver/Options.td
>      cfe/trunk/lib/Driver/Driver.cpp
>      cfe/trunk/test/Driver/darwin-verify-debug.c
>
> Modified: cfe/trunk/include/clang/Driver/Options.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=199451&r1=199450&r2=199451&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Driver/Options.td (original)
> +++ cfe/trunk/include/clang/Driver/Options.td Thu Jan 16 20:06:23 2014
> @@ -1295,8 +1295,10 @@ def unexported__symbols__list : Separate
>   def u : JoinedOrSeparate<["-"], "u">, Group<u_Group>;
>   def v : Flag<["-"], "v">, Flags<[CC1Option]>,
>     HelpText<"Show commands to run and use verbose output">;
> -def verify : Flag<["-"], "verify">, Flags<[DriverOption,CC1Option]>,
> -  HelpText<"Verify output using a verifier">;
> +def verify : Flag<["-"], "verify">, Flags<[CC1Option]>,
> +  HelpText<"Verify diagnostic output using comment directives">;
> +def verify_debug_info : Flag<["--"], "verify-debug-info">, Flags<[DriverOption]>,
> +  HelpText<"Verify the binary representation of debug output">;
>   def weak_l : Joined<["-"], "weak-l">, Flags<[LinkerInput]>;
>   def weak__framework : Separate<["-"], "weak_framework">, Flags<[LinkerInput]>;
>   def weak__library : Separate<["-"], "weak_library">, Flags<[LinkerInput]>;
>
> Modified: cfe/trunk/lib/Driver/Driver.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=199451&r1=199450&r2=199451&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Driver/Driver.cpp (original)
> +++ cfe/trunk/lib/Driver/Driver.cpp Thu Jan 16 20:06:23 2014
> @@ -935,8 +935,8 @@ void Driver::BuildUniversalActions(const
>           Actions.push_back(new DsymutilJobAction(Inputs, types::TY_dSYM));
>         }
>   
> -      // Verify the output (debug information only) if we passed '-verify'.
> -      if (Args.hasArg(options::OPT_verify)) {
> +      // Verify the output (debug information only for now).
> +      if (Args.hasArg(options::OPT_verify_debug_info)) {
>           ActionList VerifyInputs;
>           VerifyInputs.push_back(Actions.back());
>           Actions.pop_back();
>
> Modified: cfe/trunk/test/Driver/darwin-verify-debug.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-verify-debug.c?rev=199451&r1=199450&r2=199451&view=diff
> ==============================================================================
> --- cfe/trunk/test/Driver/darwin-verify-debug.c (original)
> +++ cfe/trunk/test/Driver/darwin-verify-debug.c Thu Jan 16 20:06:23 2014
> @@ -2,7 +2,7 @@
>   //
>   // REQUIRES: asserts
>   // RUN: %clang -target x86_64-apple-darwin10 -ccc-print-phases \
> -// RUN:   -verify -arch i386 -arch x86_64 %s -g 2> %t
> +// RUN:   --verify-debug-info -arch i386 -arch x86_64 %s -g 2> %t
>   // RUN: FileCheck -check-prefix=CHECK-MULTIARCH-ACTIONS < %t %s
>   //
>   // CHECK-MULTIARCH-ACTIONS: 0: input, "{{.*}}darwin-verify-debug.c", c
> @@ -10,7 +10,7 @@
>   // CHECK-MULTIARCH-ACTIONS: 9: verify, {8}, none
>   //
>   // RUN: %clang -target x86_64-apple-darwin10 -ccc-print-bindings \
> -// RUN:   -verify -arch i386 -arch x86_64 %s -g 2> %t
> +// RUN:   --verify-debug-info -arch i386 -arch x86_64 %s -g 2> %t
>   // RUN: FileCheck -check-prefix=CHECK-MULTIARCH-BINDINGS < %t %s
>   //
>   // CHECK-MULTIARCH-BINDINGS: # "x86_64-apple-darwin10" - "darwin::Dsymutil", inputs: ["a.out"], output: "a.out.dSYM"
> @@ -19,7 +19,7 @@
>   // Check output name derivation.
>   //
>   // RUN: %clang -target x86_64-apple-darwin10 -ccc-print-bindings \
> -// RUN:   -verify -o foo %s -g 2> %t
> +// RUN:   --verify-debug-info -o foo %s -g 2> %t
>   // RUN: FileCheck -check-prefix=CHECK-OUTPUT-NAME < %t %s
>   //
>   // CHECK-OUTPUT-NAME: "x86_64-apple-darwin10" - "darwin::Link", inputs: [{{.*}}], output: "foo"
> @@ -30,5 +30,5 @@
>   //
>   // RUN: touch %t.o
>   // RUN: %clang -target x86_64-apple-darwin10 -ccc-print-bindings \
> -// RUN:   -verify -o foo %t.o -g 2> %t
> +// RUN:   --verify-debug-info -o foo %t.o -g 2> %t
>   // RUN: not grep "Verify" %t
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

-- 
http://www.nuanti.com
the browser experts