# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1312807021 -7200
# Node ID dd3ecadecc60e49a39d00b68b47adef09cdd2cb5
# Parent  1384a953d503900e2fe7b3a1dceacb1301ec3cf6# Parent  ef79e8b2c4374193e09bdcc9a924e932560259b1
Merge.

diff -r ef79e8b2c437 -r dd3ecadecc60 .hgignore
--- a/.hgignore	Mon Aug 08 12:16:19 2011 +0200
+++ b/.hgignore	Mon Aug 08 14:37:01 2011 +0200
@@ -29,6 +29,7 @@
 ^graal/hotspot/java$
 ^scratch/
 scratch/
+bin/
 ^local/
 ^src/share/tools/hsdis/build/
 ^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/
diff -r ef79e8b2c437 -r dd3ecadecc60 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/asm/TargetMethodAssembler.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/asm/TargetMethodAssembler.java	Mon Aug 08 12:16:19 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/asm/TargetMethodAssembler.java	Mon Aug 08 14:37:01 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) {
diff -r ef79e8b2c437 -r dd3ecadecc60 graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.FrameModifier
--- a/graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.FrameModifier	Mon Aug 08 12:16:19 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
diff -r ef79e8b2c437 -r dd3ecadecc60 graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.InliningGuide
--- a/graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.InliningGuide	Mon Aug 08 12:16:19 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
diff -r ef79e8b2c437 -r dd3ecadecc60 graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.Intrinsifier
--- a/graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.Intrinsifier	Mon Aug 08 12:16:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-com.oracle.max.graal.examples.intrinsics.IntrinsifierImpl
\ No newline at end of file
diff -r ef79e8b2c437 -r dd3ecadecc60 graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.Optimizer
--- a/graal/com.oracle.max.graal.examples/bin/META-INF/services/com.oracle.max.graal.extensions.Optimizer	Mon Aug 08 12:16:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-com.oracle.max.graal.examples.opt.OptimizerImpl
\ No newline at end of file