Mercurial > hg > truffle
changeset 5496:80abea6e5e27
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 06 Jun 2012 17:20:15 +0200 |
parents | c78cf0abfdff (diff) e26e6dca0bcf (current diff) |
children | a4dfee0b8fbd |
files | |
diffstat | 3 files changed, 0 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Tue Jun 05 21:43:42 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Wed Jun 06 17:20:15 2012 +0200 @@ -479,7 +479,6 @@ return hsInfo; } - @Override public void installMethod(RiResolvedMethod method, CiTargetMethod code, RiCodeInfo[] info) { HotSpotCodeInfo hsInfo = makeInfo(method, code, info); compiler.getCompilerToVM().installMethod(new HotSpotTargetMethod(compiler, (HotSpotMethodResolved) method, code), true, hsInfo);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Tue Jun 05 21:43:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Wed Jun 06 17:20:15 2012 +0200 @@ -24,8 +24,6 @@ import java.lang.reflect.*; -import sun.misc.*; - import com.oracle.graal.cri.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*;
--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRuntime.java Tue Jun 05 21:43:42 2012 +0200 +++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRuntime.java Wed Jun 06 17:20:15 2012 +0200 @@ -119,16 +119,6 @@ RiResolvedMethod getRiMethod(Method reflectionMethod); /** - * Installs some given machine code as the implementation of a given method. - * - * @param method a method whose executable code is being modified - * @param code the code to be executed when {@code method} is called - * @param info the object into which details of the installed code will be written. - * Ignored if null, otherwise the info is written to index 0 of this array. - */ - void installMethod(RiResolvedMethod method, CiTargetMethod code, RiCodeInfo[] info); - - /** * Adds the given machine code as an implementation of the given method without making it the default implementation. * @param method a method to which the executable code is begin added * @param code the code to be added