Skip to content

Commit 53557aa

Browse files
authored
Merge pull request #77784 from swiftlang/fine-grained-variable
FineModuleTrace: use SWIFT_COMPILER_FINE_GRAINED_TRACE_PATH to indicate where the fine module trace should be emitted to. NFC
2 parents d11db16 + 77cbc19 commit 53557aa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/Frontend/ArgsToFrontendOutputsConverter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,11 @@ SupplementaryOutputPathsComputer::computeOutputPathsForOneInput(
458458
// We piggy-back on the loadedModuleTracePath to decide (1) whether
459459
// to emit the fine module Trace file, and (2) where to emit the fine module
460460
// trace file if the path isn't explicitly given by
461-
// SWIFT_COMPILER_OBJC_MESSAGE_TRACE_PATH.
461+
// SWIFT_COMPILER_FINE_GRAINED_TRACE_PATH.
462462
// FIXME: we probably need to move this to a frontend argument.
463463
llvm::SmallString<128> FineModuleTracePath;
464464
if (!loadedModuleTracePath.empty()) {
465-
if (const char *P = ::getenv("SWIFT_COMPILER_OBJC_MESSAGE_TRACE_PATH")) {
465+
if (const char *P = ::getenv("SWIFT_COMPILER_FINE_GRAINED_TRACE_PATH")) {
466466
StringRef FilePath = P;
467467
llvm::sys::path::append(FineModuleTracePath, FilePath);
468468
} else {

test/IDE/objc_send_collector_1.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: %target-swift-frontend -I %t/lib/swift -typecheck %s %S/Inputs/objc_send_collector_2.swift -module-name main -swift-version 5 -F %S/Inputs/mock-sdk -emit-loaded-module-trace-path %t/.MODULE_TRACE
55
// RUN: cat %t/.SWIFT_FINE_DEPENDENCY_TRACE.json | %{python} -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' | %FileCheck %s
66

7-
// RUN: SWIFT_COMPILER_OBJC_MESSAGE_TRACE_PATH=%t/given_trace.json %target-swift-frontend -I %t/lib/swift -typecheck %s %S/Inputs/objc_send_collector_2.swift -module-name main -swift-version 5 -F %S/Inputs/mock-sdk -emit-loaded-module-trace-path %t/.MODULE_TRACE
7+
// RUN: SWIFT_COMPILER_FINE_GRAINED_TRACE_PATH=%t/given_trace.json %target-swift-frontend -I %t/lib/swift -typecheck %s %S/Inputs/objc_send_collector_2.swift -module-name main -swift-version 5 -F %S/Inputs/mock-sdk -emit-loaded-module-trace-path %t/.MODULE_TRACE
88
// RUN: cat %t/given_trace.json | %{python} -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' | %FileCheck %s
99

1010
// REQUIRES: objc_interop

0 commit comments

Comments
 (0)