libswift: add more instruction classes

And add `UnaryInstruction` which adds a property `operand` to all unary instructions.
This replaces the existing single-operand properties, which simplifies the code.

Author: eeckstein

include/swift/SIL/SILNodes.def

@@ -497,11 +497,11 @@ ABSTRACT_VALUE_AND_INST(SingleValueInstruction, ValueBase, SILInstruction)
   ABSTRACT_SINGLE_VALUE_INST(ConversionInst, SingleValueInstruction)
     BRIDGED_SINGLE_VALUE_INST(UpcastInst, upcast,
                       ConversionInst, None, DoesNotRelease)
-    SINGLE_VALUE_INST(AddressToPointerInst, address_to_pointer,
+    BRIDGED_SINGLE_VALUE_INST(AddressToPointerInst, address_to_pointer,
                       ConversionInst, None, DoesNotRelease)
     SINGLE_VALUE_INST(PointerToAddressInst, pointer_to_address,
                       ConversionInst, None, DoesNotRelease)
-    SINGLE_VALUE_INST(UncheckedRefCastInst, unchecked_ref_cast,
+    BRIDGED_SINGLE_VALUE_INST(UncheckedRefCastInst, unchecked_ref_cast,
                       ConversionInst, None, DoesNotRelease)
     SINGLE_VALUE_INST(UncheckedAddrCastInst, unchecked_addr_cast,
                       ConversionInst, None, DoesNotRelease)
@@ -513,15 +513,15 @@ ABSTRACT_VALUE_AND_INST(SingleValueInstruction, ValueBase, SILInstruction)
                       ConversionInst, None, DoesNotRelease)
     SINGLE_VALUE_INST(RefToRawPointerInst, ref_to_raw_pointer,
                       ConversionInst, None, DoesNotRelease)
-    SINGLE_VALUE_INST(RawPointerToRefInst, raw_pointer_to_ref,
+    BRIDGED_SINGLE_VALUE_INST(RawPointerToRefInst, raw_pointer_to_ref,
                       ConversionInst, None, DoesNotRelease)
 #define LOADABLE_REF_STORAGE(Name, name, ...) \
     SINGLE_VALUE_INST(RefTo##Name##Inst, ref_to_##name, \
                       ConversionInst, None, DoesNotRelease) \
     SINGLE_VALUE_INST(Name##ToRefInst, name##_to_ref, \
                       ConversionInst, None, DoesNotRelease)
 #include "swift/AST/ReferenceStorage.def"
-    SINGLE_VALUE_INST(ConvertFunctionInst, convert_function,
+    BRIDGED_SINGLE_VALUE_INST(ConvertFunctionInst, convert_function,
                       ConversionInst, None, DoesNotRelease)
     SINGLE_VALUE_INST(ConvertEscapeToNoEscapeInst, convert_escape_to_noescape,
                       ConversionInst, None, DoesNotRelease)
@@ -535,15 +535,15 @@ ABSTRACT_VALUE_AND_INST(SingleValueInstruction, ValueBase, SILInstruction)
                       ConversionInst, None, DoesNotRelease)
     SINGLE_VALUE_INST(BridgeObjectToWordInst, bridge_object_to_word,
                       ConversionInst, None, DoesNotRelease)
-    SINGLE_VALUE_INST(ThinToThickFunctionInst, thin_to_thick_function,
+    BRIDGED_SINGLE_VALUE_INST(ThinToThickFunctionInst, thin_to_thick_function,
                       ConversionInst, None, DoesNotRelease)
     SINGLE_VALUE_INST(ThickToObjCMetatypeInst, thick_to_objc_metatype,
                       ConversionInst, None, DoesNotRelease)
     SINGLE_VALUE_INST(ObjCToThickMetatypeInst, objc_to_thick_metatype,
                       ConversionInst, None, DoesNotRelease)
-    SINGLE_VALUE_INST(ObjCMetatypeToObjectInst, objc_metatype_to_object,
+    BRIDGED_SINGLE_VALUE_INST(ObjCMetatypeToObjectInst, objc_metatype_to_object,
                       ConversionInst, None, DoesNotRelease)
-    SINGLE_VALUE_INST(ObjCExistentialMetatypeToObjectInst, objc_existential_metatype_to_object,
+    BRIDGED_SINGLE_VALUE_INST(ObjCExistentialMetatypeToObjectInst, objc_existential_metatype_to_object,
                       ConversionInst, None, DoesNotRelease)
     // unconditional_checked_cast_value reads the source value and produces
     // a new value with a potentially different representation.
@@ -566,7 +566,7 @@ ABSTRACT_VALUE_AND_INST(SingleValueInstruction, ValueBase, SILInstruction)
 
   BRIDGED_SINGLE_VALUE_INST(ClassifyBridgeObjectInst, classify_bridge_object,
                     SingleValueInstruction, None, DoesNotRelease)
-  SINGLE_VALUE_INST(ValueToBridgeObjectInst, value_to_bridge_object,
+  BRIDGED_SINGLE_VALUE_INST(ValueToBridgeObjectInst, value_to_bridge_object,
                     SingleValueInstruction, None, DoesNotRelease)
   SINGLE_VALUE_INST(MarkDependenceInst, mark_dependence,
                     SingleValueInstruction, None, DoesNotRelease)

libswift/Sources/Optimizer/FunctionPasses/MergeCondFails.swift

@@ -17,8 +17,8 @@ let mergeCondFailsPass = FunctionPass(name: "merge-cond_fails", runMergeCondFail
 /// Return true if the operand of the cond_fail instruction looks like
 /// the overflow bit of an arithmetic instruction.
 private func hasOverflowConditionOperand(_ cfi: CondFailInst) -> Bool {
-  if let tei = cfi.condition as? TupleExtractInst {
-    return tei.tuple is BuiltinInst
+  if let tei = cfi.operand as? TupleExtractInst {
+    return tei.operand is BuiltinInst
   }
   return false
 }
@@ -73,10 +73,10 @@ private func mergeCondFails(_ condFailToMerge: inout StackList<CondFailInst>,
       mergedCond = builder.createBuiltinBinaryFunction(name: "or",
                                         operandType: prevCond.type,
                                         resultType: prevCond.type,
-                                        arguments: [prevCond, cfi.condition])
+                                        arguments: [prevCond, cfi.operand])
       didMerge = true
     } else {
-      mergedCond = cfi.condition
+      mergedCond = cfi.operand
     }
   }
   if !didMerge {

libswift/Sources/SIL/Instruction.swift

@@ -160,6 +160,16 @@ public class MultipleValueInstruction : Instruction {
   }
 }
 
+/// Instructions, which have a single operand.
+public protocol UnaryInstruction : AnyObject {
+  var operands: OperandArray { get }
+  var operand: Value { get }
+}
+
+extension UnaryInstruction {
+  public var operand: Value { operands[0].value }
+}
+
 //===----------------------------------------------------------------------===//
 //                             no-value instructions
 //===----------------------------------------------------------------------===//
@@ -183,57 +193,41 @@ final public class CopyAddrInst : Instruction {
   public var destination: Value { return destinationOperand.value }
 }
 
-final public class EndAccessInst : Instruction {
+final public class EndAccessInst : Instruction, UnaryInstruction {
   public var beginAccess: BeginAccessInst {
-    return operands[0].value as! BeginAccessInst
+    return operand as! BeginAccessInst
   }
 }
 
-final public class EndBorrowInst : Instruction {
-  public var borrowedValue: Value { return operands[0].value }
-}
+final public class EndBorrowInst : Instruction, UnaryInstruction {}
 
-final public class DeallocStackInst : Instruction {
+final public class DeallocStackInst : Instruction, UnaryInstruction {
   public var allocstack: AllocStackInst {
-    return operands[0].value as! AllocStackInst
+    return operand as! AllocStackInst
   }
 }
 
-final public class CondFailInst : Instruction {
-  public var condition: Value { operands[0].value }
-  
+final public class CondFailInst : Instruction, UnaryInstruction {
   public override var mayTrap: Bool { true }
 
   public var message: String { CondFailInst_getMessage(bridged).string }
 }
 
-final public class FixLifetimeInst : Instruction {
-  public var value: Value { operands[0].value }
-}
+final public class FixLifetimeInst : Instruction, UnaryInstruction {}
 
-final public class DebugValueInst : Instruction {
-  public var value: Value { operands[0].value }
-}
+final public class DebugValueInst : Instruction, UnaryInstruction {}
 
-final public class DebugValueAddrInst : Instruction {
-  public var address: Value { operands[0].value }
-}
+final public class DebugValueAddrInst : Instruction, UnaryInstruction {}
 
 final public class UnconditionalCheckedCastAddrInst : Instruction {
   public override var mayTrap: Bool { true }
 }
 
-final public class SetDeallocatingInst : Instruction {
-  public var reference: Value { operands[0].value }
-}
+final public class SetDeallocatingInst : Instruction, UnaryInstruction {}
 
-final public class DeallocRefInst : Instruction {
-  public var reference: Value { operands[0].value }
-}
+final public class DeallocRefInst : Instruction, UnaryInstruction {}
 
-public class RefCountingInst : Instruction {
-  final public var reference: Value { operands[0].value }
-}
+public class RefCountingInst : Instruction, UnaryInstruction {}
 
 final public class StrongRetainInst : RefCountingInst {
 }
@@ -247,13 +241,9 @@ final public class StrongReleaseInst : RefCountingInst {
 final public class ReleaseValueInst : RefCountingInst {
 }
 
-final public class DestroyValueInst : Instruction {
-  public var value: Value { operands[0].value }
-}
+final public class DestroyValueInst : Instruction, UnaryInstruction {}
 
-final public class DestroyAddrInst : Instruction {
-  public var address: Value { operands[0].value }
-}
+final public class DestroyAddrInst : Instruction, UnaryInstruction {}
 
 final public class UnimplementedRefCountingInst : RefCountingInst {}
 
@@ -266,43 +256,40 @@ final public class UnimplementedRefCountingInst : RefCountingInst {}
 final public class UnimplementedSingleValueInst : SingleValueInstruction {
 }
 
-final public class LoadInst : SingleValueInstruction {
-  public var address: Value { operands[0].value }
-}
+final public class LoadInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class LoadBorrowInst : SingleValueInstruction {
-  public var address: Value { operands[0].value }
-}
+final public class LoadBorrowInst : SingleValueInstruction, UnaryInstruction {}
 
 final public class BuiltinInst : SingleValueInstruction {}
 
-final public class UpcastInst : SingleValueInstruction {
-  public var source: Value { operands[0].value }
-}
+final public class UpcastInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class InitExistentialRefInst : SingleValueInstruction {
-  public var reference: Value { operands[0].value }
-}
+final public
+class UncheckedRefCastInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class OpenExistentialRefInst : SingleValueInstruction {
-  public var existential: Value { operands[0].value }
-}
+final public
+class RawPointerToRefInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class InitExistentialMetatypeInst : SingleValueInstruction {
-  public var existential: Value { operands[0].value }
-}
+final public
+class AddressToPointerInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class OpenExistentialMetatypeInst : SingleValueInstruction {
-  public var existentialMetatype: Value { operands[0].value }
-}
+final public
+class InitExistentialRefInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class ValueMetatypeInst : SingleValueInstruction {
-  public var value: Value { operands[0].value }
-}
+final public
+class OpenExistentialRefInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class ExistentialMetatypeInst : SingleValueInstruction {
-  public var existential: Value { operands[0].value }
-}
+final public
+class InitExistentialMetatypeInst : SingleValueInstruction, UnaryInstruction {}
+
+final public
+class OpenExistentialMetatypeInst : SingleValueInstruction, UnaryInstruction {}
+
+final public
+class ValueMetatypeInst : SingleValueInstruction, UnaryInstruction {}
+
+final public
+class ExistentialMetatypeInst : SingleValueInstruction, UnaryInstruction {}
 
 public class GlobalAccessInst : SingleValueInstruction {
   final public var global: GlobalVariable {
@@ -317,71 +304,77 @@ final public class GlobalValueInst : GlobalAccessInst {}
 final public class TupleInst : SingleValueInstruction {
 }
 
-final public class TupleExtractInst : SingleValueInstruction {
-  public var tuple: Value { operands[0].value }
+final public class TupleExtractInst : SingleValueInstruction, UnaryInstruction {
   public var fieldIndex: Int { TupleExtractInst_fieldIndex(bridged) }
 }
 
-final public class TupleElementAddrInst : SingleValueInstruction {
-  public var tupleAddress: Value { operands[0].value }
+final public
+class TupleElementAddrInst : SingleValueInstruction, UnaryInstruction {
   public var fieldIndex: Int { TupleElementAddrInst_fieldIndex(bridged) }
 }
 
 final public class StructInst : SingleValueInstruction {
 }
 
-final public class StructExtractInst : SingleValueInstruction {
-  public var structOp: Value { operands[0].value }
+final public class StructExtractInst : SingleValueInstruction, UnaryInstruction {
   public var fieldIndex: Int { StructExtractInst_fieldIndex(bridged) }
 }
 
-final public class StructElementAddrInst : SingleValueInstruction {
-  public var structAddress: Value { operands[0].value }
+final public
+class StructElementAddrInst : SingleValueInstruction, UnaryInstruction {
   public var fieldIndex: Int { StructElementAddrInst_fieldIndex(bridged) }
 }
 
-final public class EnumInst : SingleValueInstruction {
-  public var payload: Value { operands[0].value }
+final public class EnumInst : SingleValueInstruction, UnaryInstruction {
   public var caseIndex: Int { EnumInst_caseIndex(bridged) }
 }
 
-final public class UncheckedEnumDataInst : SingleValueInstruction {
-  public var enumOp: Value { operands[0].value }
+final public
+class UncheckedEnumDataInst : SingleValueInstruction, UnaryInstruction {
   public var caseIndex: Int { UncheckedEnumDataInst_caseIndex(bridged) }
 }
 
-final public class RefElementAddrInst : SingleValueInstruction {
-  public var reference: Value { operands[0].value }
+final public class RefElementAddrInst : SingleValueInstruction, UnaryInstruction {
   public var fieldIndex: Int { RefElementAddrInst_fieldIndex(bridged) }
 }
 
-final public class RefTailAddrInst : SingleValueInstruction {
-  public var reference: Value { operands[0].value }
-}
+final public class RefTailAddrInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class UnconditionalCheckedCastInst : SingleValueInstruction {
+final public
+class UnconditionalCheckedCastInst : SingleValueInstruction, UnaryInstruction {
   public override var mayTrap: Bool { true }
 }
 
-final public class UnconditionalCheckedCastValueInst : SingleValueInstruction {
+final public
+class UnconditionalCheckedCastValueInst : SingleValueInstruction,
+                                          UnaryInstruction {
   public override var mayTrap: Bool { true }
 }
 
-final public class BeginAccessInst : SingleValueInstruction {
-  public var address: Value { operands[0].value }
-}
+final public
+class ConvertFunctionInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class BeginBorrowInst : SingleValueInstruction {
-  public var source: Value { operands[0].value }
-}
+final public
+class ThinToThickFunctionInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class CopyValueInst : SingleValueInstruction {
-  public var source: Value { operands[0].value }
-}
+final public
+class ObjCExistentialMetatypeToObjectInst : SingleValueInstruction,
+                                            UnaryInstruction {}
 
-final public class ClassifyBridgeObjectInst : SingleValueInstruction {
-  public var reference: Value { operands[0].value }
-}
+final public
+class ObjCMetatypeToObjectInst : SingleValueInstruction, UnaryInstruction {}
+
+final public
+class ValueToBridgeObjectInst : SingleValueInstruction, UnaryInstruction {}
+
+final public class BeginAccessInst : SingleValueInstruction, UnaryInstruction {}
+
+final public class BeginBorrowInst : SingleValueInstruction, UnaryInstruction {}
+
+final public class CopyValueInst : SingleValueInstruction, UnaryInstruction {}
+
+final public
+class ClassifyBridgeObjectInst : SingleValueInstruction, UnaryInstruction {}
 
 final public class PartialApplyInst : SingleValueInstruction, ApplySite {
   public var numArguments: Int { PartialApplyInst_numArguments(bridged) }
@@ -449,10 +442,10 @@ public class TermInst : Instruction {
 final public class UnreachableInst : TermInst {
 }
 
-final public class ReturnInst : TermInst {
+final public class ReturnInst : TermInst, UnaryInstruction {
 }
 
-final public class ThrowInst : TermInst {
+final public class ThrowInst : TermInst, UnaryInstruction {
 }
 
 final public class YieldInst : TermInst {
@@ -524,15 +517,15 @@ final public class SwitchEnumAddrInst : TermInst {
 final public class DynamicMethodBranchInst : TermInst {
 }
 
-final public class AwaitAsyncContinuationInst : TermInst {
+final public class AwaitAsyncContinuationInst : TermInst, UnaryInstruction {
 }
 
-final public class CheckedCastBranchInst : TermInst {
+final public class CheckedCastBranchInst : TermInst, UnaryInstruction {
 }
 
-final public class CheckedCastAddrBranchInst : TermInst {
+final public class CheckedCastAddrBranchInst : TermInst, UnaryInstruction {
 }
 
-final public class CheckedCastValueBranchInst : TermInst {
+final public class CheckedCastValueBranchInst : TermInst, UnaryInstruction {
 }