From 38b1021a8c87aa86d643c9747e0491f214318149 Mon Sep 17 00:00:00 2001 From: edwin Date: Thu, 20 Oct 2005 09:53:00 +0000 Subject: [PATCH] replace helper_* calls in the pathers with calls to resolve_*_eager --- src/vm/jit/alpha/patcher.c | 28 ++++++++++++++-------------- src/vm/jit/i386/patcher.c | 34 +++++++++++++++++----------------- src/vm/jit/intrp/patcher.c | 22 +++++++++++----------- src/vm/jit/mips/patcher.c | 28 ++++++++++++++-------------- src/vm/jit/powerpc/patcher.c | 30 +++++++++++++++--------------- src/vm/jit/x86_64/patcher.c | 32 ++++++++++++++++---------------- 6 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/vm/jit/alpha/patcher.c b/src/vm/jit/alpha/patcher.c index d073c3a15..1ac8081b5 100644 --- a/src/vm/jit/alpha/patcher.c +++ b/src/vm/jit/alpha/patcher.c @@ -28,7 +28,7 @@ Changes: - $Id: patcher.c 3353 2005-10-05 13:30:10Z edwin $ + $Id: patcher.c 3461 2005-10-20 09:53:00Z edwin $ */ @@ -86,7 +86,7 @@ bool patcher_get_putstatic(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -151,7 +151,7 @@ bool patcher_get_putfield(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -223,7 +223,7 @@ bool patcher_builtin_new(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo_nonabstract(cr))) { + if (!(c = resolve_classref_eager_nonabstract(cr))) { PATCHER_MONITOREXIT; return false; @@ -294,7 +294,7 @@ bool patcher_builtin_newarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -362,7 +362,7 @@ bool patcher_builtin_multianewarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -429,7 +429,7 @@ bool patcher_builtin_arraycheckcast(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -501,7 +501,7 @@ bool patcher_builtin_arrayinstanceof(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -567,7 +567,7 @@ bool patcher_invokestatic_special(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -626,7 +626,7 @@ bool patcher_invokevirtual(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -692,7 +692,7 @@ bool patcher_invokeinterface(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -763,7 +763,7 @@ bool patcher_checkcast_instanceof_flags(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -824,7 +824,7 @@ bool patcher_checkcast_instanceof_interface(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -894,7 +894,7 @@ bool patcher_checkcast_instanceof_class(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; diff --git a/src/vm/jit/i386/patcher.c b/src/vm/jit/i386/patcher.c index 36c431f52..3c11891d1 100644 --- a/src/vm/jit/i386/patcher.c +++ b/src/vm/jit/i386/patcher.c @@ -28,7 +28,7 @@ Changes: - $Id: patcher.c 3392 2005-10-10 13:40:11Z twisti $ + $Id: patcher.c 3461 2005-10-20 09:53:00Z edwin $ */ @@ -80,7 +80,7 @@ bool patcher_get_putstatic(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -149,7 +149,7 @@ bool patcher_getfield(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -213,7 +213,7 @@ bool patcher_putfield(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -286,7 +286,7 @@ bool patcher_putfieldconst(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -359,7 +359,7 @@ bool patcher_builtin_new(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo_nonabstract(cr))) { + if (!(c = resolve_classref_eager_nonabstract(cr))) { PATCHER_MONITOREXIT; return false; @@ -424,7 +424,7 @@ bool patcher_builtin_newarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -493,7 +493,7 @@ bool patcher_builtin_multianewarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -558,7 +558,7 @@ bool patcher_builtin_arraycheckcast(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -623,7 +623,7 @@ bool patcher_builtin_arrayinstanceof(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -687,7 +687,7 @@ bool patcher_invokestatic_special(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -748,7 +748,7 @@ bool patcher_invokevirtual(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -811,7 +811,7 @@ bool patcher_invokeinterface(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -876,7 +876,7 @@ bool patcher_checkcast_instanceof_flags(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -939,7 +939,7 @@ bool patcher_checkcast_instanceof_interface(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -1006,7 +1006,7 @@ bool patcher_checkcast_class(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -1069,7 +1069,7 @@ bool patcher_instanceof_class(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; diff --git a/src/vm/jit/intrp/patcher.c b/src/vm/jit/intrp/patcher.c index 705346f32..bd109fcda 100644 --- a/src/vm/jit/intrp/patcher.c +++ b/src/vm/jit/intrp/patcher.c @@ -28,7 +28,7 @@ Changes: - $Id: patcher.c 3353 2005-10-05 13:30:10Z edwin $ + $Id: patcher.c 3461 2005-10-20 09:53:00Z edwin $ */ @@ -65,7 +65,7 @@ bool patcher_get_putstatic(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { return false; } @@ -102,7 +102,7 @@ bool patcher_get_putfield(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { return false; } @@ -131,7 +131,7 @@ bool patcher_builtin_new(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo_nonabstract(cr))) { + if (!(c = resolve_classref_eager_nonabstract(cr))) { return false; } @@ -168,7 +168,7 @@ bool patcher_builtin_newarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { return false; } @@ -203,7 +203,7 @@ bool patcher_builtin_multianewarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { return false; } @@ -232,7 +232,7 @@ bool patcher_builtin_arraycheckcast(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { return false; } @@ -261,7 +261,7 @@ bool patcher_invokestatic_special(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { return false; } @@ -290,7 +290,7 @@ bool patcher_invokevirtual(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { return false; } @@ -319,7 +319,7 @@ bool patcher_invokeinterface(u1 *sp) /* get the methodinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { return false; } @@ -353,7 +353,7 @@ bool patcher_checkcast_instanceof(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { return false; } diff --git a/src/vm/jit/mips/patcher.c b/src/vm/jit/mips/patcher.c index 2f8582c1f..43efb1de0 100644 --- a/src/vm/jit/mips/patcher.c +++ b/src/vm/jit/mips/patcher.c @@ -28,7 +28,7 @@ Changes: - $Id: patcher.c 3353 2005-10-05 13:30:10Z edwin $ + $Id: patcher.c 3461 2005-10-20 09:53:00Z edwin $ */ @@ -97,7 +97,7 @@ bool patcher_get_putstatic(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -181,7 +181,7 @@ bool patcher_get_putfield(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -272,7 +272,7 @@ bool patcher_builtin_new(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo_nonabstract(cr))) { + if (!(c = resolve_classref_eager_nonabstract(cr))) { PATCHER_MONITOREXIT; return false; @@ -359,7 +359,7 @@ bool patcher_builtin_newarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -443,7 +443,7 @@ bool patcher_builtin_multianewarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -526,7 +526,7 @@ bool patcher_builtin_arraycheckcast(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -614,7 +614,7 @@ bool patcher_builtin_arrayinstanceof(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -696,7 +696,7 @@ bool patcher_invokestatic_special(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -771,7 +771,7 @@ bool patcher_invokevirtual(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -856,7 +856,7 @@ bool patcher_invokeinterface(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -949,7 +949,7 @@ bool patcher_checkcast_instanceof_flags(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -1026,7 +1026,7 @@ bool patcher_checkcast_instanceof_interface(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -1114,7 +1114,7 @@ bool patcher_checkcast_instanceof_class(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; diff --git a/src/vm/jit/powerpc/patcher.c b/src/vm/jit/powerpc/patcher.c index 7e063c594..dc05571a2 100644 --- a/src/vm/jit/powerpc/patcher.c +++ b/src/vm/jit/powerpc/patcher.c @@ -28,7 +28,7 @@ Changes: - $Id: patcher.c 3353 2005-10-05 13:30:10Z edwin $ + $Id: patcher.c 3461 2005-10-20 09:53:00Z edwin $ */ @@ -86,7 +86,7 @@ bool patcher_get_putstatic(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -153,7 +153,7 @@ bool patcher_get_putfield(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -234,7 +234,7 @@ bool patcher_builtin_new(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo_nonabstract(cr))) { + if (!(c = resolve_classref_eager_nonabstract(cr))) { PATCHER_MONITOREXIT; return false; @@ -306,7 +306,7 @@ bool patcher_builtin_newarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -375,7 +375,7 @@ bool patcher_builtin_multianewarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -443,7 +443,7 @@ bool patcher_builtin_arraycheckcast(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -516,7 +516,7 @@ bool patcher_builtin_arrayinstanceof(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -583,7 +583,7 @@ bool patcher_invokestatic_special(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -643,7 +643,7 @@ bool patcher_invokevirtual(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -710,7 +710,7 @@ bool patcher_invokeinterface(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -782,7 +782,7 @@ bool patcher_checkcast_instanceof_flags(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -843,7 +843,7 @@ bool patcher_checkcast_instanceof_interface(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -914,7 +914,7 @@ bool patcher_checkcast_class(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -976,7 +976,7 @@ bool patcher_instanceof_class(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; diff --git a/src/vm/jit/x86_64/patcher.c b/src/vm/jit/x86_64/patcher.c index 7c1a3c015..1e9f2c124 100644 --- a/src/vm/jit/x86_64/patcher.c +++ b/src/vm/jit/x86_64/patcher.c @@ -28,7 +28,7 @@ Changes: - $Id: patcher.c 3353 2005-10-05 13:30:10Z edwin $ + $Id: patcher.c 3461 2005-10-20 09:53:00Z edwin $ */ @@ -85,7 +85,7 @@ bool patcher_get_putstatic(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -156,7 +156,7 @@ bool patcher_get_putfield(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -235,7 +235,7 @@ bool patcher_putfieldconst(u1 *sp) /* get the fieldinfo */ - if (!(fi = helper_resolve_fieldinfo(uf))) { + if (!(fi = resolve_field_eager(uf))) { PATCHER_MONITOREXIT; return false; @@ -314,7 +314,7 @@ bool patcher_builtin_new(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo_nonabstract(cr))) { + if (!(c = resolve_classref_eager_nonabstract(cr))) { PATCHER_MONITOREXIT; return false; @@ -384,7 +384,7 @@ bool patcher_builtin_newarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -450,7 +450,7 @@ bool patcher_builtin_multianewarray(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -514,7 +514,7 @@ bool patcher_builtin_arraycheckcast(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -578,7 +578,7 @@ bool patcher_builtin_arrayinstanceof(u1 *sp) /* get the classinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -641,7 +641,7 @@ bool patcher_invokestatic_special(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -700,7 +700,7 @@ bool patcher_invokevirtual(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -762,7 +762,7 @@ bool patcher_invokeinterface(u1 *sp) /* get the fieldinfo */ - if (!(m = helper_resolve_methodinfo(um))) { + if (!(m = resolve_method_eager(um))) { PATCHER_MONITOREXIT; return false; @@ -828,7 +828,7 @@ bool patcher_checkcast_instanceof_flags(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -890,7 +890,7 @@ bool patcher_checkcast_instanceof_interface(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -956,7 +956,7 @@ bool patcher_checkcast_class(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; @@ -1015,7 +1015,7 @@ bool patcher_instanceof_class(u1 *sp) /* get the fieldinfo */ - if (!(c = helper_resolve_classinfo(cr))) { + if (!(c = resolve_classref_eager(cr))) { PATCHER_MONITOREXIT; return false; -- 2.25.1