Revert "Revert "[Clang][AIX][p] Manually Claim -p in front end""

[francii]

Summary

This reverts commit 7488dd25e1613894d79d69f153469545b9bf660a. The
original revert was due to the original commit causing segfaults.

The fix is to introduce -p as a CC1Option

[francii]

Update message

clang/include/clang/Driver/Options.td

 def object_file_name : Separate<["-"], "object-file-name">, Flags<[CC1Option, CC1AsOption, CoreOption]>,
     Alias<object_file_name_EQ>;
 def pagezero__size : JoinedOrSeparate<["-"], "pagezero_size">;
 def pass_exit_codes : Flag<["-", "--"], "pass-exit-codes">, Flags<[Unsupported]>;
 def pedantic_errors : Flag<["-", "--"], "pedantic-errors">, Group<pedantic_Group>, Flags<[CC1Option]>,
   MarshallingInfoFlag<DiagnosticOpts<"PedanticErrors">>;
 def pedantic : Flag<["-", "--"], "pedantic">, Group<pedantic_Group>, Flags<[CC1Option,FlangOption,FC1Option]>,
   HelpText<"Warn on language extensions">, MarshallingInfoFlag<DiagnosticOpts<"Pedantic">>;
-def p : Flag<["-"], "p">, HelpText<"Enable mcount instrumentation with prof">;
+def p : Flag<["-"], "p">, HelpText<"Enable mcount instrumentation with prof">, Flags<[CC1Option]>;
 def pg : Flag<["-"], "pg">, HelpText<"Enable mcount instrumentation">, Flags<[CC1Option]>,
   MarshallingInfoFlag<CodeGenOpts<"InstrumentForProfiling">>;
 def pipe : Flag<["-", "--"], "pipe">,
   HelpText<"Use pipes between commands, when possible">;
 def prebind__all__twolevel__modules : Flag<["-"], "prebind_all_twolevel_modules">;
 def prebind : Flag<["-"], "prebind">;
 def preload : Flag<["-"], "preload">;
 def print_file_name_EQ : Joined<["-", "--"], "print-file-name=">,

clang/lib/Driver/ToolChains/AIX.cpp

void aix::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   } else {
     // Must be 64-bit, otherwise asserted already.
     CmdArgs.push_back("-b64");
     CmdArgs.push_back("-bpT:0x100000000");
     CmdArgs.push_back("-bpD:0x110000000");
   }
 
   auto getCrt0Basename = [&Args, IsArch32Bit] {
+    Arg *A = Args.getLastArgNoClaim(options::OPT_p, options::OPT_pg);
     // Enable gprofiling when "-pg" is specified.
-    if (Args.hasArg(options::OPT_pg))
+    if (A->getOption().matches(options::OPT_pg))
       return IsArch32Bit ? "gcrt0.o" : "gcrt0_64.o";
     // Enable profiling when "-p" is specified.
-    else if (Args.hasArg(options::OPT_p))
+    else if (A->getOption().matches(options::OPT_p))
       return IsArch32Bit ? "mcrt0.o" : "mcrt0_64.o";
     else
       return IsArch32Bit ? "crt0.o" : "crt0_64.o";
   };
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
                    options::OPT_shared)) {
     CmdArgs.push_back(
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
     if (Args.hasArg(options::OPT_pthreads, options::OPT_pthread))
       CmdArgs.push_back("-lpthreads");
 
     if (D.CCCIsCXX())
       CmdArgs.push_back("-lm");
 
     CmdArgs.push_back("-lc");
 
-    if (Args.hasArg(options::OPT_p, options::OPT_pg)) {
+    if (Args.hasArgNoClaim(options::OPT_p, options::OPT_pg)) {
       CmdArgs.push_back(Args.MakeArgString((llvm::Twine("-L") + D.SysRoot) +
                                            "/lib/profiled"));
       CmdArgs.push_back(Args.MakeArgString((llvm::Twine("-L") + D.SysRoot) +
                                            "/usr/lib/profiled"));
     }
   }
 
   const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath());

clang/lib/Driver/ToolChains/Clang.cpp

if (TC.SupportsProfiling()) {
     if (Arg *A = Args.getLastArg(options::OPT_mrecord_mcount)) {
       if (Arch == llvm::Triple::systemz)
         A->render(Args, CmdArgs);
       else
         D.Diag(diag::err_drv_unsupported_opt_for_target)
             << A->getAsString(Args) << TripleStr;
     }
   }
-  if (Arg *A = Args.getLastArgNoClaim(options::OPT_p)) {
-    if (TC.getTriple().isOSAIX()) {
-      CmdArgs.push_back("-pg");
-    } else if (!TC.getTriple().isOSOpenBSD()) {
+
+  if (Arg *A = Args.getLastArgNoClaim(options::OPT_pg)) {
+    if (TC.getTriple().isOSzOS()) {
       D.Diag(diag::err_drv_unsupported_opt_for_target)
           << A->getAsString(Args) << TripleStr;
     }
   }
-  if (Arg *A = Args.getLastArgNoClaim(options::OPT_pg)) {
-    if (TC.getTriple().isOSzOS()) {
+  if (Arg *A = Args.getLastArgNoClaim(options::OPT_p)) {
+    if (!(TC.getTriple().isOSAIX() || TC.getTriple().isOSOpenBSD())) {
       D.Diag(diag::err_drv_unsupported_opt_for_target)
           << A->getAsString(Args) << TripleStr;
     }
   }
+  if (Arg *A = Args.getLastArgNoClaim(options::OPT_p, options::OPT_pg)) {
+    if (A->getOption().matches(options::OPT_p)) {
+      A->claim();
+      if (TC.getTriple().isOSAIX() && !Args.hasArgNoClaim(options::OPT_pg))
+        CmdArgs.push_back("-pg");
+    }
+  }
 
   if (Args.getLastArg(options::OPT_fapple_kext) ||
       (Args.hasArg(options::OPT_mkernel) && types::isCXX(InputType)))
     CmdArgs.push_back("-fapple-kext");
 
   Args.AddLastArg(CmdArgs, options::OPT_altivec_src_compat);
   Args.AddLastArg(CmdArgs, options::OPT_flax_vector_conversions_EQ);
   Args.AddLastArg(CmdArgs, options::OPT_fobjc_sender_dependent_dispatch);

clang/test/Driver/ibm-profiling.c

+// Check that -pg throws an error on z/OS.
+// RUN: %clang -### 2>&1 --target=s390x-none-zos -S -pg %s | FileCheck -check-prefix=FAIL-PG-NAME %s
+// FAIL-PG-NAME: error: unsupported option '-pg' for target 's390x-none-zos'
+
+// Check that -p is still used when not linking on AIX.
+// RUN: %clang -### 2>&1 --target=powerpc-ibm-aix7.1.0.0 -S -p -S %s \
+// RUN:   | FileCheck --check-prefix=CHECK %s
+// CHECK-NOT: warning: argument unused during compilation: '-p'
+
+// Check precedence: -pg is unused when passed first on AIX.
+// RUN: %clang -### 2>&1 --target=powerpc-ibm-aix7.1.0.0 --sysroot %S/Inputs/aix_ppc_tree -pg -p %s \
+// RUN:        | FileCheck --check-prefix=CHECK2 %s
+// CHECK2-NOT: warning: argument unused during compilation: '-p' [-Wunused-command-line-argument]
+// CHECK2:     "-isysroot" "[[SYSROOT:[^"]+]]"
+// CHECK2:     "[[SYSROOT]]/usr/lib{{/|\\\\}}mcrt0.o"
+// CHECK2:     "-L[[SYSROOT]]/lib/profiled"
+// CHECK2:     "-L[[SYSROOT]]/usr/lib/profiled"
+
+// Check precedence: -p is unused when passed first on AIX.
+// RUN: %clang -### 2>&1 --target=powerpc-ibm-aix7.1.0.0 --sysroot %S/Inputs/aix_ppc_tree -p -pg %s \
+// RUN:        | FileCheck --check-prefix=CHECK3 %s
+// CHECK3: warning: argument unused during compilation: '-p' [-Wunused-command-line-argument]
+// CHECK3:     "-isysroot" "[[SYSROOT:[^"]+]]"
+// CHECK3:     "[[SYSROOT]]/usr/lib{{/|\\\\}}gcrt0.o"
+// CHECK3:     "-L[[SYSROOT]]/lib/profiled"
+// CHECK3:     "-L[[SYSROOT]]/usr/lib/profiled"
+

clang/test/Driver/zos-profiling-error.c

-// RUN: %clang 2>&1 -### --target=s390x-none-zos -pg -S %s | FileCheck -check-prefix=FAIL-PG-NAME %s
-// FAIL-PG-NAME: error: unsupported option '-pg' for target 's390x-none-zos'