---

yaml
---
r: 293470
b: refs/heads/tensorflow
c: 013b9bc
h: refs/heads/master

Author: adrian-prantl

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: db0b802aee7b651cfa761b909ad4cec4ca7aedcd
+refs/heads/tensorflow: 013b9bcf31ca8a5d43c41b45f2b2a6c3631a08fb
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/stdlib/public/core/Builtin.swift

@@ -312,11 +312,6 @@ func _uncheckedUnsafeAssume(_ condition: Bool) {
 @usableFromInline
 @_silgen_name("_swift_objcClassUsesNativeSwiftReferenceCounting")
 internal func _usesNativeSwiftReferenceCounting(_ theClass: AnyClass) -> Bool
-
-/// Returns the class of a non-tagged-pointer Objective-C object
-@_effects(readonly)
-@_silgen_name("_swift_classOfObjCHeapObject")
-internal func _swift_classOfObjCHeapObject(_ object: AnyObject) -> AnyClass
 #else
 @inlinable
 @inline(__always)

branches/tensorflow/stdlib/public/core/StringBridge.swift

@@ -125,6 +125,11 @@ private var kCFStringEncodingUTF8 : _swift_shims_CFStringEncoding {
   @inline(__always) get { return 0x8000100 }
 }
 
+@_effects(readonly)
+private func _unsafeAddressOfCocoaStringClass(_ str: _CocoaString) -> UInt {
+  return _swift_stdlib_unsafeAddressOfClass(str)
+}
+
 internal enum _KnownCocoaString {
   case storage
   case shared
@@ -143,7 +148,7 @@ internal enum _KnownCocoaString {
     }
 #endif
 
-    switch unsafeBitCast(_swift_classOfObjCHeapObject(str), to: UInt.self) {
+    switch _unsafeAddressOfCocoaStringClass(str) {
     case unsafeBitCast(__StringStorage.self, to: UInt.self):
       self = .storage
     case unsafeBitCast(__SharedStringStorage.self, to: UInt.self):

branches/tensorflow/stdlib/public/runtime/SwiftObject.mm

@@ -177,11 +177,6 @@ static Class _swift_getObjCClassOfAllocated(const void *object) {
     class_getInstanceSize(cls), mask));
 }
 
-SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_API
-Class _swift_classOfObjCHeapObject(OpaqueValue *value) {
-  return _swift_getObjCClassOfAllocated(value);
-}
-
 SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_API
 NSString *swift_stdlib_getDescription(OpaqueValue *value,
                                       const Metadata *type);

branches/tensorflow/test/Interpreter/bridged_casts_folding.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-Onone) | %FileCheck %s
+// RUN: %target-run-simple-swift | %FileCheck %s
 // RUN: %target-run-simple-swift(-O) | %FileCheck -check-prefix=CHECK-OPT %s
 
 // NOTE: We use FileCheck for the crashing test cases to make sure we crash for

branches/tensorflow/test/SILOptimizer/definite_init_failable_initializers_objc.swift

@@ -1,6 +1,7 @@
 // RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module %s | %FileCheck %s
 
 // REQUIRES: objc_interop
+// REQUIRES: rdar49942212
 
 import ObjectiveC
 
@@ -97,46 +98,52 @@ class Cat : FakeNSObject {
     // CHECK-NEXT: cond_br [[COND]], bb1, bb2
 
   // CHECK: bb1:
-    // CHECK-NEXT: br [[ERROR_BRANCH:bb[0-9]+]]
-      
-  // CHECK: bb{{[0-9]+}}:
+    // CHECK-NEXT: br bb8
+    
+  // CHECK: bb3:
+    // CHECK: br bb5
+  
+  // CHECK: bb4:
+    // CHECK: br bb5
+  
+  // CHECK: bb5
     // CHECK: [[SELF_INIT:%.+]] = objc_method %2 : $Cat, #Cat.init!initializer.1.foreign : (Cat.Type) -> (Int, Bool) -> Cat?
-    // CHECK: [[NEW_OPT_SELF:%.+]] = apply [[SELF_INIT]]({{%.+}}, {{%.+}}, {{%.+}}) : $@convention(objc_method) (Int, ObjCBool, @owned Cat) -> @owned Optional<Cat>
+    // CHECK: [[NEW_OPT_SELF:%.+]] = apply [[SELF_INIT]]({{%.+}}, {{%.+}}, %2) : $@convention(objc_method) (Int, ObjCBool, @owned Cat) -> @owned Optional<Cat>
     // CHECK: [[COND:%.+]] = select_enum [[NEW_OPT_SELF]] : $Optional<Cat>
-    // CHECK-NEXT: cond_br [[COND]], [[SUCCESS_BRANCH:bb[0-9]+]], [[RELEASE_THEN_ERROR_BRANCH:bb[0-9]+]]
+    // CHECK-NEXT: cond_br [[COND]], bb7, bb6
 
-  // CHECK: [[RELEASE_THEN_ERROR_BRANCH]]:
+  // CHECK: bb6:
     // CHECK-NEXT: release_value [[NEW_OPT_SELF]]
-    // CHECK-NEXT: br [[ERROR_BRANCH]]
+    // CHECK-NEXT: br bb8
 
-  // CHECK: [[SUCCESS_BRANCH]]:
+  // CHECK: bb7:
     // CHECK-NEXT: [[NEW_SELF:%.+]] = unchecked_enum_data [[NEW_OPT_SELF]] : $Optional<Cat>, #Optional.some!enumelt.1
     // CHECK-NEXT: store [[NEW_SELF]] to [[SELF_BOX]] : $*Cat
     // TODO: Once we re-enable arbitrary take promotion, this retain and the associated destroy_addr will go away.
     // CHECK-NEXT: strong_retain [[NEW_SELF]]
     // CHECK-NEXT: [[RESULT:%.+]] = enum $Optional<Cat>, #Optional.some!enumelt.1, [[NEW_SELF]] : $Cat
     // CHECK-NEXT: destroy_addr [[SELF_BOX]]
     // CHECK-NEXT: dealloc_stack [[SELF_BOX]] : $*Cat
-    // CHECK-NEXT: br [[RESULT_BRANCH:bb[0-9]+]]([[RESULT]] : $Optional<Cat>)
+    // CHECK-NEXT: br bb12([[RESULT]] : $Optional<Cat>)
 
-  // CHECK: [[ERROR_BRANCH]]:
+  // CHECK: bb8:
     // CHECK-NEXT: [[COND:%.+]] = load [[HAS_RUN_INIT_BOX]] : $*Builtin.Int1
-    // CHECK-NEXT: cond_br [[COND]], [[ERROR_WITHOUT_DESTROY_BRANCH:bb[0-9]+]], [[ERROR_WITH_DESTROY_BRANCH:bb[0-9]+]]
+    // CHECK-NEXT: cond_br [[COND]], bb9, bb10
 
-  // CHECK: [[ERROR_WITHOUT_DESTROY_BRANCH]]:
-    // CHECK-NEXT: br [[ERROR_CLEANUP_BRANCH:bb[0-9]+]]
+  // CHECK: bb9:
+    // CHECK-NEXT: br bb11
 
-  // CHECK: [[ERROR_WITH_DESTROY_BRANCH]]:
+  // CHECK: bb10:
     // CHECK-NEXT: [[MOST_DERIVED_TYPE:%.+]] = value_metatype $@thick Cat.Type, %2 : $Cat
     // CHECK-NEXT: dealloc_partial_ref %2 : $Cat, [[MOST_DERIVED_TYPE]] : $@thick Cat.Type
-    // CHECK-NEXT: br [[ERROR_CLEANUP_BRANCH]]
+    // CHECK-NEXT: br bb11
 
-  // CHECK: [[ERROR_CLEANUP_BRANCH]]:
+  // CHECK: bb11:
     // CHECK-NEXT: dealloc_stack [[SELF_BOX]] : $*Cat
     // CHECK-NEXT: [[NIL_RESULT:%.+]] = enum $Optional<Cat>, #Optional.none!enumelt
-    // CHECK-NEXT: br [[RESULT_BRANCH]]([[NIL_RESULT]] : $Optional<Cat>)
+    // CHECK-NEXT: br bb12([[NIL_RESULT]] : $Optional<Cat>)
 
-  // CHECK: [[RESULT_BRANCH]]([[RESULT:%.+]] : $Optional<Cat>):
+  // CHECK: bb12([[RESULT:%.+]] : $Optional<Cat>):
     // CHECK-NEXT: dealloc_stack [[HAS_RUN_INIT_BOX]] : $*Builtin.Int1
     // CHECK-NEXT: return [[RESULT]] : $Optional<Cat>
 

branches/tensorflow/utils/build-script-impl

@@ -3103,7 +3103,7 @@ for host in "${ALL_HOSTS[@]}"; do
                 call mkdir -p "${results_dir}"
 
                 if [[ "$using_xcodebuild" == "TRUE" ]] ; then
-                    LLDB_DOTEST_CC_OPTS="${LLDB_DOTEST_CC_OPTS} --filecheck $(build_directory $LOCAL_HOST llvm)/bin/FileCheck"
+                    LLDB_DOTEST_CC_OPTS="${LLDB_DOTEST_CC_OPTS} --filecheck $(build_directory $LOCAL_HOST llvm)/bin/FileCheck --dsymutil $(build_directory $LOCAL_HOST llvm)/bin/dsymutil"
                 fi
 
                 # Prefer to use lldb-dotest, as building it guarantees that we build all