diff options
| -rw-r--r-- | clang/include/clang/Basic/XRayInstr.h | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/XRayArgs.cpp | 15 | ||||
| -rw-r--r-- | clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp | 11 |
3 files changed, 28 insertions, 0 deletions
diff --git a/clang/include/clang/Basic/XRayInstr.h b/clang/include/clang/Basic/XRayInstr.h index 13c3032a5cc..6efefcb33ac 100644 --- a/clang/include/clang/Basic/XRayInstr.h +++ b/clang/include/clang/Basic/XRayInstr.h @@ -60,6 +60,8 @@ struct XRayInstrSet { bool empty() const { return Mask == 0; } + bool full() const { return Mask == XRayInstrKind::All; } + XRayInstrMask Mask = 0; }; diff --git a/clang/lib/Driver/XRayArgs.cpp b/clang/lib/Driver/XRayArgs.cpp index 527fc3c9558..a2023289753 100644 --- a/clang/lib/Driver/XRayArgs.cpp +++ b/clang/lib/Driver/XRayArgs.cpp @@ -215,4 +215,19 @@ void XRayArgs::addArgs(const ToolChain &TC, const ArgList &Args, 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)); } diff --git a/clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp b/clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp new file mode 100644 index 00000000000..da2535509b9 --- /dev/null +++ b/clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp @@ -0,0 +1,11 @@ +// 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 +// +// REQUIRES-ANY: linux, freebsd +// REQUIRES-ANY: amd64, x86_64, x86_64h, arm, aarch64, arm64 |
