Merge pull request #7829 from gottesmm/checked_cast_br_1

Author: swift-ci

lib/SIL/SILOwnershipVerifier.cpp

@@ -1786,6 +1786,12 @@ void SILInstruction::verifyOperandOwnership() const {
   // If SILOwnership is not enabled, do not perform verification.
   if (!getModule().getOptions().EnableSILOwnership)
     return;
+
+  // If the given function has unqualified ownership, there is nothing to
+  // verify.
+  if (getFunction()->hasUnqualifiedOwnership())
+    return;
+
   // If we are testing the verifier, bail so we only print errors once when
   // performing a full verification, instead of additionally in the SILBuilder.
   if (IsSILOwnershipVerifierTestingEnabled)
@@ -1809,6 +1815,21 @@ void SILInstruction::verifyOperandOwnership() const {
 void SILValue::verifyOwnership(SILModule &Mod,
                                TransitivelyUnreachableBlocksInfo *TUB) const {
 #ifndef NDEBUG
+  // If we are SILUndef, just bail. SILUndef can pair with anything. Any uses of
+  // the SILUndef will make sure that the matching checks out.
+  if (isa<SILUndef>(*this))
+    return;
+
+  // Since we do not have SILUndef, we now know that getFunction() should return
+  // a real function. Assert in case this assumption is no longer true.
+  SILFunction *F = (*this)->getFunction();
+  assert(F && "Instructions and arguments should have a function");
+
+  // If the given function has unqualified ownership, there is nothing further
+  // to verify.
+  if (F->hasUnqualifiedOwnership())
+    return;
+
   if (TUB) {
     SILValueOwnershipChecker(Mod, *TUB, *this).check();
   } else {

lib/SIL/SILVerifier.cpp

@@ -2564,8 +2564,20 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
                 CBI->getCastType(),
             "success dest block argument of checked_cast_br must match type of "
             "cast");
-    require(CBI->getFailureBB()->args_empty(),
-            "failure dest of checked_cast_br must take no arguments");
+    require(F.hasQualifiedOwnership() || CBI->getFailureBB()->args_empty(),
+            "failure dest of checked_cast_br in unqualified ownership sil must "
+            "take no arguments");
+#if 0
+    require(F.hasUnqualifiedOwnership() ||
+                CBI->getFailureBB()->args_size() == 1,
+            "failure dest of checked_cast_br must take one argument in "
+            "ownership qualified sil");
+    require(F.hasUnqualifiedOwnership() ||
+                CBI->getFailureBB()->args_begin()[0]->getType() ==
+                    CBI->getOperand()->getType(),
+            "failure dest block argument must match type of original type in "
+            "ownership qualified sil");
+#endif
   }
 
   void checkCheckedCastAddrBranchInst(CheckedCastAddrBranchInst *CCABI) {

lib/SILGen/SILGenBuilder.cpp

@@ -489,3 +489,25 @@ ManagedValue SILGenBuilder::createEnum(SILLocation loc, ManagedValue payload,
   return gen.emitManagedRValueWithCleanup(result);
 }
 
+ManagedValue SILGenBuilder::createUnconditionalCheckedCastOpaque(
+    SILLocation loc, ManagedValue operand, SILType type) {
+  SILValue result = SILBuilder::createUnconditionalCheckedCastOpaque(
+      loc, operand.forward(gen), type);
+  return gen.emitManagedRValueWithCleanup(result);
+}
+
+ManagedValue SILGenBuilder::createUnconditionalCheckedCast(SILLocation loc,
+                                                           ManagedValue operand,
+                                                           SILType type) {
+  SILValue result = SILBuilder::createUnconditionalCheckedCast(
+      loc, operand.forward(gen), type);
+  return gen.emitManagedRValueWithCleanup(result);
+}
+
+void SILGenBuilder::createCheckedCastBranch(SILLocation loc, bool isExact,
+                                            ManagedValue operand, SILType type,
+                                            SILBasicBlock *trueBlock,
+                                            SILBasicBlock *falseBlock) {
+  SILBuilder::createCheckedCastBranch(loc, isExact, operand.forward(gen), type,
+                                      trueBlock, falseBlock);
+}

lib/SILGen/SILGenBuilder.h

@@ -211,6 +211,21 @@ class SILGenBuilder : public SILBuilder {
   ManagedValue formalAccessBufferForExpr(
       SILLocation loc, SILType ty, const TypeLowering &lowering,
       SGFContext context, std::function<void(SILValue)> rvalueEmitter);
+
+  using SILBuilder::createUnconditionalCheckedCastOpaque;
+  ManagedValue createUnconditionalCheckedCastOpaque(SILLocation loc,
+                                                    ManagedValue operand,
+                                                    SILType type);
+  using SILBuilder::createUnconditionalCheckedCast;
+  ManagedValue createUnconditionalCheckedCast(SILLocation loc,
+                                              ManagedValue operand,
+                                              SILType type);
+
+  using SILBuilder::createCheckedCastBranch;
+  void createCheckedCastBranch(SILLocation loc, bool isExact,
+                               ManagedValue operand, SILType type,
+                               SILBasicBlock *trueBlock,
+                               SILBasicBlock *falseBlock);
 };
 
 } // namespace Lowering