From f989123baec38dba4784b2ee207a4bc23472074e Mon Sep 17 00:00:00 2001 From: Andreas Kurth Date: Mon, 3 Jan 2022 15:05:55 +0100 Subject: [PATCH] [HERO/Clang] Print messages if HERCULES PREM passes are active Console messages that indicate when HERCULES PREM passes are active and when not are useful. However, previously messages were always printed if HERCULES PREM passes were *not* active, which confuses users that do not want to use or do not know HERCULES PREM passes. Additionally, these messages break those upstream regression tests that match on console output. This commit changes the messages to be printed when HERCULES PREM passes are active instead of when they are not active. --- clang/lib/Driver/ToolChains/Clang.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index bb1e94d2fb32c..e5c4cf6833486 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -4235,13 +4235,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Args.MakeArgString(herculesPassRoot + "libChannelArgInsertion.so")); - } else { llvm::errs() << llvm::sys::path::filename(Input.getBaseInput()) << " (" << getToolChain().getArchName() << "): "; llvm::errs().changeColor(llvm::raw_fd_ostream::Colors::BLUE, true); - llvm::errs() << "HERCULES PREM Passes not applied. "; + llvm::errs() << "Applying HERCULES PREM Passes installed at '"; + llvm::errs() << herculesInstallPathEnv; llvm::errs().resetColor(); - llvm::errs() << "Set the HERCULES_INSTALL env if you want to enable PREM.\n"; + llvm::errs() << "'\n"; } if (Triple.isOSWindows() && (Triple.getArch() == llvm::Triple::arm ||