---

yaml
---
r: 323198
b: refs/heads/tensorflow-next
c: 4f48d5e
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
-refs/heads/tensorflow-next: c5a8ee7dc6d6453ec3cc8960c3bde73972034dba
+refs/heads/tensorflow-next: 4f48d5eb855af9c54ab236be53e8e8367d266657

branches/tensorflow-next/test/lit.cfg

@@ -927,7 +927,7 @@ elif run_os in ['windows-msvc']:
     config.target_add_rpath = r''
 
     config.target_clang =                                                        \
-            ('clang++ -target %s %s' % (config.variant_triple, clang_mcp_opt))
+            ('clang++ -target %s %s -fobjc-runtime=ios-5.0' % (config.variant_triple, clang_mcp_opt))
     config.target_ld =                                                           \
             ('%r -libpath:%s' % (config.link, os.path.join(test_resource_dir,    \
                                                            config.target_sdk_name)))
@@ -1013,7 +1013,7 @@ elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'wi
         '%s -modulewrap -target %s' %
         (config.swiftc, config.variant_triple))
     config.target_clang = (
-        "clang++ -target %s %s" %
+        "clang++ -target %s %s -fobjc-runtime=ios-5.0" %
         (config.variant_triple, clang_mcp_opt))
     config.target_ld = "ld -L%r" % (make_path(test_resource_dir, config.target_sdk_name))
 elif run_os == 'linux-androideabi' or run_os == 'linux-android':
@@ -1137,7 +1137,8 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
     config.target_clang = ' '.join([
         'clang++',
         '-target', config.variant_triple,
-        clang_mcp_opt, android_include_system_paths_opt])
+        clang_mcp_opt, android_include_system_paths_opt,
+        '-fobjc-runtime=ios-5.0'])
     config.target_ld = ' '.join([
         tools_directory,
         '-L%s' % make_path(test_resource_dir, config.target_sdk_name)])

branches/tensorflow-next/test/lit.site.cfg.in

@@ -27,26 +27,28 @@ config.variant_triple = "@VARIANT_TRIPLE@"
 config.variant_sdk = "@VARIANT_SDK@"
 config.variant_suffix = "@VARIANT_SUFFIX@"
 config.swiftlib_dir = "@LIT_SWIFTLIB_DIR@"
-config.swift_stdlib_msvc_runtime = None
-if "@SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY@" == "MultiThreaded":
-    config.swift_stdlib_msvc_runtime = 'MT'
-elif "@SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY@" == "MultiThreadedDebug":
-    config.swift_stdlib_msvc_runtime = 'MTd'
-elif "@SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY@" == "MultiThreadedDLL":
-    config.swift_stdlib_msvc_runtime = 'MD'
-elif "@SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY@" == "MultiThreadedDebugDLL":
-    config.swift_stdlib_msvc_runtime = 'MDd'
-else:
-    assert(False)
-
 config.swift_test_results_dir = \
     lit_config.params.get("swift_test_results_dir", "@SWIFT_TEST_RESULTS_DIR@")
+
+config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
+config.lldb_build_root = "@LLDB_BUILD_DIR@"
+
+# --- Darwin ---
 config.darwin_xcrun_toolchain = "@SWIFT_DARWIN_XCRUN_TOOLCHAIN@"
+
+# --- android ---
 config.android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@"
 config.android_ndk_gcc_version = "@SWIFT_ANDROID_NDK_GCC_VERSION@"
 
-config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
-config.lldb_build_root = "@LLDB_BUILD_DIR@"
+# --- Windows ---
+msvc_runtime_flags = {
+  'MultiThreaded': 'MT',
+  'MultiThreadedDebug': 'MTd',
+  'MultiThreadedDLL': 'MD',
+  'MultiThreadedDebugDLL': 'MDd',
+}
+config.swift_stdlib_msvc_runtime = \
+    msvc_runtime_flags["@SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY@"]
 
 # Please remember to handle empty strings and/or unset variables correctly.
 

branches/tensorflow-next/test/stdlib/Inputs/DictionaryKeyValueTypesObjC.swift

@@ -1,3 +1,6 @@
+
+#if _runtime(_ObjC)
+
 import Swift
 import SwiftPrivate
 import Darwin
@@ -1002,3 +1005,6 @@ func getBridgedNSArrayOfValueTypeCustomBridged(
 
   return bridged
 }
+
+#endif
+

branches/tensorflow-next/test/stdlib/Inputs/NSSlowString/NSSlowString.m

@@ -1,3 +1,6 @@
+
+#if __has_include(<Foundation/Foundation.h>)
+
 #import "NSSlowString.h"
 
 
@@ -41,3 +44,6 @@ - (void *) _fastCharacterContents {
 }
 
 @end
+
+#endif
+

branches/tensorflow-next/test/stdlib/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m

@@ -1,3 +1,5 @@
+
+#if __has_include(<Foundation/Foundation.h>)
 #include <Foundation/Foundation.h>
 
 void slurpFastEnumerationOfArrayFromObjCImpl(id Array, id<NSFastEnumeration> FE,
@@ -16,4 +18,5 @@ void slurpFastEnumerationOfDictionaryFromObjCImpl(
     [KeyValuePairs addObject: NSD[Key]];
   }
 }
+#endif
 

branches/tensorflow-next/utils/rth

@@ -74,7 +74,10 @@ class ResilienceTest(object):
         os.makedirs(self.before_dir)
 
     def is_apple_platform(self):
-        return any('-apple-' in arg for arg in self.target_build_swift)
+        return self.triple.split('-')[1] == 'apple'
+
+    def is_windows_host(self):
+        return self.triple.split('-')[2] == 'windows'
 
     def compile_library(self):
         for config in self.config_dir_map:
@@ -172,21 +175,32 @@ class ResilienceTest(object):
                                       config1_lower + '_' + config2_lower)
             if self.is_apple_platform():
                 rpath_origin = '@executable_path'
+            elif self.is_windows_host():
+                pass
             else:
+                # assume it is an ELF host
                 rpath_origin = '$ORIGIN'
 
             compiler_flags = [
                 '-L', self.config_dir_map[config2],
                 '-l' + self.lib_name,
                 os.path.join(self.config_dir_map[config2],
                              'main.o'),
-                '-Xlinker', '-rpath', '-Xlinker',
-                os.path.join(rpath_origin,
-                             os.path.relpath(self.config_dir_map[config1],
-                                             self.tmp_dir)),
                 '-o', output_obj
             ]
 
+            if self.is_windows_host():
+                # Emulate RPATH by changing to the location as `PATH` is what
+                # drives library searching on Windows
+                os.chdir(self.config_dir_map[config1])
+            else:
+                compiler_flags.extend([
+                    '-Xlinker', '-rpath', '-Xlinker',
+                    os.path.join(rpath_origin,
+                                 os.path.relpath(self.config_dir_map[config1],
+                                                 self.tmp_dir)),
+                ])
+
             if self.is_apple_platform():
                 compiler_flags += ['-Xlinker', '-bind_at_load']
 

branches/tensorflow-next/validation-test/stdlib/ArrayNew.swift.gyb

@@ -1,12 +1,8 @@
 // RUN: %empty-directory(%t)
 //
 // RUN: %gyb %s -o %t/main.swift
-// RUN: if [ %target-runtime == "objc" ]; then \
-// RUN:   %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o; \
-// RUN:   %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Array -Xfrontend -disable-access-control -swift-version 4.2; \
-// RUN: else \
-// RUN:   %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %t/main.swift -o %t/Array -Xfrontend -disable-access-control -swift-version 4.2; \
-// RUN: fi
+// RUN: %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o
+// RUN: %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Array -Xfrontend -disable-access-control -swift-version 4.2
 // RUN: %target-codesign %t/Array && %line-directive %t/main.swift -- %target-run %t/Array
 // REQUIRES: executable_test
 

branches/tensorflow-next/validation-test/stdlib/Arrays.swift.gyb

@@ -1,12 +1,8 @@
 // RUN: %empty-directory(%t)
 //
 // RUN: %gyb %s -o %t/main.swift
-// RUN: if [ %target-runtime == "objc" ]; then \
-// RUN:   %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o; \
-// RUN:   %line-directive %t/main.swift -- %target-build-swift %t/main.swift %S/Inputs/ArrayTypesAndHelpers.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Arrays -Xfrontend -disable-access-control; \
-// RUN: else \
-// RUN:   %line-directive %t/main.swift -- %target-build-swift %S/Inputs/ArrayTypesAndHelpers.swift %t/main.swift -o %t/Arrays -Xfrontend -disable-access-control; \
-// RUN: fi
+// RUN: %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o
+// RUN: %line-directive %t/main.swift -- %target-build-swift %t/main.swift %S/Inputs/ArrayTypesAndHelpers.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Arrays -Xfrontend -disable-access-control
 //
 // RUN: %target-codesign %t/Arrays && %line-directive %t/main.swift -- %target-run %t/Arrays
 // REQUIRES: executable_test

branches/tensorflow-next/validation-test/stdlib/Dictionary.swift

@@ -1,12 +1,8 @@
 // RUN: %empty-directory(%t)
 //
 // RUN: %gyb %s -o %t/main.swift
-// RUN: if [ %target-runtime == "objc" ]; then \
-// RUN:   %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o; \
-// RUN:   %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Dictionary -Xfrontend -disable-access-control; \
-// RUN: else \
-// RUN:   %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %t/main.swift -o %t/Dictionary -Xfrontend -disable-access-control; \
-// RUN: fi
+// RUN: %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o
+// RUN: %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Dictionary -Xfrontend -disable-access-control
 //
 // RUN: %target-codesign %t/Dictionary && %line-directive %t/main.swift -- %target-run %t/Dictionary
 // REQUIRES: executable_test

branches/tensorflow-next/validation-test/stdlib/Set.swift

@@ -1,12 +1,8 @@
 // RUN: %empty-directory(%t)
 //
 // RUN: %gyb %s -o %t/main.swift
-// RUN: if [ %target-runtime == "objc" ]; then \
-// RUN:   %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o; \
-// RUN:   %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Set -Xfrontend -disable-access-control -swift-version 4.2; \
-// RUN: else \
-// RUN:   %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %t/main.swift -o %t/Set -Xfrontend -disable-access-control -swift-version 4.2; \
-// RUN: fi
+// RUN: %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o
+// RUN: %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Set -Xfrontend -disable-access-control -swift-version 4.2
 //
 // RUN: %target-codesign %t/Set && %line-directive %t/main.swift -- %target-run %t/Set
 // REQUIRES: executable_test

branches/tensorflow-next/validation-test/stdlib/String.swift

@@ -1,11 +1,6 @@
 // RUN: %empty-directory(%t)
-// RUN: if [ %target-runtime == "objc" ]; \
-// RUN: then \
-// RUN:   %target-clang -fobjc-arc %S/Inputs/NSSlowString/NSSlowString.m -c -o %t/NSSlowString.o && \
-// RUN:   %target-build-swift -I %S/Inputs/NSSlowString/ %t/NSSlowString.o %s -Xfrontend -disable-access-control -o %t/String; \
-// RUN: else \
-// RUN:   %target-build-swift %s -Xfrontend -disable-access-control -o %t/String; \
-// RUN: fi
+// RUN: %target-clang -fobjc-arc %S/Inputs/NSSlowString/NSSlowString.m -c -o %t/NSSlowString.o
+// RUN: %target-build-swift -I %S/Inputs/NSSlowString/ %t/NSSlowString.o %s -Xfrontend -disable-access-control -o %t/String
 
 // RUN: %target-codesign %t/String
 // RUN: %target-run %t/String

branches/tensorflow-next/validation-test/stdlib/StringNormalization.swift

@@ -9,14 +9,10 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
+
 // RUN: %empty-directory(%t)
-// RUN: if [ %target-runtime == "objc" ]; \
-// RUN: then \
-// RUN:   %target-clang -fobjc-arc %S/Inputs/NSSlowString/NSSlowString.m -c -o %t/NSSlowString.o && \
-// RUN:   %target-build-swift -I %S/Inputs/NSSlowString/ %t/NSSlowString.o %s -o %t/a.out; \
-// RUN: else \
-// RUN:   %target-build-swift %s -o %t/a.out; \
-// RUN: fi
+// RUN: %target-clang -fobjc-arc %S/Inputs/NSSlowString/NSSlowString.m -c -o %t/NSSlowString.o
+// RUN: %target-build-swift -I %S/Inputs/NSSlowString/ %t/NSSlowString.o %s -o %t/a.out
 
 // RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out %S/Inputs/NormalizationTest.txt

branches/tensorflow-next/validation-test/stdlib/StringUTF8.swift

@@ -1,11 +1,6 @@
 // RUN: %empty-directory(%t)
-// RUN: if [ %target-runtime == "objc" ]; \
-// RUN: then \
-// RUN:   %target-clang -fobjc-arc %S/Inputs/NSSlowString/NSSlowString.m -c -o %t/NSSlowString.o && \
-// RUN:   %target-build-swift -I %S/Inputs/NSSlowString/ %t/NSSlowString.o %s -o %t/String; \
-// RUN: else \
-// RUN:   %target-build-swift %s -o %t/String; \
-// RUN: fi
+// RUN: %target-clang -fobjc-arc %S/Inputs/NSSlowString/NSSlowString.m -c -o %t/NSSlowString.o
+// RUN: %target-build-swift -I %S/Inputs/NSSlowString/ %t/NSSlowString.o %s -o %t/String
 
 // RUN: %target-codesign %t/String
 // RUN: %target-run %t/String