Merge pull request #37808 from gottesmm/pr-9e160950a47e76f8be13a4944dbd410a6b620245

Fixes in response to feedback on #37771.

Author: gottesmm

test/Interpreter/process_arguments.swift

@@ -1,7 +1,7 @@
-// RUN: %target-jit-run -interpret %s | %FileCheck %s -check-prefix=CHECK-NONE
-// RUN: %target-jit-run -interpret %s -Onone -g | %FileCheck %s -check-prefix=CHECK-NONE
-// RUN: %target-jit-run -interpret %s -Onone -g -- | %FileCheck %s -check-prefix=CHECK-NONE
-// RUN: %target-jit-run -interpret %s -Onone -g -- a b c | %FileCheck %s -check-prefix=CHECK-THREE
+// RUN: %target-jit-run %s | %FileCheck %s -check-prefix=CHECK-NONE
+// RUN: %target-jit-run %s -Onone -g | %FileCheck %s -check-prefix=CHECK-NONE
+// RUN: %target-jit-run %s -Onone -g -- | %FileCheck %s -check-prefix=CHECK-NONE
+// RUN: %target-jit-run %s -Onone -g -- a b c | %FileCheck %s -check-prefix=CHECK-THREE
 
 // REQUIRES: swift_interpreter
 

test/lit.cfg

@@ -1885,6 +1885,14 @@ if not kIsWindows:
 			"SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
 			.format(all_stdlib_path, libdispatch_path)) + config.target_run
 
+# When running with the JIT on Darwin, force the usage of the just built stdlib
+# when running the frontend. This is because we currently JIT in process
+# resulting in weirdness around swift-frontend wanting to link against the host
+# stdlib and the exec swift code wanting to link against the target stdlib. For
+# now, we work around this by just saying in that case we will force
+# swift-frontend to use the just built runtime so we are consistent. The only
+# potential problem is that a bug in the just built runtime may now cause these
+# tests to fail.
 subst_target_jit_prefix = ""
 if platform.system() == 'Darwin' and config.target_run:
    subst_target_jit_prefix = config.target_run