Mercurial > hg > truffle

diff src/share/vm/graal/graalCodeInstaller.cpp @ 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 f8d7ab42c479
children 0ac36a6d5ab0
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() {