Mercurial > hg > graal-jvmci-8
diff graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java @ 2596:1c36b17f7ee0
new node layout: AccessMonitor, Invoke
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Thu, 05 May 2011 16:07:00 +0200 |
parents | 4a4dab936c1e |
children | f1bc67c2d453 |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Thu May 05 15:49:48 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Thu May 05 16:07:00 2011 +0200 @@ -901,7 +901,7 @@ private void appendInvoke(int opcode, RiMethod target, Value[] args, int cpi, RiConstantPool constantPool) { CiKind resultType = returnKind(target); - Value result = append(new Invoke(opcode, resultType.stackKind(), args, target, target.signature().returnType(compilation.method.holder()), null)); + Value result = append(new Invoke(opcode, resultType.stackKind(), args, target, target.signature().returnType(compilation.method.holder()), null, graph)); pushReturn(resultType, result); } @@ -1021,7 +1021,7 @@ lockAddress = new MonitorAddress(lockNumber); append(lockAddress); } - append(new MonitorExit(rootMethodSynchronizedObject, lockAddress, lockNumber, stateBefore)); + append(new MonitorExit(rootMethodSynchronizedObject, lockAddress, lockNumber, stateBefore, graph)); curState.unlock(); } append(new Return(x, !noSafepoints())); @@ -1041,7 +1041,7 @@ lockAddress = new MonitorAddress(lockNumber); append(lockAddress); } - MonitorEnter monitorEnter = new MonitorEnter(x, lockAddress, lockNumber, null); + MonitorEnter monitorEnter = new MonitorEnter(x, lockAddress, lockNumber, null, graph); appendWithoutOptimization(monitorEnter, bci); curState.lock(ir, x, lockNumber + 1); monitorEnter.setStateAfter(curState.immutableCopy(bci)); @@ -1058,7 +1058,7 @@ lockAddress = new MonitorAddress(lockNumber); append(lockAddress); } - appendWithoutOptimization(new MonitorExit(x, lockAddress, lockNumber, null), bci); + appendWithoutOptimization(new MonitorExit(x, lockAddress, lockNumber, null, graph), bci); curState.unlock(); killMemoryMap(); // prevent any optimizations across synchronization }