[cc1as] Add MCTargetOptions argument to createAsmBackend

[joelkevinjones]

Summary

Allow an assembler backend to get ABI options. This is to match the changes to http://reviews.llvm.org/D16213.

Tested with "make check-clang"

[echristo]

Hi Joel,

Since you're likely going to need to start filling in the Options there anyhow, can you lift the one from the TODO and start filling it in?

-eric

[joelkevinjones]

Did you mean remove the duplication from addPassesToEmitFile mentioned in the FIXME or something else?

[joelkevinjones]

Ping.

[echristo]

In D16538#344540, @joelkevinjones wrote:

Ping.

The FIXME at cc1as_main.cpp:413

[joelkevinjones]

The FIXME comment doesn't make sense to me. I'm not sure what sanitizer arguments would be passed to the assembler.

[dsanders]

I think it refers to MCTargetOptions::SanitizeAddress but I don't know where we'd get that information from. Unfortunately, it seems that the original author (@ygorshenin) might not be on the list anymore (phabricator shows no activity since 2014) but we can ask Evgeniy.

tools/driver/cc1as_main.cpp

413–416 ↗

(On Diff #45872)

@eugenis: Do you know what needs to be done for this FIXME?

[eugenis]

tools/driver/cc1as_main.cpp

413–416 ↗

(On Diff #45872)

I think this is about allowing -fsanitize=address as a cc1as flag to enable asan instrumentation in standalone assembly files. Currently it is only supported in inline assembly.

[joelkevinjones]

Updated to ToT. Passes "make check-clang"

[joelkevinjones]

Ping. This change needs to be made once D16213 goes in.

cfe/trunk/tools/driver/cc1as_main.cpp

static bool ExecuteAssembler(AssemblerInvocation &Opts,
   // FIXME: There is a bit of code duplication with addPassesToEmitFile.
   if (Opts.OutputType == AssemblerInvocation::FT_Asm) {
     MCInstPrinter *IP = TheTarget->createMCInstPrinter(
         llvm::Triple(Opts.Triple), Opts.OutputAsmVariant, *MAI, *MCII, *MRI);
     MCCodeEmitter *CE = nullptr;
     MCAsmBackend *MAB = nullptr;
     if (Opts.ShowEncoding) {
       CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, Ctx);
-      MAB = TheTarget->createMCAsmBackend(*MRI, Opts.Triple, Opts.CPU);
+      MCTargetOptions Options;
+      MAB = TheTarget->createMCAsmBackend(*MRI, Opts.Triple, Opts.CPU, Options);
     }
     auto FOut = llvm::make_unique<formatted_raw_ostream>(*Out);
     Str.reset(TheTarget->createAsmStreamer(
         Ctx, std::move(FOut), /*asmverbose*/ true,
         /*useDwarfDirectory*/ true, IP, CE, MAB, Opts.ShowInst));
   } else if (Opts.OutputType == AssemblerInvocation::FT_Null) {
     Str.reset(createNullStreamer(Ctx));
   } else {
     assert(Opts.OutputType == AssemblerInvocation::FT_Obj &&
            "Invalid file type!");
     if (!FDOS->supportsSeeking()) {
       BOS = make_unique<buffer_ostream>(*FDOS);
       Out = BOS.get();
     }
 
     MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, Ctx);
+    MCTargetOptions Options;
     MCAsmBackend *MAB = TheTarget->createMCAsmBackend(*MRI, Opts.Triple,
-                                                      Opts.CPU);
+                                                      Opts.CPU, Options);
     Triple T(Opts.Triple);
     Str.reset(TheTarget->createMCObjectStreamer(
         T, Ctx, *MAB, *Out, CE, *STI, Opts.RelaxAll,
         Opts.IncrementalLinkerCompatible,
         /*DWARFMustBeAtTheEnd*/ true));
     Str.get()->InitSections(Opts.NoExecStack);
   }