Swift SIL: add all deallocation instructions and let them conform to the Deallocation protocol

Author: eeckstein

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -251,16 +251,6 @@ final public class EndAccessInst : Instruction, UnaryInstruction {
 
 final public class EndBorrowInst : Instruction, UnaryInstruction {}
 
-final public class DeallocStackInst : Instruction, UnaryInstruction {
-  public var allocstack: AllocStackInst {
-    return operand.value as! AllocStackInst
-  }
-}
-
-final public class DeallocStackRefInst : Instruction, UnaryInstruction {
-  public var allocRef: AllocRefInstBase { operand.value as! AllocRefInstBase }
-}
-
 final public class MarkUninitializedInst : SingleValueInstruction, UnaryInstruction {
 }
 
@@ -286,8 +276,6 @@ final public class AbortApplyInst : Instruction, UnaryInstruction {}
 
 final public class SetDeallocatingInst : Instruction, UnaryInstruction {}
 
-final public class DeallocRefInst : Instruction, UnaryInstruction {}
-
 public class RefCountingInst : Instruction, UnaryInstruction {
   public var isAtomic: Bool { bridged.RefCountingInst_getIsAtomic() }
 }
@@ -320,6 +308,32 @@ final public class InjectEnumAddrInst : Instruction, UnaryInstruction, EnumInstr
 
 final public class UnimplementedRefCountingInst : RefCountingInst {}
 
+//===----------------------------------------------------------------------===//
+//                      no-value deallocation instructions
+//===----------------------------------------------------------------------===//
+
+public protocol Deallocation : Instruction { }
+
+final public class DeallocStackInst : Instruction, UnaryInstruction, Deallocation {
+  public var allocstack: AllocStackInst {
+    return operand.value as! AllocStackInst
+  }
+}
+
+final public class DeallocPackInst : Instruction, UnaryInstruction, Deallocation {}
+
+final public class DeallocStackRefInst : Instruction, UnaryInstruction, Deallocation {
+  public var allocRef: AllocRefInstBase { operand.value as! AllocRefInstBase }
+}
+
+final public class DeallocRefInst : Instruction, UnaryInstruction, Deallocation {}
+
+final public class DeallocPartialRefInst : Instruction, Deallocation {}
+
+final public class DeallocBoxInst : Instruction, UnaryInstruction, Deallocation {}
+
+final public class DeallocExistentialBoxInst : Instruction, UnaryInstruction, Deallocation {}
+
 //===----------------------------------------------------------------------===//
 //                           single-value instructions
 //===----------------------------------------------------------------------===//

SwiftCompilerSources/Sources/SIL/Registration.swift

@@ -44,8 +44,6 @@ public func registerSILClasses() {
   register(CopyAddrInst.self)
   register(EndAccessInst.self)
   register(EndBorrowInst.self)
-  register(DeallocStackInst.self)
-  register(DeallocStackRefInst.self)
   register(CondFailInst.self)
   register(MarkUninitializedInst.self)
   register(FixLifetimeInst.self)
@@ -55,7 +53,6 @@ public func registerSILClasses() {
   register(SetDeallocatingInst.self)
   register(EndApplyInst.self)
   register(AbortApplyInst.self)
-  register(DeallocRefInst.self)
   register(StrongRetainInst.self)
   register(RetainValueInst.self)
   register(StrongReleaseInst.self)
@@ -65,6 +62,13 @@ public func registerSILClasses() {
   register(StrongCopyUnownedValueInst.self)
   register(StrongCopyUnmanagedValueInst.self)
   register(InjectEnumAddrInst.self)
+  register(DeallocStackInst.self)
+  register(DeallocPackInst.self)
+  register(DeallocStackRefInst.self)
+  register(DeallocRefInst.self)
+  register(DeallocPartialRefInst.self)
+  register(DeallocBoxInst.self)
+  register(DeallocExistentialBoxInst.self)
   register(LoadInst.self)
   register(LoadWeakInst.self)
   register(LoadUnownedInst.self)