# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1380014687 -7200
# Node ID 099748a1a93121fb233ab30c091088fe767fa647
# Parent  3b25f37d5561339f871ed2b234f0cd5571cbd20b
added parentheses for clarity

diff -r 3b25f37d5561 -r 099748a1a931 graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java
--- 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);
diff -r 3b25f37d5561 -r 099748a1a931 graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotReturnOp.java
--- 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);