--- a/src/share/vm/graal/graalCompilerToVM.cpp	Fri Oct 11 10:38:03 2013 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Fri Oct 11 15:41:33 2013 +0200
@@ -22,10 +22,10 @@
  */
 
 #include "precompiled.hpp"
-#include "runtime/fieldDescriptor.hpp"
 #include "memory/oopFactory.hpp"
 #include "oops/generateOopMap.hpp"
 #include "oops/fieldStreams.hpp"
+#include "runtime/fieldDescriptor.hpp"
 #include "runtime/javaCalls.hpp"
 #include "graal/graalRuntime.hpp"
 #include "compiler/compileBroker.hpp"
@@ -509,16 +509,15 @@
   AccessFlags flags;
   BasicType basic_type;
   if (holder->klass() == SystemDictionary::HotSpotResolvedObjectType_klass()) {
-    FieldAccessInfo result;
-    LinkResolver::resolve_field(result, cp, cp_index,
-                                Bytecodes::java_code(code),
-                                true, false, Thread::current());
+    fieldDescriptor result;
+    LinkResolver::resolve_field_access(result, cp, cp_index, Bytecodes::java_code(code), true, false, Thread::current());
+
     if (HAS_PENDING_EXCEPTION) {
       CLEAR_PENDING_EXCEPTION;
     } else {
-      offset = result.field_offset();
+      offset = result.offset();
       flags = result.access_flags();
-      holder_klass = result.klass()();
+      holder_klass = result.field_holder();
       basic_type = result.field_type();
       holder = GraalCompiler::get_JavaType(holder_klass, CHECK_NULL);
     }
@@ -1138,8 +1137,8 @@
 
 C2V_VMENTRY(jobject, readUnsafeUncompressedPointer, (JNIEnv *env, jobject, jobject o, jlong offset))
   oop resolved_o = JNIHandles::resolve(o);
-  jlong address = offset + (jlong)resolved_o;
-  return JNIHandles::make_local(*((oop*)address));
+  address addr = offset + (address)resolved_o;
+  return JNIHandles::make_local(*((oop*)addr));
 C2V_END
 
 C2V_VMENTRY(jlong, readUnsafeKlassPointer, (JNIEnv *env, jobject, jobject o))