---

yaml
---
r: 323517
b: refs/heads/tensorflow-next
c: 6db48a9
h: refs/heads/master
i:
  323515: 11f1832

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: 2e43ec4e5911d9f9cfe4b4f71951fdee31d8cb7d
+refs/heads/tensorflow-next: 6db48a95009927f923710a019bdd544abf4c4221

branches/tensorflow-next/test/IRGen/Inputs/legacy_type_info/b.yaml renamed to branches/tensorflow-next/test/IRGen/Inputs/legacy_type_info/jit_metadata_strategy.yaml

@@ -1,16 +1,11 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift-dylib(%t/%target-library-name(resilient_struct)) -enable-library-evolution %S/../Inputs/resilient_struct.swift -emit-module -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct
-
-// RUN: %target-swift-frontend -use-jit %s -emit-ir -lresilient_struct -L %t -I %t -enable-objc-interop -read-legacy-type-info-path=%S/Inputs/legacy_type_info/b.yaml | %FileCheck %s
-// RUN: %target-swift-frontend -interpret %s -lresilient_struct -L %t -I %t -enable-objc-interop -read-legacy-type-info-path=%S/Inputs/legacy_type_info/b.yaml
+// RUN: %target-swift-frontend -emit-module -enable-library-evolution %S/../Inputs/resilient_struct.swift -emit-module-path %t/resilient_struct.swiftmodule
+// RUN: %target-swift-frontend -use-jit %s -emit-ir -lresilient_struct -L %t -I %t -enable-objc-interop -read-legacy-type-info-path=%S/Inputs/legacy_type_info/jit_metadata_strategy.yaml | %FileCheck %s
 
 // REQUIRES: objc_interop
-// UNSUPPORTED: OS=ios || OS=watchos || OS=tvos
 
 import resilient_struct
 
-@_optimize(none) func blackHole<T>(_: T) {}
-
 // ClassMetadataStrategy::Fixed
 class FixedSizeClass {
     var v4: String?
@@ -40,10 +35,6 @@ class ClassNeedingUpdate {
     var v6: String?
 }
 
-blackHole(FixedSizeClass())
-blackHole(ClassWithGenericSuperclass())
-blackHole(ClassNeedingUpdate())
-
 // CHECK-LABEL: define{{( protected)?}} private void @runtime_registration
 // CHECK:             call void @swift_instantiateObjCClass({{.*}} @"$s21jit_metadata_strategy14FixedSizeClassCN")
 // CHECK-NOT:         call void @swift_instantiateObjCClass({{.*}} @"$s21jit_metadata_strategy18ClassNeedingUpdateCN")

branches/tensorflow-next/test/IRGen/jit_metadata_strategy.swift

@@ -0,0 +1,6 @@
+Name:            resilient_struct
+Decls:
+  - Name:            16resilient_struct15ResilientDoubleV
+    Size:            8
+    Alignment:       8
+    ExtraInhabitants: 0

branches/tensorflow-next/test/Interpreter/Inputs/legacy_type_info/jit_metadata_strategy.yaml

@@ -0,0 +1,44 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift-dylib(%t/%target-library-name(resilient_struct)) -enable-library-evolution %S/../Inputs/resilient_struct.swift -emit-module -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct
+
+// RUN: %target-swift-frontend -interpret %s -lresilient_struct -L %t -I %t -enable-objc-interop -read-legacy-type-info-path=%S/Inputs/legacy_type_info/jit_metadata_strategy.yaml
+
+// REQUIRES: objc_interop
+// REQUIRES: swift_interpreter
+
+import resilient_struct
+
+@_optimize(none) func blackHole<T>(_: T) {}
+
+// ClassMetadataStrategy::Fixed
+class FixedSizeClass {
+    var v4: String?
+    var v5: Int?
+    var v6: String?
+}
+
+// ClassMetadataStrategy::Singleton
+class GenericSuperclass<T> { }
+class ClassWithGenericSuperclass: GenericSuperclass<Int> {
+    var v1: ResilientDouble?
+    var v2: ResilientDouble?
+    var v3: ResilientDouble?
+    var v4: String?
+    var v5: Int?
+    var v6: String?
+}
+
+// ClassMetadataStrategy::FixedOrUpdate when compiling
+// ClassMetadataStrategy::Singleton when interpreting
+class ClassNeedingUpdate {
+    var v1: ResilientDouble?
+    var v2: ResilientDouble?
+    var v3: ResilientDouble?
+    var v4: String?
+    var v5: Int?
+    var v6: String?
+}
+
+blackHole(FixedSizeClass())
+blackHole(ClassWithGenericSuperclass())
+blackHole(ClassNeedingUpdate())

branches/tensorflow-next/test/Interpreter/jit_metadata_strategy.swift

@@ -2530,8 +2530,15 @@ for host in "${ALL_HOSTS[@]}"; do
                       call xcodebuild -target desktop -configuration ${LLDB_BUILD_MODE} ${lldb_xcodebuild_options[@]}
                   continue
                 else
+                  if [[ "$(uname -s)" == "Darwin" ]] ; then
+                    cmake_cache="Apple-lldb-macOS.cmake"
+                  else
+                    cmake_cache="Apple-lldb-linux.cmake"
+                  fi
+
                   cmake_options=(
                       "${cmake_options[@]}"
+                      -C${LLDB_SOURCE_DIR}/cmake/caches/${cmake_cache}
                       -DCMAKE_BUILD_TYPE:STRING="${LLDB_BUILD_TYPE}"
                       -DLLDB_SWIFTC:PATH="$(build_directory ${LOCAL_HOST} swift)/bin/swiftc"
                       -DLLDB_SWIFT_LIBS:PATH="$(build_directory ${LOCAL_HOST} swift)/lib/swift"
@@ -2549,10 +2556,8 @@ for host in "${ALL_HOSTS[@]}"; do
 
                   if [[ "$(uname -s)" == "Darwin" ]] ; then
                     cmake_options+=(
-                      -DLLDB_BUILD_FRAMEWORK:BOOL=TRUE
                       -DLLDB_CODESIGN_IDENTITY=""
                       -DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL="${LLDB_USE_SYSTEM_DEBUGSERVER}"
-                      -DLLDB_FRAMEWORK_TOOLS="darwin-debug;lldb-argdumper;lldb-server;repl_swift"
                     )
                   fi
                 fi