Mercurial > hg > truffle

changeset 11762:099748a1a931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added parentheses for clarity
author Doug Simon <doug.simon@oracle.com>
date Tue, 24 Sep 2013 11:24:47 +0200
parents 3b25f37d5561
children 8f6917d1205f
files graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotReturnOp.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java	Tue Sep 24 10:32:07 2013 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java	Tue Sep 24 11:24:47 2013 +0200
@@ -64,7 +64,7 @@
     @Override
     public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) {
         leaveFrameAndRestoreRbp(tasm, masm);
-        if (!isStub && tasm.frameContext != null || !OptEliminateSafepoints.getValue()) {
+        if (!isStub && (tasm.frameContext != null || !OptEliminateSafepoints.getValue())) {
             AMD64HotSpotSafepointOp.emitCode(tasm, masm, graalRuntime().getConfig(), true, null, scratchForSafepointOnReturn);
         }
         masm.ret(0);
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotReturnOp.java	Tue Sep 24 10:32:07 2013 +0200
+++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotReturnOp.java	Tue Sep 24 11:24:47 2013 +0200
@@ -49,7 +49,7 @@
 
     @Override
     public void emitCode(TargetMethodAssembler tasm, SPARCMacroAssembler masm) {
-        if (!isStub && tasm.frameContext != null || !OptEliminateSafepoints.getValue()) {
+        if (!isStub && (tasm.frameContext != null || !OptEliminateSafepoints.getValue())) {
             // Using the same scratch register as LIR_Assembler::return_op
             // in c1_LIRAssembler_sparc.cpp
             SPARCHotSpotSafepointOp.emitCode(tasm, masm, graalRuntime().getConfig(), true, null, SPARC.l0);