diff --git a/openjdk/sun/reflect/Reflection.java b/openjdk/sun/reflect/Reflection.java index 02284641..5d237a63 100644 --- a/openjdk/sun/reflect/Reflection.java +++ b/openjdk/sun/reflect/Reflection.java @@ -58,6 +58,9 @@ public class Reflection { fieldFilterMap = map; methodFilterMap = new HashMap(); + // [IKVM] to avoid initialization order issues, we actually add + // Unsafe.getUnsafe() here, instead of in Unsafe's class initializer + methodFilterMap.put(sun.misc.Unsafe.class, new String[] {"getUnsafe"}); } /** Returns the class of the method realFramesToSkip