Code formatting cleanup related to ForwardingInstruction.

Author: atrick

SwiftCompilerSources/Sources/SIL/ForwardingInstruction.swift

@@ -58,21 +58,6 @@ extension ForwardingInstruction {
   }
 }
 
-// An instruction that forwards a single value to a single result.
-//
-// For legacy reasons, some ForwardingInstructions that fit the
-// SingleValueInstruction and UnaryInstruction requirements are not
-// considered ConversionInstructions because certain routines do not
-// want to see through them (InitExistentialValueInst,
-// DeinitExistentialValueInst, OpenExistentialValueInst,
-// OpenExistentialValueInst). This most likely has to do with
-// type-dependent operands, although any ConversionInstruction should
-// support type-dependent operands.
-public protocol ConversionInstruction : SingleValueInstruction,
-                                        UnaryInstruction,
-                                        ForwardingInstruction
-{}
-
 extension Value {
   // If this value is produced by a ForwardingInstruction, return that instruction. This is convenient for following the forwarded value chain.
   // Unlike definingInstruction, a value's forwardingInstruction is not necessarily a valid insertion point. 
@@ -232,6 +217,18 @@ extension TuplePackExtractInst : ForwardingInstruction {
 // -----------------------------------------------------------------------------
 // conversion instructions
 
+/// An instruction that forwards a single value to a single result.
+///
+/// For legacy reasons, some ForwardingInstructions that fit the
+/// SingleValueInstruction and UnaryInstruction requirements are not
+/// considered ConversionInstructions because certain routines do not
+/// want to see through them (InitExistentialValueInst,
+/// DeinitExistentialValueInst, OpenExistentialValueInst,
+/// OpenExistentialValueInst). This most likely has to do with
+/// type-dependent operands, although any ConversionInstruction should
+/// support type-dependent operands.
+public protocol ConversionInstruction : SingleValueInstruction, UnaryInstruction, ForwardingInstruction {}
+
 extension MarkUnresolvedNonCopyableValueInst : ConversionInstruction {
   public var preservesRepresentation: Bool { true }
   public var canForwardGuaranteedValues: Bool { true }

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -1115,8 +1115,7 @@ final public class IsUniqueInst : SingleValueInstruction, UnaryInstruction {}
 
 final public class IsEscapingClosureInst : SingleValueInstruction, UnaryInstruction {}
 
-final public class MarkUnresolvedNonCopyableValueInst
-  : SingleValueInstruction, UnaryInstruction {}
+final public class MarkUnresolvedNonCopyableValueInst: SingleValueInstruction, UnaryInstruction {}
 
 final public class MarkUnresolvedReferenceBindingInst : SingleValueInstruction {}
 
@@ -1125,13 +1124,11 @@ final public class MarkUnresolvedMoveAddrInst : Instruction, SourceDestAddrInstr
   public var isInitializationOfDest: Bool { true }
 }
 
-final public class CopyableToMoveOnlyWrapperValueInst
-  : SingleValueInstruction, UnaryInstruction {}
+final public class CopyableToMoveOnlyWrapperValueInst: SingleValueInstruction, UnaryInstruction {}
 
-final public class MoveOnlyWrapperToCopyableValueInst
-  : SingleValueInstruction, UnaryInstruction {}
+final public class MoveOnlyWrapperToCopyableValueInst: SingleValueInstruction, UnaryInstruction {}
 
-final public class MoveOnlyWrapperToCopyableBoxInst : SingleValueInstruction {}
+final public class MoveOnlyWrapperToCopyableBoxInst: SingleValueInstruction, UnaryInstruction {}
 
 final public class CopyableToMoveOnlyWrapperAddrInst
   : SingleValueInstruction, UnaryInstruction {}