From 76c3ec814dec8eef020490b5d3a640d873b5918b Mon Sep 17 00:00:00 2001 From: Kadir Cetinkaya Date: Sat, 1 Aug 2020 19:03:40 +0200 Subject: [PATCH] [clang][Tooling] Optimize addTargetAndMode in case of invalid modes This skips searching for `target` related flags in the existing args if we don't have a valid target to insert. Depends on D85076 Differential Revision: https://reviews.llvm.org/D85077 --- clang/lib/Tooling/Tooling.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/clang/lib/Tooling/Tooling.cpp b/clang/lib/Tooling/Tooling.cpp index 0593f0c..1ee8ce2 100644 --- a/clang/lib/Tooling/Tooling.cpp +++ b/clang/lib/Tooling/Tooling.cpp @@ -258,22 +258,23 @@ void addTargetAndModeForProgramName(std::vector &CommandLine, // --driver-mode=X const std::string DriverModeOPT = Table.getOption(driver::options::OPT_driver_mode).getPrefixedName(); - bool AlreadyHasTarget = false; - bool AlreadyHasMode = false; + auto TargetMode = + driver::ToolChain::getTargetAndModeFromProgramName(InvokedAs); + // No need to search for target args if we don't have a target/mode to insert. + bool ShouldAddTarget = TargetMode.TargetIsValid; + bool ShouldAddMode = TargetMode.DriverMode != nullptr; // Skip CommandLine[0]. for (auto Token = ++CommandLine.begin(); Token != CommandLine.end(); ++Token) { StringRef TokenRef(*Token); - AlreadyHasTarget |= - TokenRef.startswith(TargetOPT) || TokenRef.equals(TargetOPTLegacy); - AlreadyHasMode |= TokenRef.startswith(DriverModeOPT); + ShouldAddTarget = ShouldAddTarget && !TokenRef.startswith(TargetOPT) && + !TokenRef.equals(TargetOPTLegacy); + ShouldAddMode = ShouldAddMode && !TokenRef.startswith(DriverModeOPT); } - auto TargetMode = - driver::ToolChain::getTargetAndModeFromProgramName(InvokedAs); - if (!AlreadyHasMode && TargetMode.DriverMode) { + if (ShouldAddMode) { CommandLine.insert(++CommandLine.begin(), TargetMode.DriverMode); } - if (!AlreadyHasTarget && TargetMode.TargetIsValid) { + if (ShouldAddTarget) { CommandLine.insert(++CommandLine.begin(), TargetOPT + TargetMode.TargetPrefix); } -- 2.7.4