OpenJDK / graal / graal-jvmci-8
changeset 2829:27c00b180416
fix merge error
| author | Lukas Stadler <lukas.stadler@jku.at> |
|---|---|
| date | Tue, 31 May 2011 09:51:59 +0200 |
| parents | d6f3dbb4e3b5 |
| children | 706047ee5f2e bfce42cd9c07 |
| files | graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java graal/GraalCompiler/src/com/sun/c1x/ir/Invoke.java |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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; }