Make extend lifetimes an = option

Author: SLTozer

clang/include/clang/Basic/CodeGenOptions.def

@@ -393,11 +393,8 @@ CODEGENOPT(EnableTLSDESC, 1, 0)
 /// Bit size of immediate TLS offsets (0 == use the default).
 VALUE_CODEGENOPT(TLSSize, 8, 0)
 
-/// Whether to extend the live range of the `this` pointer.
-CODEGENOPT(ExtendThisPtr, 1, 0)
-
-/// Whether to extend the live ranges of all local variables.
-CODEGENOPT(ExtendLifetimes, 1, 0)
+/// The types of variables that we will extend the live ranges of.
+ENUM_CODEGENOPT(ExtendLifetimes, ExtendLifetimesKind, 2, ExtendLifetimesKind::None)
 
 /// The default stack protector guard offset to use.
 VALUE_CODEGENOPT(StackProtectorGuardOffset, 32, INT_MAX)

clang/include/clang/Basic/CodeGenOptions.h

@@ -95,6 +95,12 @@ class CodeGenOptions : public CodeGenOptionsBase {
     Embed_Marker    // Embed a marker as a placeholder for bitcode.
   };
 
+  enum class ExtendLifetimesKind {
+    None,
+    This,
+    All,
+  };
+
   enum InlineAsmDialectKind {
     IAD_ATT,
     IAD_Intel,

clang/include/clang/Driver/Options.td

@@ -4298,18 +4298,22 @@ def stack_usage_file : Separate<["-"], "stack-usage-file">,
   Visibility<[CC1Option]>,
   HelpText<"Filename (or -) to write stack usage output to">,
   MarshallingInfoString<CodeGenOpts<"StackUsageOutput">>;
-defm extend_this_ptr : BoolFOption<"extend-this-ptr",
-  CodeGenOpts<"ExtendThisPtr">, DefaultFalse,
-  PosFlag<SetTrue, [], [ClangOption, CC1Option],
-          "Extend the lifetime of the 'this' pointer to improve visibility "
-          "in optimized debugging">,
-  NegFlag<SetFalse>>;
-defm extend_lifetimes : BoolFOption<"extend-lifetimes",
-  CodeGenOpts<"ExtendLifetimes">, DefaultFalse,
-  PosFlag<SetTrue, [], [ClangOption, CC1Option],
-          "Extend the lifetimes of local variables and parameters to improve "
-          "visibility in optimized debugging">,
-  NegFlag<SetFalse>>;
+def fextend_lifetimes_EQ : Joined<["-"], "fextend-lifetimes=">, Group<f_Group>,
+  Visibility<[ClangOption, CC1Option]>,
+  HelpText<"Extend the lifetimes of variables to improve visibility in "
+           "optimized debugging">,
+  Values<"all,this,none">,
+  NormalizedValues<["All", "This", "None"]>,
+  NormalizedValuesScope<"CodeGenOptions::ExtendLifetimesKind">,
+  MarshallingInfoEnum<CodeGenOpts<"ExtendLifetimes">, "None">;
+def fextend_this_ptr : Flag<["-"], "fextend-this-ptr">,
+  Alias<fextend_lifetimes_EQ>, AliasArgs<["this"]>,
+  HelpText<"Extend the lifetime of the 'this' pointer to improve visibility "
+           "in optimized debugging">;
+def fextend_lifetimes : Flag<["-"], "fextend-lifetimes">,
+  Alias<fextend_lifetimes_EQ>, AliasArgs<["all"]>,
+  HelpText<"Extend the lifetimes of local variables and parameters to improve "
+           "visibility in optimized debugging">;
 
 defm unique_basic_block_section_names : BoolFOption<"unique-basic-block-section-names",
   CodeGenOpts<"UniqueBasicBlockSectionNames">, DefaultFalse,

clang/lib/Driver/ToolChains/Clang.cpp

@@ -7654,10 +7654,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   if (Args.hasArg(options::OPT_fretain_comments_from_system_headers))
     CmdArgs.push_back("-fretain-comments-from-system-headers");
 
-  Args.addOptInFlag(CmdArgs, options::OPT_fextend_this_ptr,
-                    options::OPT_fno_extend_this_ptr);
-  Args.addOptInFlag(CmdArgs, options::OPT_fextend_lifetimes,
-                    options::OPT_fno_extend_lifetimes);
+  Args.AddLastArg(CmdArgs, options::OPT_fextend_lifetimes_EQ);
 
   // Forward -fcomment-block-commands to -cc1.
   Args.AddAllArgs(CmdArgs, options::OPT_fcomment_block_commands);