Mercurial > hg > graal-compiler
changeset 3497:5d03d0509cd9
Merge fix.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Mon, 08 Aug 2011 12:09:50 +0200 |
parents | a6210c7dadde |
children | 1384a953d503 |
files | graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/asm/TargetMethodAssembler.java graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.FrameModifier graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.InliningGuide graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.Intrinsifier graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.Optimizer |
diffstat | 5 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/asm/TargetMethodAssembler.java Sun Aug 07 18:05:52 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/asm/TargetMethodAssembler.java Mon Aug 08 12:09:50 2011 +0200 @@ -163,14 +163,14 @@ CiDebugInfo debugInfo = info != null ? info.debugInfo() : null; assert lastSafepointPos < posAfter; lastSafepointPos = posAfter; - targetMethod.recordCall(posBefore, target, debugInfo, true); + targetMethod.recordCall(posBefore, posAfter - posBefore, target, debugInfo, true); } public void recordIndirectCall(int posBefore, int posAfter, Object target, LIRDebugInfo info) { CiDebugInfo debugInfo = info != null ? info.debugInfo() : null; assert lastSafepointPos < posAfter; lastSafepointPos = posAfter; - targetMethod.recordCall(posBefore, target, debugInfo, false); + targetMethod.recordCall(posBefore, posAfter - posBefore, target, debugInfo, false); } public void recordSafepoint(int pos, LIRDebugInfo info) {
--- a/graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.FrameModifier Sun Aug 07 18:05:52 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -com.oracle.max.graal.examples.deopt.FrameModifierImpl \ No newline at end of file
--- a/graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.InliningGuide Sun Aug 07 18:05:52 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -com.oracle.max.graal.examples.inlining.InliningGuideImpl \ No newline at end of file