Mercurial > hg > truffle

changeset 3704:342a54994e05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made C++ changes to reflect changes to CiAssumptions.ConcreteMethod.
author Doug Simon <doug.simon@oracle.com>
date Tue, 29 Nov 2011 16:04:18 +0100
parents 50a1d38cd7ac
children 6917cd12e8f8
files src/share/vm/graal/graalCodeInstaller.cpp src/share/vm/graal/graalJavaAccess.hpp
diffstat 2 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Mon Nov 28 18:20:46 2011 -0800
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Tue Nov 29 16:04:18 2011 +0100
@@ -373,15 +373,13 @@
 }
 
 void CodeInstaller::assumption_ConcreteMethod(Handle assumption) {
-  Handle method_handle = CiAssumptions_ConcreteMethod::method(assumption());
-  methodHandle method = getMethodFromHotSpotMethod(method_handle());
-  ciMethod* m = (ciMethod*) CURRENT_ENV->get_object(method());
+  Handle impl_handle = CiAssumptions_ConcreteMethod::impl(assumption());
+  methodHandle impl = getMethodFromHotSpotMethod(impl_handle());
+  ciMethod* m = (ciMethod*) CURRENT_ENV->get_object(impl());
   
   Handle context_handle = CiAssumptions_ConcreteMethod::context(assumption());
-  methodHandle context = getMethodFromHotSpotMethod(context_handle());
-  ciMethod* c = (ciMethod*) CURRENT_ENV->get_object(context());
-  ciKlass* context_klass = c->holder();
-  _dependencies->assert_unique_concrete_method(context_klass, m);
+  ciKlass* context = (ciKlass*) CURRENT_ENV->get_object(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(context_handle)));
+  _dependencies->assert_unique_concrete_method(context, m);
 }
 
 void CodeInstaller::process_exception_handlers() {
--- a/src/share/vm/graal/graalJavaAccess.hpp	Mon Nov 28 18:20:46 2011 -0800
+++ b/src/share/vm/graal/graalJavaAccess.hpp	Tue Nov 29 16:04:18 2011 +0100
@@ -112,8 +112,9 @@
     oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/sun/cri/ri/RiResolvedType;")\
   end_class                                                                             \
   start_class(CiAssumptions_ConcreteMethod)                                             \
-    oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/sun/cri/ri/RiMethod;")       \
-    oop_field(CiAssumptions_ConcreteMethod, method, "Lcom/sun/cri/ri/RiMethod;")        \
+  oop_field(CiAssumptions_ConcreteMethod, method, "Lcom/sun/cri/ri/RiResolvedMethod;")       \
+    oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/sun/cri/ri/RiResolvedType;")       \
+    oop_field(CiAssumptions_ConcreteMethod, impl, "Lcom/sun/cri/ri/RiResolvedMethod;")        \
   end_class                                                                             \
   start_class(CiTargetMethod_Site)                                                      \
     int_field(CiTargetMethod_Site, pcOffset)                                            \