# HG changeset patch # User Doug Simon # Date 1415709462 -3600 # Node ID 3432571b7189848fa794a8d5a2fdacf752277475 # Parent fbd92038a43414f1b201a7878ddf861b56b06b8e ignore non-existing special static fields diff -r fbd92038a434 -r 3432571b7189 graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/remote/Context.java --- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/remote/Context.java Tue Nov 11 11:45:23 2014 +0100 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/remote/Context.java Tue Nov 11 13:37:42 2014 +0100 @@ -101,6 +101,8 @@ Object obj = f.get(null); Field existing = SpecialStaticFields.put(obj, f); assert existing == null; + } catch (NoSuchFieldException e) { + // ignore non-existing fields } catch (Exception e) { throw new GraalInternalError(e); } @@ -111,6 +113,7 @@ */ private static final Map SpecialStaticFields = new IdentityHashMap<>(); static { + registerStaticField(ArrayList.class, "EMPTY_ELEMENTDATA"); registerStaticField(ArrayList.class, "DEFAULTCAPACITY_EMPTY_ELEMENTDATA"); }