# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1354044855 -3600
# Node ID c37022832f1a0df74ec2ba845de3fc62111d9281
# Parent  2841e28b5f419592e8390458a55304f2195934e9
rename: findFieldWithOffset -> findInstanceFieldWithOffset

diff -r 2841e28b5f41 -r c37022832f1a graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java	Tue Nov 27 20:32:52 2012 +0100
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java	Tue Nov 27 20:34:15 2012 +0100
@@ -53,7 +53,7 @@
                 ResolvedJavaField rf = lookupField(type.getInstanceFields(true), f);
                 assertNotNull(rf);
                 long offset = isStatic(f.getModifiers()) ? unsafe.staticFieldOffset(f) : unsafe.objectFieldOffset(f);
-                ResolvedJavaField result = type.findFieldWithOffset(offset);
+                ResolvedJavaField result = type.findInstanceFieldWithOffset(offset);
                 assertNotNull(result);
                 assertTrue(fieldsEqual(f, result));
             }
diff -r 2841e28b5f41 -r c37022832f1a graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java	Tue Nov 27 20:32:52 2012 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java	Tue Nov 27 20:34:15 2012 +0100
@@ -244,10 +244,11 @@
     Class< ? > toJava();
 
     /**
-     * Returns the instance field of this class (or one of its super classes) at the given offset, or {@code null} if there is no such field.
+     * Returns the instance field of this class (or one of its super classes) at the given
+     * offset, or {@code null} if there is no such field.
      *
      * @param offset the offset of the field to look for
      * @return the field with the given offset, or {@code null} if there is no such field.
      */
-    ResolvedJavaField findFieldWithOffset(long offset);
+    ResolvedJavaField findInstanceFieldWithOffset(long offset);
 }
diff -r 2841e28b5f41 -r c37022832f1a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java	Tue Nov 27 20:32:52 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java	Tue Nov 27 20:34:15 2012 +0100
@@ -497,7 +497,7 @@
     }
 
     @Override
-    public ResolvedJavaField findFieldWithOffset(long offset) {
+    public ResolvedJavaField findInstanceFieldWithOffset(long offset) {
         ResolvedJavaField[] declaredFields = getInstanceFields(true);
         for (ResolvedJavaField field : declaredFields) {
             if (((HotSpotResolvedJavaField) field).offset() == offset) {
diff -r 2841e28b5f41 -r c37022832f1a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java	Tue Nov 27 20:32:52 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java	Tue Nov 27 20:34:15 2012 +0100
@@ -184,7 +184,7 @@
     }
 
     @Override
-    public ResolvedJavaField findFieldWithOffset(long offset) {
+    public ResolvedJavaField findInstanceFieldWithOffset(long offset) {
         return null;
     }
 
diff -r 2841e28b5f41 -r c37022832f1a graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java	Tue Nov 27 20:32:52 2012 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java	Tue Nov 27 20:34:15 2012 +0100
@@ -78,6 +78,6 @@
 
     @Override
     public int fieldIndexForOffset(long constantOffset) {
-        return fieldIndex(type.findFieldWithOffset(constantOffset));
+        return fieldIndex(type.findInstanceFieldWithOffset(constantOffset));
     }
 }