---

yaml
---
r: 347069
b: refs/heads/master
c: 4929212
h: refs/heads/master
i:
  347067: 88a69e7

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 203928b8086b4a1750387d33751976e4a87b6419
+refs/heads/master: 49292128e34a2ea6f53b39788b1691a852fe42df
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/SIL/DynamicCasts.h

@@ -183,9 +183,13 @@ struct SILDynamicCastInst {
   CastConsumptionKind getBridgedConsumptionKind() const {
     switch (getKind()) {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
+      return cast<CheckedCastAddrBranchInst>(inst)->getConsumptionKind();
+    // TODO: Bridged casts cannot be expressed by checked_cast_br or
+    // checked_cast_value_br yet. Should we ever support it, please
+    // review this code.
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-      llvm_unreachable("unsupported");
+      return CastConsumptionKind::CopyOnSuccess;
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
       return CastConsumptionKind::TakeAlways;
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
@@ -210,11 +214,11 @@ struct SILDynamicCastInst {
   SILBasicBlock *getSuccessBlock() {
     switch (getKind()) {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
-      llvm_unreachable("unsupported");
+      return cast<CheckedCastAddrBranchInst>(inst)->getSuccessBB();
     case SILDynamicCastKind::CheckedCastBranchInst:
       return cast<CheckedCastBranchInst>(inst)->getSuccessBB();
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-      llvm_unreachable("unsupported");
+      return cast<CheckedCastValueBranchInst>(inst)->getSuccessBB();
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
       return nullptr;
@@ -246,11 +250,11 @@ struct SILDynamicCastInst {
   SILBasicBlock *getFailureBlock() {
     switch (getKind()) {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
-      llvm_unreachable("unsupported");
+      return cast<CheckedCastAddrBranchInst>(inst)->getFailureBB();
     case SILDynamicCastKind::CheckedCastBranchInst:
       return cast<CheckedCastBranchInst>(inst)->getFailureBB();
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-      llvm_unreachable("unsupported");
+      return cast<CheckedCastValueBranchInst>(inst)->getFailureBB();
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
       return nullptr;
@@ -282,11 +286,11 @@ struct SILDynamicCastInst {
   SILValue getSource() const {
     switch (getKind()) {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
-      llvm_unreachable("unsupported");
+      return cast<CheckedCastAddrBranchInst>(inst)->getSrc();
     case SILDynamicCastKind::CheckedCastBranchInst:
       return cast<CheckedCastBranchInst>(inst)->getOperand();
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-      llvm_unreachable("unsupported");
+      return cast<CheckedCastValueBranchInst>(inst)->getOperand();
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
       return cast<UnconditionalCheckedCastAddrInst>(inst)->getSrc();
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
@@ -300,9 +304,11 @@ struct SILDynamicCastInst {
   SILValue getDest() const {
     switch (getKind()) {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
+      return cast<CheckedCastAddrBranchInst>(inst)->getDest();
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-      llvm_unreachable("unsupported");
+      // TODO: Shouldn't this return getSuccessBlock()->getArgument(0)?
+      return SILValue();
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
       return cast<UnconditionalCheckedCastAddrInst>(inst)->getDest();
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
@@ -318,9 +324,11 @@ struct SILDynamicCastInst {
   CanType getSourceType() const {
     switch (getKind()) {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
+      return cast<CheckedCastAddrBranchInst>(inst)->getSourceType();
     case SILDynamicCastKind::CheckedCastBranchInst:
+      return cast<CheckedCastBranchInst>(inst)->getSourceType();
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-      llvm_unreachable("unsupported");
+      return cast<CheckedCastValueBranchInst>(inst)->getSourceType();
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
       return cast<UnconditionalCheckedCastAddrInst>(inst)->getSourceType();
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
@@ -350,9 +358,11 @@ struct SILDynamicCastInst {
   CanType getTargetType() const {
     switch (getKind()) {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
+      return cast<CheckedCastAddrBranchInst>(inst)->getTargetType();
     case SILDynamicCastKind::CheckedCastBranchInst:
+      return cast<CheckedCastBranchInst>(inst)->getTargetType();
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-      llvm_unreachable("unsupported");
+      return cast<CheckedCastValueBranchInst>(inst)->getTargetType();
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
       return cast<UnconditionalCheckedCastAddrInst>(inst)->getTargetType();
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
@@ -369,7 +379,7 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::CheckedCastBranchInst:
       return cast<CheckedCastBranchInst>(inst)->getCastType();
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-      llvm_unreachable("unsupported");
+      return cast<CheckedCastValueBranchInst>(inst)->getCastType();
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst: {
       auto *uccai = dyn_cast<UnconditionalCheckedCastAddrInst>(inst);
       return uccai->getDest()->getType();
@@ -384,10 +394,9 @@ struct SILDynamicCastInst {
 
   bool isSourceTypeExact() const {
     switch (getKind()) {
-    case SILDynamicCastKind::CheckedCastAddrBranchInst:
-    case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-      llvm_unreachable("unsupported");
+    case SILDynamicCastKind::CheckedCastBranchInst:
+    case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
       return isa<MetatypeInst>(getSource());
@@ -417,17 +426,30 @@ struct SILDynamicCastInst {
 
   bool isConditional() const {
     switch (getKind()) {
-    case SILDynamicCastKind::CheckedCastAddrBranchInst:
-    case SILDynamicCastKind::CheckedCastBranchInst:
-    case SILDynamicCastKind::CheckedCastValueBranchInst:
-      llvm_unreachable("unsupported");
+    case SILDynamicCastKind::CheckedCastAddrBranchInst: {
+      auto f = classifyFeasibility(true /*allow wmo*/);
+      return f == DynamicCastFeasibility::MaySucceed;
+    }
+    case SILDynamicCastKind::CheckedCastBranchInst: {
+      auto f = classifyFeasibility(false /*allow wmo*/);
+      return f == DynamicCastFeasibility::MaySucceed;
+    }
+    case SILDynamicCastKind::CheckedCastValueBranchInst: {
+      auto f = classifyFeasibility(false /*allow wmo opts*/);
+      return f == DynamicCastFeasibility::MaySucceed;
+    }
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
       return false;
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
       llvm_unreachable("unsupported");
     }
   }
+
+  bool canUseScalarCheckedCastInstructions() const {
+    return swift::canUseScalarCheckedCastInstructions(
+        getModule(), getSourceType(), getTargetType());
+  }
 };
 
 } // end namespace swift

trunk/include/swift/SILOptimizer/Utils/CastOptimizer.h

@@ -147,13 +147,6 @@ class CastOptimizer {
   /// Check if it is a bridged cast and optimize it.
   ///
   /// May change the control flow.
-  SILInstruction *optimizeBridgedCasts(SILInstruction *Inst,
-                                       CastConsumptionKind ConsumptionKind,
-                                       bool isConditional, SILValue Src,
-                                       SILValue Dest, CanType Source,
-                                       CanType Target, SILBasicBlock *SuccessBB,
-                                       SILBasicBlock *FailureBB);
-
   SILInstruction *optimizeBridgedCasts(SILDynamicCastInst cast);
 
   SILValue optimizeMetatypeConversion(ConversionInst *mci,