@ -184,9 +184,12 @@ namespace ICSharpCode.Decompiler.IL
LdLen , LdLen ,
/// <summary>Load address of array element.</summary>
/// <summary>Load address of array element.</summary>
LdElema , LdElema ,
/// <summary>Converts an array pointer (O) to a reference to the first element, or to a null reference if the array is null or empty.
/// <summary>Retrieves a pinnable reference for the input object.
/// Also used to convert a string to a reference to the first character.</summary>
/// The input must be an object reference (O).
ArrayToPointer , /// If the input is an array/string, evaluates to a reference to the first element/character, or to a null reference if the array is null or empty.
/// Otherwise, uses the GetPinnableReference method to get the reference, or evaluates to a null reference if the input is null.
/// </summary>
GetPinnableReference ,
/// <summary>Maps a string value to an integer. This is used in switch(string).</summary>
/// <summary>Maps a string value to an integer. This is used in switch(string).</summary>
StringToInt , StringToInt ,
/// <summary>ILAst representation of Expression.Convert.</summary>
/// <summary>ILAst representation of Expression.Convert.</summary>
@ -4756,21 +4759,25 @@ namespace ICSharpCode.Decompiler.IL
} }
namespace ICSharpCode.Decompiler.IL namespace ICSharpCode.Decompiler.IL
{ {
/// <summary>Converts an array pointer (O) to a reference to the first element, or to a null reference if the array is null or empty.
/// <summary>Retrieves a pinnable reference for the input object.
/// Also used to convert a string to a reference to the first character.</summary>
/// The input must be an object reference (O).
public sealed partial class ArrayToPointer : ILInstruction /// If the input is an array/string, evaluates to a reference to the first element/character, or to a null reference if the array is null or empty.
/// Otherwise, uses the GetPinnableReference method to get the reference, or evaluates to a null reference if the input is null.
/// </summary>
public sealed partial class GetPinnableReference : ILInstruction , IInstructionWithMethodOperand
{ {
public ArrayToPointer ( ILInstruction array ) : base ( OpCode . ArrayToPointer ) public GetPinnableReference ( ILInstruction argument , IMethod method ) : base ( OpCode . GetPinnableReference )
{ {
this . Array = array ; this . Argument = argument ;
this . method = method ;
} }
public static readonly SlotInfo Array Slot = new SlotInfo ( "Array " , canInlineInto : true ) ; public static readonly SlotInfo Argument Slot = new SlotInfo ( "Argument " , canInlineInto : true ) ;
ILInstruction array ; ILInstruction argument ;
public ILInstruction Array { public ILInstruction Argument {
get { return this . array ; } get { return this . argument ; }
set { set {
ValidateChild ( value ) ; ValidateChild ( value ) ;
SetChildInstruction ( ref this . array , value , 0 ) ; SetChildInstruction ( ref this . argument , value , 0 ) ;
} }
} }
protected sealed override int GetChildCount ( ) protected sealed override int GetChildCount ( )
@ -4781,7 +4788,7 @@ namespace ICSharpCode.Decompiler.IL
{ {
switch ( index ) { switch ( index ) {
case 0 : case 0 :
return this . array ; return this . argument ;
default : default :
throw new IndexOutOfRangeException ( ) ; throw new IndexOutOfRangeException ( ) ;
} }
@ -4790,7 +4797,7 @@ namespace ICSharpCode.Decompiler.IL
{ {
switch ( index ) { switch ( index ) {
case 0 : case 0 :
this . Array = value ; this . Argument = value ;
break ; break ;
default : default :
throw new IndexOutOfRangeException ( ) ; throw new IndexOutOfRangeException ( ) ;
@ -4800,21 +4807,24 @@ namespace ICSharpCode.Decompiler.IL
{ {
switch ( index ) { switch ( index ) {
case 0 : case 0 :
return Array Slot ; return Argument Slot ;
default : default :
throw new IndexOutOfRangeException ( ) ; throw new IndexOutOfRangeException ( ) ;
} }
} }
public sealed override ILInstruction Clone ( ) public sealed override ILInstruction Clone ( )
{ {
var clone = ( ArrayToPointer ) ShallowClone ( ) ; var clone = ( GetPinnableReference ) ShallowClone ( ) ;
clone . Array = this . array . Clone ( ) ; clone . Argument = this . argument . Clone ( ) ;
return clone ; return clone ;
} }
public override StackType ResultType { get { return StackType . Ref ; } } public override StackType ResultType { get { return StackType . Ref ; } }
readonly IMethod method ;
/// <summary>Returns the method operand.</summary>
public IMethod Method { get { return method ; } }
protected override InstructionFlags ComputeFlags ( ) protected override InstructionFlags ComputeFlags ( )
{ {
return array . Flags ; return argument . Flags ;
} }
public override InstructionFlags DirectFlags { public override InstructionFlags DirectFlags {
get { get {
@ -4825,31 +4835,33 @@ namespace ICSharpCode.Decompiler.IL
{ {
WriteILRange ( output , options ) ; WriteILRange ( output , options ) ;
output . Write ( OpCode ) ; output . Write ( OpCode ) ;
output . Write ( ' ' ) ;
method . WriteTo ( output ) ;
output . Write ( '(' ) ; output . Write ( '(' ) ;
this . array . WriteTo ( output , options ) ; this . argument . WriteTo ( output , options ) ;
output . Write ( ')' ) ; output . Write ( ')' ) ;
} }
public override void AcceptVisitor ( ILVisitor visitor ) public override void AcceptVisitor ( ILVisitor visitor )
{ {
visitor . VisitArrayToPointer ( this ) ; visitor . VisitGetPinnableReference ( this ) ;
} }
public override T AcceptVisitor < T > ( ILVisitor < T > visitor ) public override T AcceptVisitor < T > ( ILVisitor < T > visitor )
{ {
return visitor . VisitArrayToPointer ( this ) ; return visitor . VisitGetPinnableReference ( this ) ;
} }
public override T AcceptVisitor < C , T > ( ILVisitor < C , T > visitor , C context ) public override T AcceptVisitor < C , T > ( ILVisitor < C , T > visitor , C context )
{ {
return visitor . VisitArrayToPointer ( this , context ) ; return visitor . VisitGetPinnableReference ( this , context ) ;
} }
protected internal override bool PerformMatch ( ILInstruction other , ref Patterns . Match match ) protected internal override bool PerformMatch ( ILInstruction other , ref Patterns . Match match )
{ {
var o = other as ArrayToPointer ; var o = other as GetPinnableReference ;
return o ! = null & & this . array . PerformMatch ( o . array , ref match ) ; return o ! = null & & this . argument . PerformMatch ( o . argument , ref match ) & & method . Equals ( o . method ) ;
} }
internal override void CheckInvariant ( ILPhase phase ) internal override void CheckInvariant ( ILPhase phase )
{ {
base . CheckInvariant ( phase ) ; base . CheckInvariant ( phase ) ;
Debug . Assert ( array . ResultType = = StackType . O ) ; Debug . Assert ( argument . ResultType = = StackType . O ) ;
} }
} }
} }
@ -6717,7 +6729,7 @@ namespace ICSharpCode.Decompiler.IL
{ {
Default ( inst ) ; Default ( inst ) ;
} }
protected internal virtual void VisitArrayToPointer ( ArrayToPointer inst ) protected internal virtual void VisitGetPinnableReference ( GetPinnableReference inst )
{ {
Default ( inst ) ; Default ( inst ) ;
} }
@ -7103,7 +7115,7 @@ namespace ICSharpCode.Decompiler.IL
{ {
return Default ( inst ) ; return Default ( inst ) ;
} }
protected internal virtual T VisitArrayToPointer ( ArrayToPointer inst ) protected internal virtual T VisitGetPinnableReference ( GetPinnableReference inst )
{ {
return Default ( inst ) ; return Default ( inst ) ;
} }
@ -7489,7 +7501,7 @@ namespace ICSharpCode.Decompiler.IL
{ {
return Default ( inst , context ) ; return Default ( inst , context ) ;
} }
protected internal virtual T VisitArrayToPointer ( ArrayToPointer inst , C context ) protected internal virtual T VisitGetPinnableReference ( GetPinnableReference inst , C context )
{ {
return Default ( inst , context ) ; return Default ( inst , context ) ;
} }
@ -7651,7 +7663,7 @@ namespace ICSharpCode.Decompiler.IL
"sizeof" , "sizeof" ,
"ldlen" , "ldlen" ,
"ldelema" , "ldelema" ,
"array.to.pointer " , "get.pinnable.reference " ,
"string.to.int" , "string.to.int" ,
"expression.tree.cast" , "expression.tree.cast" ,
"user.logic.operator" , "user.logic.operator" ,
@ -8202,14 +8214,16 @@ namespace ICSharpCode.Decompiler.IL
array = default ( ILInstruction ) ; array = default ( ILInstruction ) ;
return false ; return false ;
} }
public bool MatchArrayToPointer ( out ILInstruction array ) public bool MatchGetPinnableReference ( out ILInstruction argument , out IMethod method )
{ {
var inst = this as ArrayToPointer ; var inst = this as GetPinnableReference ;
if ( inst ! = null ) { if ( inst ! = null ) {
array = inst . Array ; argument = inst . Argument ;
method = inst . Method ;
return true ; return true ;
} }
array = default ( ILInstruction ) ; argument = default ( ILInstruction ) ;
method = default ( IMethod ) ;
return false ; return false ;
} }
public bool MatchUserDefinedLogicOperator ( out IMethod method , out ILInstruction left , out ILInstruction right ) public bool MatchUserDefinedLogicOperator ( out IMethod method , out ILInstruction left , out ILInstruction right )
Daniel Grunwald
6 years ago