# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1306828319 -7200
# Node ID 27c00b180416c678927c6d0ec5f04b2dea257736
# Parent  d6f3dbb4e3b57e3785f4534876717d81913161d8
fix merge error

diff -r d6f3dbb4e3b5 -r 27c00b180416 graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Mon May 30 18:47:33 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Tue May 31 09:51:59 2011 +0200
@@ -829,7 +829,7 @@
 
     private void appendInvoke(int opcode, RiMethod target, Value[] args, int cpi, RiConstantPool constantPool) {
         CiKind resultType = returnKind(target);
-        Invoke invoke = new Invoke(opcode, resultType.stackKind(), args, target, target.signature().returnType(compilation.method.holder()), graph, bci());
+        Invoke invoke = new Invoke(bci(), opcode, resultType.stackKind(), args, target, target.signature().returnType(compilation.method.holder()), graph);
         Value result = appendWithBCI(invoke);
         handleException(invoke, bci());
         frameState.pushReturn(resultType, result);
diff -r d6f3dbb4e3b5 -r 27c00b180416 graal/GraalCompiler/src/com/sun/c1x/ir/Invoke.java
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Invoke.java	Mon May 30 18:47:33 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Invoke.java	Tue May 31 09:51:59 2011 +0200
@@ -93,7 +93,7 @@
      * @param target the target method being called
      * @param stateBefore the state before executing the invocation
      */
-    public Invoke(int opcode, CiKind result, Value[] args, RiMethod target, RiType returnType, Graph graph, int bci) {
+    public Invoke(int bci, int opcode, CiKind result, Value[] args, RiMethod target, RiType returnType, Graph graph) {
         super(result, args.length, SUCCESSOR_COUNT, graph);
         this.opcode = opcode;
         this.target = target;
@@ -185,7 +185,7 @@
 
     @Override
     public Node copy(Graph into) {
-        Invoke x = new Invoke(opcode, kind, new Value[argumentCount], target, returnType, into);
+        Invoke x = new Invoke(bci, opcode, kind, new Value[argumentCount], target, returnType, into);
         x.setNonNull(isNonNull());
         return x;
     }