---

yaml
---
r: 347066
b: refs/heads/master
c: 3dd0ede
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 852c245b64c4039b68c0d0f34d1c1bff67673205
+refs/heads/master: 3dd0ede2176b187d2a47ddbe2523bcc02c9e5e13
 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

@@ -32,6 +32,7 @@ class SILLocation;
 class SILModule;
 class SILType;
 enum class CastConsumptionKind : unsigned char;
+struct SILDynamicCastInst;
 
 enum class DynamicCastFeasibility {
   /// The cast will always succeed.
@@ -74,6 +75,9 @@ bool emitSuccessfulIndirectUnconditionalCast(
     SILValue dest, CanType targetType,
     SILInstruction *existingCast = nullptr);
 
+bool emitSuccessfulIndirectUnconditionalCast(SILBuilder &B, SILLocation loc,
+                                             SILDynamicCastInst dynamicCast);
+
 /// Can the given cast be performed by the scalar checked-cast
 /// instructions, or does we need to use the indirect instructions?
 bool canUseScalarCheckedCastInstructions(SILModule &M,
@@ -173,6 +177,20 @@ struct SILDynamicCastInst {
 
   SILInstruction *getInstruction() const { return inst; }
 
+  CastConsumptionKind getBridgedConsumptionKind() const {
+    switch (getKind()) {
+    case SILDynamicCastKind::CheckedCastAddrBranchInst:
+    case SILDynamicCastKind::CheckedCastBranchInst:
+    case SILDynamicCastKind::CheckedCastValueBranchInst:
+      llvm_unreachable("unsupported");
+    case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      return CastConsumptionKind::TakeAlways;
+    case SILDynamicCastKind::UnconditionalCheckedCastInst:
+    case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
+      llvm_unreachable("unsupported");
+    }
+  }
+
   CastConsumptionKind getConsumptionKind() const {
     switch (getKind()) {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
@@ -181,7 +199,7 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
-      llvm_unreachable("unsupported query");
+      llvm_unreachable("unsupported");
     }
   }
 
@@ -190,10 +208,12 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
+      llvm_unreachable("unsupported");
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      return nullptr;
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
-      llvm_unreachable("Unsupported query");
+      llvm_unreachable("unsupported");
     }
   }
 
@@ -206,10 +226,12 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
+      llvm_unreachable("unsupported");
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      return nullptr;
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
-      llvm_unreachable("Unsupported query");
+      llvm_unreachable("unsupported");
     }
   }
 
@@ -222,7 +244,9 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
+      llvm_unreachable("unsupported");
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      return cast<UnconditionalCheckedCastAddrInst>(inst)->getSrc();
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
       llvm_unreachable("unsupported");
@@ -235,7 +259,9 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
+      llvm_unreachable("unsupported");
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      return cast<UnconditionalCheckedCastAddrInst>(inst)->getDest();
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
       llvm_unreachable("unimplemented");
@@ -247,7 +273,9 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
+      llvm_unreachable("unsupported");
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      return cast<UnconditionalCheckedCastAddrInst>(inst)->getSourceType();
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
       llvm_unreachable("unsupported");
@@ -259,7 +287,11 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-    case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      llvm_unreachable("unsupported");
+    case SILDynamicCastKind::UnconditionalCheckedCastAddrInst: {
+      auto *uccai = cast<UnconditionalCheckedCastAddrInst>(inst);
+      return uccai->getSrc()->getType();
+    }
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
       llvm_unreachable("unsupported");
@@ -271,7 +303,9 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
+      llvm_unreachable("unsupported");
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      return cast<UnconditionalCheckedCastAddrInst>(inst)->getTargetType();
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
       llvm_unreachable("unimplemented");
@@ -283,7 +317,11 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
-    case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      llvm_unreachable("unsupported");
+    case SILDynamicCastKind::UnconditionalCheckedCastAddrInst: {
+      auto *uccai = dyn_cast<UnconditionalCheckedCastAddrInst>(inst);
+      return uccai->getDest()->getType();
+    }
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
       llvm_unreachable("unsupported");
@@ -295,7 +333,9 @@ struct SILDynamicCastInst {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
+      llvm_unreachable("unsupported");
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      return isa<MetatypeInst>(getSource());
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
       llvm_unreachable("unsupported");
@@ -305,11 +345,12 @@ struct SILDynamicCastInst {
   SILLocation getLocation() const { return inst->getLoc(); }
 
   SILModule &getModule() const { return inst->getModule(); }
+  SILFunction *getFunction() const { return inst->getFunction(); }
 
-  DynamicCastFeasibility classifyDynamicCast() const {
+  DynamicCastFeasibility classifyFeasibility(bool allowWholeModule) const {
     return swift::classifyDynamicCast(
         getModule().getSwiftModule(), getSourceType(), getTargetType(),
-        isSourceTypeExact(), getModule().isWholeModule());
+        isSourceTypeExact(), allowWholeModule && getModule().isWholeModule());
   }
 
   bool isBridgingCast() const {
@@ -320,12 +361,14 @@ struct SILDynamicCastInst {
     return TargetIsBridgeable != SourceIsBridgeable;
   }
 
-  bool isConditionalCast() const {
+  bool isConditional() const {
     switch (getKind()) {
     case SILDynamicCastKind::CheckedCastAddrBranchInst:
     case SILDynamicCastKind::CheckedCastBranchInst:
     case SILDynamicCastKind::CheckedCastValueBranchInst:
+      llvm_unreachable("unsupported");
     case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
+      return false;
     case SILDynamicCastKind::UnconditionalCheckedCastInst:
     case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
       llvm_unreachable("unsupported");

trunk/lib/SIL/DynamicCasts.cpp

@@ -1069,6 +1069,14 @@ swift::emitSuccessfulScalarUnconditionalCast(SILBuilder &B, ModuleDecl *M,
   return result.Value;
 }
 
+bool swift::emitSuccessfulIndirectUnconditionalCast(
+    SILBuilder &B, SILLocation loc, SILDynamicCastInst dynamicCast) {
+  return emitSuccessfulIndirectUnconditionalCast(
+      B, B.getModule().getSwiftModule(), loc, dynamicCast.getSource(),
+      dynamicCast.getSourceType(), dynamicCast.getDest(),
+      dynamicCast.getTargetType(), dynamicCast.getInstruction());
+}
+
 bool swift::emitSuccessfulIndirectUnconditionalCast(
     SILBuilder &B, ModuleDecl *M, SILLocation loc, SILValue src,
     CanType sourceType, SILValue dest, CanType targetType,

trunk/lib/SILOptimizer/Utils/CastOptimizer.cpp

@@ -610,15 +610,11 @@ SILInstruction *CastOptimizer::optimizeBridgedSwiftToObjCCast(
 }
 
 SILInstruction *CastOptimizer::optimizeBridgedCasts(SILDynamicCastInst cast) {
-  switch (cast.getKind()) {
-  case SILDynamicCastKind::CheckedCastAddrBranchInst:
-  case SILDynamicCastKind::CheckedCastBranchInst:
-  case SILDynamicCastKind::CheckedCastValueBranchInst:
-  case SILDynamicCastKind::UnconditionalCheckedCastAddrInst:
-  case SILDynamicCastKind::UnconditionalCheckedCastInst:
-  case SILDynamicCastKind::UnconditionalCheckedCastValueInst:
-    llvm_unreachable("unsupported");
-  }
+  return optimizeBridgedCasts(
+      cast.getInstruction(), cast.getBridgedConsumptionKind(),
+      cast.isConditional(), cast.getSource(), cast.getDest(),
+      cast.getSourceType(), cast.getTargetType(), cast.getSuccessBlock(),
+      cast.getFailureBlock());
 }
 
 /// Make use of the fact that some of these casts cannot fail.
@@ -1477,24 +1473,17 @@ static bool optimizeStaticallyKnownProtocolConformance(
 
 SILInstruction *CastOptimizer::optimizeUnconditionalCheckedCastAddrInst(
     UnconditionalCheckedCastAddrInst *Inst) {
-  auto Loc = Inst->getLoc();
-  auto Src = Inst->getSrc();
-  auto Dest = Inst->getDest();
-  auto SourceType = Inst->getSourceType();
-  auto TargetType = Inst->getTargetType();
-  auto &Mod = Inst->getModule();
-  auto *F = Inst->getFunction();
-
-  bool isSourceTypeExact = isa<MetatypeInst>(Src);
+  SILDynamicCastInst dynamicCast(Inst);
+  auto Loc = dynamicCast.getLocation();
 
   // Check if we can statically predict the outcome of the cast.
-  auto Feasibility = classifyDynamicCast(Mod.getSwiftModule(), SourceType,
-                                         TargetType, isSourceTypeExact);
+  auto Feasibility =
+      dynamicCast.classifyFeasibility(false /*allow whole module*/);
 
   if (Feasibility == DynamicCastFeasibility::MaySucceed) {
     // Forced bridged casts can be still simplified here.
     // If they fail, they fail inside the conversion function.
-    if (!isBridgingCast(SourceType, TargetType))
+    if (!dynamicCast.isBridgingCast())
       return nullptr;
   }
 
@@ -1504,12 +1493,12 @@ SILInstruction *CastOptimizer::optimizeUnconditionalCheckedCastAddrInst(
     SILBuilderWithScope Builder(Inst, BuilderContext);
     // mem2reg's invariants get unhappy if we don't try to
     // initialize a loadable result.
-    auto DestType = Dest->getType();
-    auto &resultTL = F->getTypeLowering(DestType);
-    if (!resultTL.isAddressOnly()) {
+    if (!dynamicCast.getLoweredTargetType().isAddressOnly(
+            Builder.getModule())) {
       auto undef = SILValue(
-          SILUndef::get(DestType.getObjectType(), Builder.getModule()));
-      Builder.emitStoreValueOperation(Loc, undef, Dest,
+          SILUndef::get(dynamicCast.getLoweredTargetType().getObjectType(),
+                        Builder.getModule()));
+      Builder.emitStoreValueOperation(Loc, undef, dynamicCast.getDest(),
                                       StoreOwnershipQualifier::Init);
     }
     auto *TrapI = Builder.createBuiltinTrap(Loc);
@@ -1531,10 +1520,11 @@ SILInstruction *CastOptimizer::optimizeUnconditionalCheckedCastAddrInst(
     // Check if a result of a cast is unused. If this is the case, the cast can
     // be removed even if the cast may fail at runtime.
     // Swift optimizer does not claim to be crash-preserving.
-    bool ResultNotUsed = isa<AllocStackInst>(Dest);
+    SILValue dest = dynamicCast.getDest();
+    bool ResultNotUsed = isa<AllocStackInst>(dest);
     DestroyAddrInst *DestroyDestInst = nullptr;
     if (ResultNotUsed) {
-      for (auto Use : Dest->getUses()) {
+      for (auto Use : dest->getUses()) {
         auto *User = Use->getUser();
         if (isa<DeallocStackInst>(User) || User == Inst)
           continue;
@@ -1550,7 +1540,7 @@ SILInstruction *CastOptimizer::optimizeUnconditionalCheckedCastAddrInst(
 
     if (ResultNotUsed) {
       SILBuilderWithScope B(Inst, BuilderContext);
-      B.createDestroyAddr(Inst->getLoc(), Inst->getSrc());
+      B.createDestroyAddr(Loc, dynamicCast.getSource());
       if (DestroyDestInst)
         EraseInstAction(DestroyDestInst);
       EraseInstAction(Inst);
@@ -1559,9 +1549,7 @@ SILInstruction *CastOptimizer::optimizeUnconditionalCheckedCastAddrInst(
     }
 
     // Try to apply the bridged casts optimizations.
-    auto NewI =
-        optimizeBridgedCasts(Inst, CastConsumptionKind::TakeAlways, false, Src,
-                             Dest, SourceType, TargetType, nullptr, nullptr);
+    auto NewI = optimizeBridgedCasts(dynamicCast);
     if (NewI) {
       WillSucceedAction();
       return nullptr;
@@ -1578,13 +1566,11 @@ SILInstruction *CastOptimizer::optimizeUnconditionalCheckedCastAddrInst(
       return nullptr;
     }
 
-    if (isBridgingCast(SourceType, TargetType))
+    if (dynamicCast.isBridgingCast())
       return nullptr;
 
     SILBuilderWithScope Builder(Inst, BuilderContext);
-    if (!emitSuccessfulIndirectUnconditionalCast(Builder, Mod.getSwiftModule(),
-                                                 Loc, Src, SourceType, Dest,
-                                                 TargetType, Inst)) {
+    if (!emitSuccessfulIndirectUnconditionalCast(Builder, Loc, dynamicCast)) {
       // No optimization was possible.
       return nullptr;
     }