---

yaml
---
r: 347627
b: refs/heads/master
c: 0e20141
h: refs/heads/master
i:
  347625: 951c3c5
  347623: 39f4980

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 61dc9094e6aaed44f6cc0d69f12d15da2e62acab
+refs/heads/master: 0e20141708fc2d96d3365a89e9dee93cf2905d57
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/Interpreter/bridged_casts_folding.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift | %FileCheck %s
+// RUN: %target-run-simple-swift(-Onone) | %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

trunk/test/SILOptimizer/definite_init_failable_initializers_objc.swift

@@ -1,7 +1,6 @@
 // RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module %s | %FileCheck %s
 
 // REQUIRES: objc_interop
-// REQUIRES: rdar49942212
 
 import ObjectiveC
 
@@ -98,52 +97,46 @@ class Cat : FakeNSObject {
     // CHECK-NEXT: cond_br [[COND]], bb1, bb2
 
   // CHECK: bb1:
-    // CHECK-NEXT: br bb8
-    
-  // CHECK: bb3:
-    // CHECK: br bb5
-  
-  // CHECK: bb4:
-    // CHECK: br bb5
-  
-  // CHECK: bb5
+    // CHECK-NEXT: br [[ERROR_BRANCH:bb[0-9]+]]
+      
+  // CHECK: bb{{[0-9]+}}:
     // CHECK: [[SELF_INIT:%.+]] = objc_method %2 : $Cat, #Cat.init!initializer.1.foreign : (Cat.Type) -> (Int, Bool) -> Cat?
-    // CHECK: [[NEW_OPT_SELF:%.+]] = apply [[SELF_INIT]]({{%.+}}, {{%.+}}, %2) : $@convention(objc_method) (Int, ObjCBool, @owned Cat) -> @owned Optional<Cat>
+    // CHECK: [[NEW_OPT_SELF:%.+]] = apply [[SELF_INIT]]({{%.+}}, {{%.+}}, {{%.+}}) : $@convention(objc_method) (Int, ObjCBool, @owned Cat) -> @owned Optional<Cat>
     // CHECK: [[COND:%.+]] = select_enum [[NEW_OPT_SELF]] : $Optional<Cat>
-    // CHECK-NEXT: cond_br [[COND]], bb7, bb6
+    // CHECK-NEXT: cond_br [[COND]], [[SUCCESS_BRANCH:bb[0-9]+]], [[RELEASE_THEN_ERROR_BRANCH:bb[0-9]+]]
 
-  // CHECK: bb6:
+  // CHECK: [[RELEASE_THEN_ERROR_BRANCH]]:
     // CHECK-NEXT: release_value [[NEW_OPT_SELF]]
-    // CHECK-NEXT: br bb8
+    // CHECK-NEXT: br [[ERROR_BRANCH]]
 
-  // CHECK: bb7:
+  // CHECK: [[SUCCESS_BRANCH]]:
     // 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 bb12([[RESULT]] : $Optional<Cat>)
+    // CHECK-NEXT: br [[RESULT_BRANCH:bb[0-9]+]]([[RESULT]] : $Optional<Cat>)
 
-  // CHECK: bb8:
+  // CHECK: [[ERROR_BRANCH]]:
     // CHECK-NEXT: [[COND:%.+]] = load [[HAS_RUN_INIT_BOX]] : $*Builtin.Int1
-    // CHECK-NEXT: cond_br [[COND]], bb9, bb10
+    // CHECK-NEXT: cond_br [[COND]], [[ERROR_WITHOUT_DESTROY_BRANCH:bb[0-9]+]], [[ERROR_WITH_DESTROY_BRANCH:bb[0-9]+]]
 
-  // CHECK: bb9:
-    // CHECK-NEXT: br bb11
+  // CHECK: [[ERROR_WITHOUT_DESTROY_BRANCH]]:
+    // CHECK-NEXT: br [[ERROR_CLEANUP_BRANCH:bb[0-9]+]]
 
-  // CHECK: bb10:
+  // CHECK: [[ERROR_WITH_DESTROY_BRANCH]]:
     // 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 bb11
+    // CHECK-NEXT: br [[ERROR_CLEANUP_BRANCH]]
 
-  // CHECK: bb11:
+  // CHECK: [[ERROR_CLEANUP_BRANCH]]:
     // CHECK-NEXT: dealloc_stack [[SELF_BOX]] : $*Cat
     // CHECK-NEXT: [[NIL_RESULT:%.+]] = enum $Optional<Cat>, #Optional.none!enumelt
-    // CHECK-NEXT: br bb12([[NIL_RESULT]] : $Optional<Cat>)
+    // CHECK-NEXT: br [[RESULT_BRANCH]]([[NIL_RESULT]] : $Optional<Cat>)
 
-  // CHECK: bb12([[RESULT:%.+]] : $Optional<Cat>):
+  // CHECK: [[RESULT_BRANCH]]([[RESULT:%.+]] : $Optional<Cat>):
     // CHECK-NEXT: dealloc_stack [[HAS_RUN_INIT_BOX]] : $*Builtin.Int1
     // CHECK-NEXT: return [[RESULT]] : $Optional<Cat>
 

trunk/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