Mercurial > hg > graal-jvmci-8
comparison graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java @ 2850:7474789a8120
Merge
author | Gilles Duboscq <gilles.duboscq@oracle.com> |
---|---|
date | Tue, 07 Jun 2011 11:19:01 +0200 |
parents | c061a6be3728 7596ae867a7b |
children | 14708c03abba |
comparison
equal
deleted
inserted
replaced
2849:463657856f86 | 2850:7474789a8120 |
---|---|
297 CiCallingConvention args = compilation.frameMap().incomingArguments(); | 297 CiCallingConvention args = compilation.frameMap().incomingArguments(); |
298 int bci = 0; | 298 int bci = 0; |
299 if (Modifier.isSynchronized(compilation.method.accessFlags())) { | 299 if (Modifier.isSynchronized(compilation.method.accessFlags())) { |
300 bci = Instruction.SYNCHRONIZATION_ENTRY_BCI; | 300 bci = Instruction.SYNCHRONIZATION_ENTRY_BCI; |
301 } | 301 } |
302 FrameState fs = new FrameState(bci, compilation.method.maxLocals(), 0, 0, compilation.graph); | 302 FrameState fs = new FrameState(compilation.method, bci, compilation.method.maxLocals(), 0, 0, compilation.graph); |
303 for (Node node : compilation.graph.start().usages()) { | 303 for (Node node : compilation.graph.start().usages()) { |
304 if (node instanceof Local) { | 304 if (node instanceof Local) { |
305 Local local = (Local) node; | 305 Local local = (Local) node; |
306 int i = local.index(); | 306 int i = local.index(); |
307 fs.storeLocal(i, local); | 307 fs.storeLocal(i, local); |