Mercurial > hg > graal-compiler
comparison graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java @ 2829:27c00b180416
fix merge error
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Tue, 31 May 2011 09:51:59 +0200 |
parents | 9ba6a8abe894 |
children | 706047ee5f2e bfce42cd9c07 |
comparison
equal
deleted
inserted
replaced
2828:d6f3dbb4e3b5 | 2829:27c00b180416 |
---|---|
827 appendInvoke(INVOKESPECIAL, target, args, cpi, constantPool); | 827 appendInvoke(INVOKESPECIAL, target, args, cpi, constantPool); |
828 } | 828 } |
829 | 829 |
830 private void appendInvoke(int opcode, RiMethod target, Value[] args, int cpi, RiConstantPool constantPool) { | 830 private void appendInvoke(int opcode, RiMethod target, Value[] args, int cpi, RiConstantPool constantPool) { |
831 CiKind resultType = returnKind(target); | 831 CiKind resultType = returnKind(target); |
832 Invoke invoke = new Invoke(opcode, resultType.stackKind(), args, target, target.signature().returnType(compilation.method.holder()), graph, bci()); | 832 Invoke invoke = new Invoke(bci(), opcode, resultType.stackKind(), args, target, target.signature().returnType(compilation.method.holder()), graph); |
833 Value result = appendWithBCI(invoke); | 833 Value result = appendWithBCI(invoke); |
834 handleException(invoke, bci()); | 834 handleException(invoke, bci()); |
835 frameState.pushReturn(resultType, result); | 835 frameState.pushReturn(resultType, result); |
836 } | 836 } |
837 | 837 |