[XRay][clang] Propagate -fxray-instrumentation-bundle to -cc1

[dberris]

Summary

Add a test and ensure that we propagate the
-fxray-instrumentation-bundle flag from the driver invocation to the
-cc1 options.

[mboerger]

LGTM

[dberris]

Move the test to the driver, more appropriate location.

[mboerger]

LGTM

clang/include/clang/Basic/XRayInstr.h

void set(XRayInstrMask K, bool Value) {
     assert(llvm::isPowerOf2_32(K));
     Mask = Value ? (Mask | K) : (Mask & ~K);
   }
 
   void clear(XRayInstrMask K = XRayInstrKind::All) { Mask &= ~K; }
 
   bool empty() const { return Mask == 0; }
 
+  bool full() const { return Mask == XRayInstrKind::All; }
+
   XRayInstrMask Mask = 0;
 };
 
 XRayInstrMask parseXRayInstrValue(StringRef Value);
 
 } // namespace clang
 
 #endif // LLVM_CLANG_BASIC_XRAYINSTR_H

clang/lib/Driver/XRayArgs.cpp

for (const auto &Dep : ExtraDeps) {
     CmdArgs.push_back(Args.MakeArgString(ExtraDepOpt));
   }
 
   for (const auto &Mode : Modes) {
     SmallString<64> ModeOpt("-fxray-modes=");
     ModeOpt += Mode;
     CmdArgs.push_back(Args.MakeArgString(ModeOpt));
   }
+
+  SmallString<64> Bundle("-fxray-instrumentation-bundle=");
+  if (InstrumentationBundle.full()) {
+    Bundle += "all";
+  } else if (InstrumentationBundle.empty()) {
+    Bundle += "none";
+  } else {
+    if (InstrumentationBundle.has(XRayInstrKind::Function))
+      Bundle += "function";
+    if (InstrumentationBundle.has(XRayInstrKind::Custom))
+      Bundle += "custom";
+    if (InstrumentationBundle.has(XRayInstrKind::Typed))
+      Bundle += "typed";
+  }
+  CmdArgs.push_back(Args.MakeArgString(Bundle));
 }

clang/test/CodeGen/xray-instrumentation-bundles-flags.cpp

+// This test ensures that when we invoke the clang compiler, that the -cc1
+// options include the -fxray-instrumentation-bundle= flag we provide in the
+// invocation.
+//
+// RUN: %clang -fxray-instrument -fxray-instrumentation-bundle=function -### \
+// RUN:     -x c++ -std=c++11 -emit-llvm -c -o - %s 2>&1 \
+// RUN:     | FileCheck %s
+// CHECK:  -fxray-instrumentation-bundle=function