Mercurial > hg > truffle

changeset 18337:3432571b7189

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ignore non-existing special static fields
author Doug Simon <doug.simon@oracle.com>
date Tue, 11 Nov 2014 13:37:42 +0100
parents fbd92038a434
children c4f374adce13
files graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/remote/Context.java
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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<Object, Field> SpecialStaticFields = new IdentityHashMap<>();
     static {
+        registerStaticField(ArrayList.class, "EMPTY_ELEMENTDATA");
         registerStaticField(ArrayList.class, "DEFAULTCAPACITY_EMPTY_ELEMENTDATA");
     }