Swift SIL: add some APIs to instructions and other small improvments

Author: eeckstein

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -48,7 +48,8 @@ public class Instruction : CustomStringConvertible, Hashable {
     return OperandArray(base: operands.base, count: operands.count)
   }
 
-  // All operands defined by the operation. Returns the prefix of `operands` that does not include trailing type dependent operands.
+  // All operands defined by the operation.
+  // Returns the prefix of `operands` that does not include trailing type dependent operands.
   final public var definedOperands: OperandArray {
     let operands = bridged.getOperands()
     let typeOperands = bridged.getTypeDependentOperands()
@@ -237,7 +238,7 @@ public class MultipleValueInstruction : Instruction {
   }
 }
 
-/// Instructions, which have a single operand.
+/// Instructions, which have a single operand (not including type-dependent operands).
 public protocol UnaryInstruction : Instruction {
   var operand: Operand { get }
 }
@@ -311,14 +312,13 @@ public protocol SourceDestAddrInstruction : Instruction {
 }
 
 extension SourceDestAddrInstruction {
-  public var sourceOperand: Operand { return operands[0] }
-  public var destinationOperand: Operand { return operands[1] }
+  public var sourceOperand: Operand { operands[0] }
+  public var destinationOperand: Operand { operands[1] }
+  public var source: Value { sourceOperand.value }
+  public var destination: Value { destinationOperand.value }
 }
 
 final public class CopyAddrInst : Instruction, SourceDestAddrInstruction {
-  public var source: Value { return sourceOperand.value }
-  public var destination: Value { return destinationOperand.value }
-  
   public var isTakeOfSrc: Bool {
     bridged.CopyAddrInst_isTakeOfSrc()
   }
@@ -681,7 +681,7 @@ final public
 class InitExistentialAddrInst : SingleValueInstruction, UnaryInstruction {}
 
 final public
-class DeinitExistentialAddrInst : Instruction {}
+class DeinitExistentialAddrInst : Instruction, UnaryInstruction {}
 
 final public
 class DeinitExistentialValueInst : Instruction {}
@@ -873,6 +873,8 @@ final public class RefElementAddrInst : SingleValueInstruction, UnaryInstruction
 
 final public class RefTailAddrInst : SingleValueInstruction, UnaryInstruction {
   public var instance: Value { operand.value }
+
+  public var isImmutable: Bool { bridged.RefTailAddrInst_isImmutable() }
 }
 
 final public class KeyPathInst : SingleValueInstruction {
@@ -1219,7 +1221,9 @@ extension Instruction {
 /// Instructions beginning a borrow-scope which must be ended by `end_borrow`.
 public protocol BorrowIntroducingInstruction : SingleValueInstruction, ScopedInstruction {}
 
-final public class EndBorrowInst : Instruction, UnaryInstruction {}
+final public class EndBorrowInst : Instruction, UnaryInstruction {
+  public var borrow: Value { operand.value }
+}
 
 extension BorrowIntroducingInstruction {
   public var endOperands: LazyFilterSequence<UseList> {
@@ -1264,6 +1268,7 @@ final public class BeginAccessInst : SingleValueInstruction, UnaryInstruction {
   }
 
   public var isStatic: Bool { bridged.BeginAccessInst_isStatic() }
+  public var isUnsafe: Bool { bridged.BeginAccessInst_isUnsafe() }
 
   public var address: Value { operand.value }
 
@@ -1304,8 +1309,15 @@ final public class BeginApplyInst : MultipleValueInstruction, FullApplySite {
   }
 }
 
-final public class EndApplyInst : Instruction, UnaryInstruction {}
-final public class AbortApplyInst : Instruction, UnaryInstruction {}
+final public class EndApplyInst : Instruction, UnaryInstruction {
+  public var token: MultipleValueInstructionResult { operand.value as! MultipleValueInstructionResult }
+  public var beginApply: BeginApplyInst { token.parentInstruction as! BeginApplyInst }
+}
+
+final public class AbortApplyInst : Instruction, UnaryInstruction {
+  public var token: MultipleValueInstructionResult { operand.value as! MultipleValueInstructionResult }
+  public var beginApply: BeginApplyInst { token.parentInstruction as! BeginApplyInst }
+}
 
 extension BeginApplyInst : ScopedInstruction {
   public var endOperands: LazyFilterSequence<UseList> {

include/swift/SIL/SILBridging.h

@@ -960,6 +960,7 @@ struct BridgedInstruction {
   BRIDGED_INLINE bool RefElementAddrInst_fieldIsLet() const;
   BRIDGED_INLINE bool RefElementAddrInst_isImmutable() const;
   BRIDGED_INLINE void RefElementAddrInst_setImmutable(bool isImmutable) const;
+  BRIDGED_INLINE bool RefTailAddrInst_isImmutable() const;
   BRIDGED_INLINE SwiftInt PartialApplyInst_numArguments() const;
   BRIDGED_INLINE SwiftInt ApplyInst_numArguments() const;
   BRIDGED_INLINE bool ApplyInst_getNonThrowing() const;
@@ -987,6 +988,7 @@ struct BridgedInstruction {
   BRIDGED_INLINE void MarkDependenceInst_resolveToNonEscaping() const;
   BRIDGED_INLINE SwiftInt BeginAccessInst_getAccessKind() const;
   BRIDGED_INLINE bool BeginAccessInst_isStatic() const;
+  BRIDGED_INLINE bool BeginAccessInst_isUnsafe() const;
   BRIDGED_INLINE bool CopyAddrInst_isTakeOfSrc() const;
   BRIDGED_INLINE bool CopyAddrInst_isInitializationOfDest() const;
   BRIDGED_INLINE bool ExplicitCopyAddrInst_isTakeOfSrc() const;

include/swift/SIL/SILBridgingImpl.h

@@ -1147,6 +1147,10 @@ void BridgedInstruction::RefElementAddrInst_setImmutable(bool isImmutable) const
   getAs<swift::RefElementAddrInst>()->setImmutable(isImmutable);
 }
 
+bool BridgedInstruction::RefTailAddrInst_isImmutable() const {
+  return getAs<swift::RefTailAddrInst>()->isImmutable();
+}
+
 SwiftInt BridgedInstruction::PartialApplyInst_numArguments() const {
   return getAs<swift::PartialApplyInst>()->getNumArguments();
 }
@@ -1256,6 +1260,10 @@ bool BridgedInstruction::BeginAccessInst_isStatic() const {
   return getAs<swift::BeginAccessInst>()->getEnforcement() == swift::SILAccessEnforcement::Static;
 }
 
+bool BridgedInstruction::BeginAccessInst_isUnsafe() const {
+  return getAs<swift::BeginAccessInst>()->getEnforcement() == swift::SILAccessEnforcement::Unsafe;
+}
+
 bool BridgedInstruction::CopyAddrInst_isTakeOfSrc() const {
   return getAs<swift::CopyAddrInst>()->isTakeOfSrc();
 }