Mercurial > hg > truffle
changeset 16709:cd8284cfe935
small cleanup
author | Lukas Stadler <lukas.stadler@oracle.com> |
---|---|
date | Tue, 05 Aug 2014 10:06:08 +0200 |
parents | 3d177d06e47c |
children | 56bcde831179 |
files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java |
diffstat | 2 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java Wed Aug 06 15:05:34 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java Tue Aug 05 10:06:08 2014 +0200 @@ -52,11 +52,6 @@ } @Override - public boolean verify() { - return super.verify(); - } - - @Override public void generate(NodeLIRBuilderTool gen) { if (this.result() == null) { gen.getLIRGeneratorTool().emitReturn(null);
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Wed Aug 06 15:05:34 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Tue Aug 05 10:06:08 2014 +0200 @@ -385,7 +385,7 @@ * return value (top of stack) */ FrameState stateAfterReturn = stateAtReturn; - if (invokeReturnKind != Kind.Void && (alwaysDuplicateStateAfter || frameState.stackSize() > 0 && stateAfterReturn.stackAt(0) != frameState.stackAt(0))) { + if (invokeReturnKind != Kind.Void && (alwaysDuplicateStateAfter || (frameState.stackSize() > 0 && stateAfterReturn.stackAt(0) != frameState.stackAt(0)))) { stateAfterReturn = stateAtReturn.duplicateModified(invokeReturnKind, frameState.stackAt(0)); } frameState.replaceAndDelete(stateAfterReturn);