[lld] 18335f4 - [ELF] Ignore --time-trace if disableOutput

Fangrui Song via llvm-commits llvm-commits at lists.llvm.org
Sat Jan 25 18:06:28 PST 2025


Author: Fangrui Song
Date: 2025-01-25T18:06:22-08:00
New Revision: 18335f4800ae5491a11e74a574969d716acddce7

URL: https://github.com/llvm/llvm-project/commit/18335f4800ae5491a11e74a574969d716acddce7
DIFF: https://github.com/llvm/llvm-project/commit/18335f4800ae5491a11e74a574969d716acddce7.diff

LOG: [ELF] Ignore --time-trace if disableOutput

To avoid prevent generating two JSON for LLD_IN_TEST=2 ld.lld
--time-trace.

Added: 
    

Modified: 
    lld/ELF/Driver.cpp

Removed: 
    


################################################################################
diff  --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 770163f4de0860..7e0d3fca31353c 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -1463,7 +1463,8 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
   }
   ctx.arg.thinLTOModulesToCompile =
       args::getStrings(args, OPT_thinlto_single_module_eq);
-  ctx.arg.timeTraceEnabled = args.hasArg(OPT_time_trace_eq);
+  ctx.arg.timeTraceEnabled =
+      args.hasArg(OPT_time_trace_eq) && !ctx.e.disableOutput;
   ctx.arg.timeTraceGranularity =
       args::getInteger(args, OPT_time_trace_granularity, 500);
   ctx.arg.trace = args.hasArg(OPT_trace);


        


More information about the llvm-commits mailing list