Skip to content

Commit 0b95d6c

Browse files
committed
Fixes in response to feedback on #37771.
1 parent c139bb4 commit 0b95d6c

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

test/Interpreter/process_arguments.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// RUN: %target-jit-run -interpret %s | %FileCheck %s -check-prefix=CHECK-NONE
2-
// RUN: %target-jit-run -interpret %s -Onone -g | %FileCheck %s -check-prefix=CHECK-NONE
3-
// RUN: %target-jit-run -interpret %s -Onone -g -- | %FileCheck %s -check-prefix=CHECK-NONE
4-
// RUN: %target-jit-run -interpret %s -Onone -g -- a b c | %FileCheck %s -check-prefix=CHECK-THREE
1+
// RUN: %target-jit-run %s | %FileCheck %s -check-prefix=CHECK-NONE
2+
// RUN: %target-jit-run %s -Onone -g | %FileCheck %s -check-prefix=CHECK-NONE
3+
// RUN: %target-jit-run %s -Onone -g -- | %FileCheck %s -check-prefix=CHECK-NONE
4+
// RUN: %target-jit-run %s -Onone -g -- a b c | %FileCheck %s -check-prefix=CHECK-THREE
55

66
// REQUIRES: swift_interpreter
77

test/lit.cfg

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1885,6 +1885,14 @@ if not kIsWindows:
18851885
"SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
18861886
.format(all_stdlib_path, libdispatch_path)) + config.target_run
18871887

1888+
# When running with the JIT on Darwin, force the usage of the just built stdlib
1889+
# when running the frontend. This is because we currently JIT in process
1890+
# resulting in weirdness around swift-frontend wanting to link against the host
1891+
# stdlib and the exec swift code wanting to link against the target stdlib. For
1892+
# now, we work around this by just saying in that case we will force
1893+
# swift-frontend to use the just built runtime so we are consistent. The only
1894+
# potential problem is that a bug in the just built runtime may now cause these
1895+
# tests to fail.
18881896
subst_target_jit_prefix = ""
18891897
if platform.system() == 'Darwin' and config.target_run:
18901898
subst_target_jit_prefix = config.target_run

0 commit comments

Comments
 (0)