From 54967c01d2bb6daa1959865d9a780678e652419d Mon Sep 17 00:00:00 2001 From: Yuanfang Chen Date: Tue, 27 Sep 2022 13:06:18 -0700 Subject: [PATCH] [Driver] pass -fjmc to LTO So the behavior is consistent with non-LTO mode. Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D134659 --- clang/lib/Driver/ToolChains/CommonArgs.cpp | 8 ++++++++ clang/test/Driver/clang_f_opts.c | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index c926e98..4bc1671 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -626,6 +626,14 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args, Path)); } + // This controls whether or not we perform JustMyCode instrumentation. + if (Args.hasFlag(options::OPT_fjmc, options::OPT_fno_jmc, false)) { + if (ToolChain.getEffectiveTriple().isOSBinFormatELF()) + CmdArgs.push_back("-plugin-opt=-enable-jmc-instrument"); + else + D.Diag(clang::diag::warn_drv_fjmc_for_elf_only); + } + // Setup statistics file output. SmallString<128> StatsFile = getStatsFileName(Args, Output, Input, D); if (!StatsFile.empty()) diff --git a/clang/test/Driver/clang_f_opts.c b/clang/test/Driver/clang_f_opts.c index d529f9a..9c38b59 100644 --- a/clang/test/Driver/clang_f_opts.c +++ b/clang/test/Driver/clang_f_opts.c @@ -601,10 +601,15 @@ // RUN: %clang -### -S -fjmc -target x86_64-pc-windows-msvc %s 2>&1 | FileCheck -check-prefixes=CHECK_JMC_WARN_NOT_ELF,CHECK_NOJMC %s // RUN: %clang -### -S -fjmc -g -target x86_64-unknown-linux %s 2>&1 | FileCheck -check-prefix=CHECK_JMC %s // RUN: %clang -### -S -fjmc -g -fno-jmc -target x86_64-unknown-linux %s 2>&1 | FileCheck -check-prefix=CHECK_NOJMC %s +// RUN: %clang -### -fjmc -g -flto -target x86_64-pc-windows-msvc %s 2>&1 | FileCheck -check-prefixes=CHECK_JMC_WARN_NOT_ELF,CHECK_NOJMC_LTO %s +// RUN: %clang -### -fjmc -g -flto -target x86_64-unknown-linux %s 2>&1 | FileCheck -check-prefix=CHECK_JMC_LTO %s +// RUN: %clang -### -fjmc -g -flto -fno-jmc -target x86_64-unknown-linux %s 2>&1 | FileCheck -check-prefix=CHECK_NOJMC_LTO %s // CHECK_JMC_WARN: -fjmc requires debug info. Use -g or debug options that enable debugger's stepping function; option ignored // CHECK_JMC_WARN_NOT_ELF: -fjmc works only for ELF; option ignored // CHECK_NOJMC-NOT: -fjmc // CHECK_JMC: -fjmc +// CHECK_NOJMC_LTO-NOT: -plugin-opt=-enable-jmc-instrument +// CHECK_JMC_LTO: -plugin-opt=-enable-jmc-instrument // RUN: %clang -### -fintegrated-objemitter -target x86_64 %s 2>&1 | FileCheck -check-prefix=CHECK-INT-OBJEMITTER %s // CHECK-INT-OBJEMITTER-NOT: unsupported option '-fintegrated-objemitter' for target -- 2.7.4