Mercurial > hg > truffle
diff src/share/vm/graal/graalCodeInstaller.hpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 8e9ffa7c714b |
children | bf2ea3ed3bce |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.hpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/graal/graalCodeInstaller.hpp Mon Nov 12 23:14:12 2012 +0100 @@ -57,7 +57,6 @@ ciEnv* _env; oop _comp_result; - oop _hotspot_method; oop _name; arrayOop _sites; arrayOop _exception_handlers; @@ -86,7 +85,7 @@ public: // constructor used to create a method - CodeInstaller(Handle& target_method, nmethod*& nm, bool install_code); + CodeInstaller(Handle& comp_result, methodHandle method, nmethod*& nm, bool bind_to_method); // constructor used to create a stub CodeInstaller(Handle& target_method, BufferBlob*& blob, jlong& id); @@ -94,8 +93,8 @@ static address runtime_call_target_address(oop runtime_call); private: - // extract the fields of the InstalledCode - void initialize_fields(oop target_method); + // extract the fields of the CompilationResult + void initialize_fields(oop target_method, methodHandle method); void initialize_assumptions(oop target_method); // perform data and call relocation on the CodeBuffer