зеркало из https://github.com/mono/ikvm-fork.git
Removed unused (and bogus) parameter from TypeWrapper.EmitCheckcast() and EmitInstanceOf().
This commit is contained in:
Родитель
10e7176577
Коммит
0682388fe9
|
@ -1121,7 +1121,7 @@ namespace IKVM.Internal
|
|||
}
|
||||
}
|
||||
|
||||
internal override void EmitCheckcast(TypeWrapper context, CodeEmitter ilgen)
|
||||
internal override void EmitCheckcast(CodeEmitter ilgen)
|
||||
{
|
||||
if(IsGhost)
|
||||
{
|
||||
|
@ -1145,11 +1145,11 @@ namespace IKVM.Internal
|
|||
}
|
||||
else
|
||||
{
|
||||
base.EmitCheckcast(context, ilgen);
|
||||
base.EmitCheckcast(ilgen);
|
||||
}
|
||||
}
|
||||
|
||||
internal override void EmitInstanceOf(TypeWrapper context, CodeEmitter ilgen)
|
||||
internal override void EmitInstanceOf(CodeEmitter ilgen)
|
||||
{
|
||||
if(IsGhost)
|
||||
{
|
||||
|
@ -1161,7 +1161,7 @@ namespace IKVM.Internal
|
|||
}
|
||||
else
|
||||
{
|
||||
base.EmitInstanceOf(context, ilgen);
|
||||
base.EmitInstanceOf(ilgen);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -315,15 +315,15 @@ namespace IKVM.Internal
|
|||
ilgen.Emit(OpCodes.Stloc, exception);
|
||||
CodeEmitterLabel rethrow = ilgen.DefineLabel();
|
||||
ilgen.Emit(OpCodes.Ldloc, exception);
|
||||
errorClass.EmitInstanceOf(null, ilgen);
|
||||
errorClass.EmitInstanceOf(ilgen);
|
||||
ilgen.EmitBrtrue(rethrow);
|
||||
ilgen.Emit(OpCodes.Ldloc, exception);
|
||||
runtimeExceptionClass.EmitInstanceOf(null, ilgen);
|
||||
runtimeExceptionClass.EmitInstanceOf(ilgen);
|
||||
ilgen.EmitBrtrue(rethrow);
|
||||
foreach (TypeWrapper tw in pm.exceptions)
|
||||
{
|
||||
ilgen.Emit(OpCodes.Ldloc, exception);
|
||||
tw.EmitInstanceOf(null, ilgen);
|
||||
tw.EmitInstanceOf(ilgen);
|
||||
ilgen.EmitBrtrue(rethrow);
|
||||
}
|
||||
ilgen.Emit(OpCodes.Ldloc, exception);
|
||||
|
@ -515,42 +515,42 @@ namespace IKVM.Internal
|
|||
{
|
||||
if (tw == PrimitiveTypeWrapper.BYTE)
|
||||
{
|
||||
javaLangByte.EmitCheckcast(null, ilgen);
|
||||
javaLangByte.EmitCheckcast(ilgen);
|
||||
byteValue.EmitCall(ilgen);
|
||||
}
|
||||
else if (tw == PrimitiveTypeWrapper.BOOLEAN)
|
||||
{
|
||||
javaLangBoolean.EmitCheckcast(null, ilgen);
|
||||
javaLangBoolean.EmitCheckcast(ilgen);
|
||||
booleanValue.EmitCall(ilgen);
|
||||
}
|
||||
else if (tw == PrimitiveTypeWrapper.SHORT)
|
||||
{
|
||||
javaLangShort.EmitCheckcast(null, ilgen);
|
||||
javaLangShort.EmitCheckcast(ilgen);
|
||||
shortValue.EmitCall(ilgen);
|
||||
}
|
||||
else if (tw == PrimitiveTypeWrapper.CHAR)
|
||||
{
|
||||
javaLangCharacter.EmitCheckcast(null, ilgen);
|
||||
javaLangCharacter.EmitCheckcast(ilgen);
|
||||
charValue.EmitCall(ilgen);
|
||||
}
|
||||
else if (tw == PrimitiveTypeWrapper.INT)
|
||||
{
|
||||
javaLangInteger.EmitCheckcast(null, ilgen);
|
||||
javaLangInteger.EmitCheckcast(ilgen);
|
||||
intValue.EmitCall(ilgen);
|
||||
}
|
||||
else if (tw == PrimitiveTypeWrapper.FLOAT)
|
||||
{
|
||||
javaLangFloat.EmitCheckcast(null, ilgen);
|
||||
javaLangFloat.EmitCheckcast(ilgen);
|
||||
floatValue.EmitCall(ilgen);
|
||||
}
|
||||
else if (tw == PrimitiveTypeWrapper.LONG)
|
||||
{
|
||||
javaLangLong.EmitCheckcast(null, ilgen);
|
||||
javaLangLong.EmitCheckcast(ilgen);
|
||||
longValue.EmitCall(ilgen);
|
||||
}
|
||||
else if (tw == PrimitiveTypeWrapper.DOUBLE)
|
||||
{
|
||||
javaLangDouble.EmitCheckcast(null, ilgen);
|
||||
javaLangDouble.EmitCheckcast(ilgen);
|
||||
doubleValue.EmitCall(ilgen);
|
||||
}
|
||||
else
|
||||
|
|
|
@ -373,9 +373,7 @@ namespace IKVM.Internal.MapXml
|
|||
if(typeWrapper.IsGhost || typeWrapper.IsGhostArray)
|
||||
{
|
||||
ilgen.Emit(OpCodes.Dup);
|
||||
// NOTE we pass a null context, but that shouldn't be a problem, because
|
||||
// typeWrapper should never be an UnloadableTypeWrapper
|
||||
typeWrapper.EmitInstanceOf(null, ilgen);
|
||||
typeWrapper.EmitInstanceOf(ilgen);
|
||||
CodeEmitterLabel endLabel = ilgen.DefineLabel();
|
||||
ilgen.EmitBrtrue(endLabel);
|
||||
ilgen.Emit(OpCodes.Pop);
|
||||
|
@ -406,9 +404,7 @@ namespace IKVM.Internal.MapXml
|
|||
}
|
||||
else
|
||||
{
|
||||
// NOTE we pass a null context, but that shouldn't be a problem, because
|
||||
// typeWrapper should never be an UnloadableTypeWrapper
|
||||
typeWrapper.EmitCheckcast(null, ilgen);
|
||||
typeWrapper.EmitCheckcast(ilgen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2654,7 +2654,7 @@ namespace IKVM.Internal
|
|||
}
|
||||
|
||||
#if !STUB_GENERATOR
|
||||
internal override void EmitInstanceOf(TypeWrapper context, CodeEmitter ilgen)
|
||||
internal override void EmitInstanceOf(CodeEmitter ilgen)
|
||||
{
|
||||
if (IsRemapped)
|
||||
{
|
||||
|
@ -2669,7 +2669,7 @@ namespace IKVM.Internal
|
|||
ilgen.Emit_instanceof(type);
|
||||
}
|
||||
|
||||
internal override void EmitCheckcast(TypeWrapper context, CodeEmitter ilgen)
|
||||
internal override void EmitCheckcast(CodeEmitter ilgen)
|
||||
{
|
||||
if (IsRemapped)
|
||||
{
|
||||
|
|
|
@ -2122,7 +2122,7 @@ namespace IKVM.Internal
|
|||
else
|
||||
{
|
||||
getValueMethod.EmitCall(ilgen);
|
||||
o.methods[i].ReturnType.EmitCheckcast(null, ilgen);
|
||||
o.methods[i].ReturnType.EmitCheckcast(ilgen);
|
||||
}
|
||||
ilgen.Emit(OpCodes.Ret);
|
||||
ilgen.DoEmit();
|
||||
|
|
|
@ -2955,7 +2955,7 @@ namespace IKVM.Internal
|
|||
}
|
||||
}
|
||||
|
||||
internal virtual void EmitCheckcast(TypeWrapper context, CodeEmitter ilgen)
|
||||
internal virtual void EmitCheckcast(CodeEmitter ilgen)
|
||||
{
|
||||
if(IsGhost)
|
||||
{
|
||||
|
@ -2989,7 +2989,7 @@ namespace IKVM.Internal
|
|||
}
|
||||
}
|
||||
|
||||
internal virtual void EmitInstanceOf(TypeWrapper context, CodeEmitter ilgen)
|
||||
internal virtual void EmitInstanceOf(CodeEmitter ilgen)
|
||||
{
|
||||
if(IsGhost)
|
||||
{
|
||||
|
@ -3307,14 +3307,14 @@ namespace IKVM.Internal
|
|||
return customModifier ?? (customModifier = context.DefineUnloadable(this.Name));
|
||||
}
|
||||
|
||||
internal override void EmitCheckcast(TypeWrapper context, CodeEmitter ilgen)
|
||||
internal override void EmitCheckcast(CodeEmitter ilgen)
|
||||
{
|
||||
ilgen.Emit(OpCodes.Ldstr, Name);
|
||||
ilgen.Emit(OpCodes.Ldnull);
|
||||
ilgen.Emit(OpCodes.Call, ByteCodeHelperMethods.DynamicCast);
|
||||
}
|
||||
|
||||
internal override void EmitInstanceOf(TypeWrapper context, CodeEmitter ilgen)
|
||||
internal override void EmitInstanceOf(CodeEmitter ilgen)
|
||||
{
|
||||
ilgen.Emit(OpCodes.Ldstr, Name);
|
||||
ilgen.Emit(OpCodes.Ldnull);
|
||||
|
|
|
@ -1997,7 +1997,7 @@ sealed class Compiler
|
|||
LocalVar v = LoadLocal(i);
|
||||
if(!type.IsUnloadable && (v.type.IsUnloadable || !v.type.IsAssignableTo(type)))
|
||||
{
|
||||
type.EmitCheckcast(type, ilGenerator);
|
||||
type.EmitCheckcast(ilGenerator);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -2180,13 +2180,13 @@ sealed class Compiler
|
|||
case NormalizedByteCode.__checkcast:
|
||||
{
|
||||
TypeWrapper wrapper = classFile.GetConstantPoolClassType(instr.Arg1);
|
||||
wrapper.EmitCheckcast(clazz, ilGenerator);
|
||||
wrapper.EmitCheckcast(ilGenerator);
|
||||
break;
|
||||
}
|
||||
case NormalizedByteCode.__instanceof:
|
||||
{
|
||||
TypeWrapper wrapper = classFile.GetConstantPoolClassType(instr.Arg1);
|
||||
wrapper.EmitInstanceOf(clazz, ilGenerator);
|
||||
wrapper.EmitInstanceOf(ilGenerator);
|
||||
break;
|
||||
}
|
||||
case NormalizedByteCode.__aaload:
|
||||
|
@ -2982,7 +2982,7 @@ sealed class Compiler
|
|||
ilgen.Emit(OpCodes.Ldstr, tw.Name);
|
||||
context.EmitCallerID(ilgen);
|
||||
ilgen.Emit(OpCodes.Call, ByteCodeHelperMethods.DynamicClassLiteral);
|
||||
java_lang_Class.EmitCheckcast(clazz, ilgen);
|
||||
java_lang_Class.EmitCheckcast(ilgen);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -3735,7 +3735,7 @@ sealed class Compiler
|
|||
}
|
||||
else
|
||||
{
|
||||
typeWrapper.EmitCheckcast(null, ilgen);
|
||||
typeWrapper.EmitCheckcast(ilgen);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -973,7 +973,7 @@ namespace IKVM.NativeCode.java
|
|||
ilgenObjSetter.Emit(OpCodes.Ldarg_1);
|
||||
ilgenObjSetter.EmitLdc_I4(field.getOffset());
|
||||
ilgenObjSetter.Emit(OpCodes.Ldelem_Ref);
|
||||
fw.FieldTypeWrapper.EmitCheckcast(null, ilgenObjSetter);
|
||||
fw.FieldTypeWrapper.EmitCheckcast(ilgenObjSetter);
|
||||
fw.FieldTypeWrapper.EmitConvStackTypeToSignatureType(ilgenObjSetter, null);
|
||||
fw.EmitSet(ilgenObjSetter);
|
||||
}
|
||||
|
@ -6367,7 +6367,7 @@ namespace IKVM.NativeCode.sun.reflect
|
|||
if (!mw.IsStatic)
|
||||
{
|
||||
ilgen.Emit(OpCodes.Ldarg_0);
|
||||
mw.DeclaringType.EmitCheckcast(null, ilgen);
|
||||
mw.DeclaringType.EmitCheckcast(ilgen);
|
||||
mw.DeclaringType.EmitConvStackTypeToSignatureType(ilgen, null);
|
||||
ilgen.Emit(OpCodes.Stloc, args[0]);
|
||||
}
|
||||
|
@ -6602,7 +6602,7 @@ namespace IKVM.NativeCode.sun.reflect
|
|||
}
|
||||
else
|
||||
{
|
||||
type.EmitCheckcast(null, ilgen);
|
||||
type.EmitCheckcast(ilgen);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -7903,7 +7903,7 @@ namespace IKVM.NativeCode.sun.reflect
|
|||
{
|
||||
ilgen.BeginExceptionBlock();
|
||||
ilgen.Emit(OpCodes.Ldarg_2);
|
||||
fw.FieldTypeWrapper.EmitCheckcast(null, ilgen);
|
||||
fw.FieldTypeWrapper.EmitCheckcast(ilgen);
|
||||
fw.FieldTypeWrapper.EmitConvStackTypeToSignatureType(ilgen, null);
|
||||
fw.EmitSet(ilgen);
|
||||
CodeEmitterLabel label = ilgen.DefineLabel();
|
||||
|
@ -7930,7 +7930,7 @@ namespace IKVM.NativeCode.sun.reflect
|
|||
ilgen.Emit(OpCodes.Ldarg_2);
|
||||
if (fieldType == typeof(object))
|
||||
{
|
||||
fw.FieldTypeWrapper.EmitCheckcast(null, ilgen);
|
||||
fw.FieldTypeWrapper.EmitCheckcast(ilgen);
|
||||
}
|
||||
fw.FieldTypeWrapper.EmitConvStackTypeToSignatureType(ilgen, null);
|
||||
fw.EmitSet(ilgen);
|
||||
|
|
|
@ -735,7 +735,7 @@ static partial class MethodHandleUtil
|
|||
}
|
||||
else
|
||||
{
|
||||
dst.EmitCheckcast(null, ilgen);
|
||||
dst.EmitCheckcast(ilgen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче