Mercurial > hg > graal-jvmci-8
changeset 21299:21993236a219
Merge fix
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Mon, 11 May 2015 18:12:31 -0700 |
parents | 7e72615e0441 |
children | 31dcb86ad3a6 |
files | graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java Mon May 11 17:56:16 2015 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java Mon May 11 18:12:31 2015 -0700 @@ -235,7 +235,7 @@ IntrinsicContext intrinsic = parser.replacementContext.asIntrinsic(); if (intrinsic != null) { // Attribute to the method being replaced - return new BytecodePosition(FrameState.toBytecodePosition(intrinsic.getInvokeStateBefore(parser.getGraph(), parent)), intrinsic.method, -1); + return new BytecodePosition(parent.getFrameState().createBytecodePosition(parent.bci()), intrinsic.method, -1); } } // If this is the recursive call in a partial intrinsification