Merge pull request #66645 from meg-gupta/mixinremovesmall

Simplify forwarding instruction definitions in SIL

Author: meg-gupta

include/swift/SIL/InstructionUtils.h

@@ -257,6 +257,80 @@ struct PolymorphicBuiltinSpecializedOverloadInfo {
 /// return SILValue().
 SILValue getStaticOverloadForSpecializedPolymorphicBuiltin(BuiltinInst *bi);
 
+/// An ADT for writing generic code against conversion instructions.
+struct ConversionOperation {
+  SingleValueInstruction *inst = nullptr;
+
+  ConversionOperation() = default;
+
+  explicit ConversionOperation(SILInstruction *inst) {
+    auto *svi = dyn_cast<SingleValueInstruction>(inst);
+    if (!svi) {
+      return;
+    }
+    if (!ConversionOperation::isa(svi)) {
+      return;
+    }
+    this->inst = svi;
+  }
+
+  explicit ConversionOperation(SILValue value) {
+    auto *inst = value->getDefiningInstruction();
+    if (!inst) {
+      return;
+    }
+    auto *svi = dyn_cast<SingleValueInstruction>(inst);
+    if (!svi) {
+      return;
+    }
+    if (!ConversionOperation::isa(svi)) {
+      return;
+    }
+    this->inst = svi;
+  }
+
+  operator bool() const { return inst != nullptr; }
+
+  SingleValueInstruction *operator->() { return inst; }
+  SingleValueInstruction *operator->() const { return inst; }
+  SingleValueInstruction *operator*() { return inst; }
+  SingleValueInstruction *operator*() const { return inst; }
+
+  static bool isa(SILInstruction *inst) {
+    switch (inst->getKind()) {
+    case SILInstructionKind::ConvertFunctionInst:
+    case SILInstructionKind::UpcastInst:
+    case SILInstructionKind::AddressToPointerInst:
+    case SILInstructionKind::UncheckedTrivialBitCastInst:
+    case SILInstructionKind::UncheckedAddrCastInst:
+    case SILInstructionKind::UncheckedBitwiseCastInst:
+    case SILInstructionKind::RefToRawPointerInst:
+    case SILInstructionKind::RawPointerToRefInst:
+    case SILInstructionKind::ConvertEscapeToNoEscapeInst:
+    case SILInstructionKind::RefToBridgeObjectInst:
+    case SILInstructionKind::BridgeObjectToRefInst:
+    case SILInstructionKind::BridgeObjectToWordInst:
+    case SILInstructionKind::ThinToThickFunctionInst:
+    case SILInstructionKind::ThickToObjCMetatypeInst:
+    case SILInstructionKind::ObjCToThickMetatypeInst:
+    case SILInstructionKind::ObjCMetatypeToObjectInst:
+    case SILInstructionKind::ObjCExistentialMetatypeToObjectInst:
+    case SILInstructionKind::UnconditionalCheckedCastInst:
+    case SILInstructionKind::UncheckedRefCastInst:
+    case SILInstructionKind::UncheckedValueCastInst:
+    case SILInstructionKind::RefToUnmanagedInst:
+    case SILInstructionKind::RefToUnownedInst:
+    case SILInstructionKind::UnmanagedToRefInst:
+    case SILInstructionKind::UnownedToRefInst:
+      return true;
+    default:
+      return false;
+    }
+  }
+
+  SILValue getConverted() { return inst->getOperand(0); }
+};
+
 } // end namespace swift
 
 #endif

include/swift/SIL/OwnershipUseVisitor.h

@@ -296,7 +296,7 @@ bool OwnershipUseVisitor<Impl>::visitInnerBorrowScopeEnd(Operand *borrowEnd) {
     // TODO: When we have ForwardingInstruction abstraction, walk the use-def
     // chain to ensure we have a partial_apply [on_stack] def.
     assert(pai && pai->isOnStack() ||
-           OwnershipForwardingMixin::get(
+           ForwardingInstruction::get(
                cast<SingleValueInstruction>(borrowEnd->get())));
     return handleUsePoint(borrowEnd, UseLifetimeConstraint::NonLifetimeEnding);
   }

include/swift/SIL/OwnershipUtils.h

@@ -219,7 +219,7 @@ class ForwardingOperand {
   }
 
   bool preservesOwnership() const {
-    auto &mixin = *OwnershipForwardingMixin::get(use->getUser());
+    auto &mixin = *ForwardingInstruction::get(use->getUser());
     return mixin.preservesOwnership();
   }
 

include/swift/SIL/SILCloner.h

@@ -1693,7 +1693,7 @@ visitRefToBridgeObjectInst(RefToBridgeObjectInst *Inst) {
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   recordClonedInstruction(
       Inst, getBuilder().createRefToBridgeObject(
-                getOpLocation(Inst->getLoc()), getOpValue(Inst->getConverted()),
+                getOpLocation(Inst->getLoc()), getOpValue(Inst->getOperand(0)),
                 getOpValue(Inst->getBitsOperand()),
                 getBuilder().hasOwnership()
                     ? Inst->getForwardingOwnershipKind()
@@ -1707,7 +1707,7 @@ visitBridgeObjectToRefInst(BridgeObjectToRefInst *Inst) {
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   recordClonedInstruction(
       Inst, getBuilder().createBridgeObjectToRef(
-                getOpLocation(Inst->getLoc()), getOpValue(Inst->getConverted()),
+                getOpLocation(Inst->getLoc()), getOpValue(Inst->getOperand()),
                 getOpType(Inst->getType()),
                 getBuilder().hasOwnership()
                     ? Inst->getForwardingOwnershipKind()
@@ -1721,7 +1721,7 @@ visitBridgeObjectToWordInst(BridgeObjectToWordInst *Inst) {
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   recordClonedInstruction(Inst, getBuilder().createBridgeObjectToWord(
                                     getOpLocation(Inst->getLoc()),
-                                    getOpValue(Inst->getConverted()),
+                                    getOpValue(Inst->getOperand()),
                                     getOpType(Inst->getType())));
 }