Address final comments on patch.

Author: stefanp-synopsys

clang/include/clang/Basic/CodeGenOptions.def

@@ -197,7 +197,7 @@ CODEGENOPT(HIPCorrectlyRoundedDivSqrt, 1, 1) ///< -fno-hip-fp32-correctly-rounde
 CODEGENOPT(HIPSaveKernelArgName, 1, 0) ///< Set when -fhip-kernel-arg-name is enabled.
 CODEGENOPT(UniqueInternalLinkageNames, 1, 0) ///< Internal Linkage symbols get unique names.
 CODEGENOPT(SplitMachineFunctions, 1, 0) ///< Split machine functions using profile information.
-CODEGENOPT(PPCUseFullRegisterNames, 1, 0) ///< Print full register names in assembly -mregnames
+CODEGENOPT(PPCUseFullRegisterNames, 1, 0) ///< Print full register names in assembly
 
 /// When false, this attempts to generate code as if the result of an
 /// overflowing conversion matches the overflowing behavior of a target's native

clang/lib/Driver/ToolChains/Clang.cpp

@@ -5015,10 +5015,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   }
 
   if (Triple.isPPC())
-    if (const Arg *A =
-            Args.getLastArg(options::OPT_mregnames, options::OPT_mno_regnames))
-      if (A->getOption().matches(options::OPT_mregnames))
-        Args.AddLastArg(CmdArgs, options::OPT_mregnames);
+    Args.addOptInFlag(CmdArgs, options::OPT_mregnames,
+                      options::OPT_mno_regnames);
 
   if (Args.getLastArg(options::OPT_fthin_link_bitcode_EQ))
     Args.AddLastArg(CmdArgs, options::OPT_fthin_link_bitcode_EQ);

clang/lib/Frontend/CompilerInvocation.cpp

@@ -1780,9 +1780,6 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
       Opts.setDebugInfo(llvm::codegenoptions::LimitedDebugInfo);
   }
 
-  if (const Arg *A = Args.getLastArg(OPT_mregnames))
-    Opts.PPCUseFullRegisterNames = true;
-
   for (const auto &Arg : Args.getAllArgValues(OPT_fdebug_prefix_map_EQ)) {
     auto Split = StringRef(Arg).split('=');
     Opts.DebugPrefixMap.emplace_back(Split.first, Split.second);

clang/test/CodeGen/PowerPC/ppc-full-reg-names.c

@@ -1,18 +1,8 @@
 // REQUIRES: powerpc-registered-target
-// RUN: %clang -### -target powerpc-ibm-aix-xcoff -mcpu=pwr8 -O3 -mregnames \
+// RUN: %clang -### -target powerpc64le-unknown-linux-gnu -mcpu=pwr8 -mregnames \
 // RUN:   %s 2>&1 >/dev/null | FileCheck %s --check-prefix=FULLNAMES
-// RUN: %clang -### -target powerpc64-ibm-aix-xcoff -mcpu=pwr8 -O3 -mregnames \
-// RUN:   %s 2>&1 >/dev/null | FileCheck %s --check-prefix=FULLNAMES
-// RUN: %clang -### -target powerpc64le-unknown-linux-gnu -mcpu=pwr8 -O3 -mregnames \
-// RUN:   %s 2>&1 >/dev/null | FileCheck %s --check-prefix=FULLNAMES
-// RUN: %clang -### -target powerpc-ibm-aix-xcoff -mcpu=pwr8 -O3 -mno-regnames \
-// RUN:   %s 2>&1 >/dev/null | FileCheck %s --check-prefix=NOFULLNAMES
-// RUN: %clang -### -target powerpc64-ibm-aix-xcoff -mcpu=pwr8 -O3 -mno-regnames \
-// RUN:   %s 2>&1 >/dev/null | FileCheck %s --check-prefix=NOFULLNAMES
-// RUN: %clang -### -target powerpc64le-unknown-linux-gnu -mcpu=pwr8 -O3 -mno-regnames \
+// RUN: %clang -### -target powerpc64le-unknown-linux-gnu -mcpu=pwr8 -mno-regnames \
 // RUN:   %s 2>&1 >/dev/null | FileCheck %s --check-prefix=NOFULLNAMES
 
 // FULLNAMES: -mregnames
 // NOFULLNAMES-NOT: -mregnames
-
-