Modified: branches/safari-534.51-branch/Source/_javascript_Core/ChangeLog (91402 => 91403)
--- branches/safari-534.51-branch/Source/_javascript_Core/ChangeLog 2011-07-20 21:09:17 UTC (rev 91402)
+++ branches/safari-534.51-branch/Source/_javascript_Core/ChangeLog 2011-07-20 21:09:28 UTC (rev 91403)
@@ -1,5 +1,33 @@
2011-06-20 Lucas Forschler <[email protected]>
+ Merged 90232.
+
+ 2011-07-01 David Kilzer <[email protected]>
+
+ <http://webkit.org/b/63814> Fix clang build error in JITOpcodes32_64.cpp
+
+ Fixes the following build error in clang:
+
+ _javascript_Core/jit/JITOpcodes32_64.cpp:741:36:{741:9-741:35}: error: operator '?:' has lower precedence than '+'; '+' will be evaluated first [-Werror,-Wparentheses,3]
+ map(m_bytecodeOffset + dynamic ? OPCODE_LENGTH(op_resolve_global_dynamic) : OPCODE_LENGTH(op_resolve_global), dst, regT1, regT0);
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
+ _javascript_Core/jit/JITOpcodes32_64.cpp:741:36: note: place parentheses around the '+' _expression_ to silence this warning [3]
+ map(m_bytecodeOffset + dynamic ? OPCODE_LENGTH(op_resolve_global_dynamic) : OPCODE_LENGTH(op_resolve_global), dst, regT1, regT0);
+ ^
+ ( )
+ fix-it:"_javascript_Core/jit/JITOpcodes32_64.cpp":{741:9-741:9}:"("
+ fix-it:"_javascript_Core/jit/JITOpcodes32_64.cpp":{741:35-741:35}:")"
+ _javascript_Core/jit/JITOpcodes32_64.cpp:741:36:{741:28-741:94}: note: place parentheses around the '?:' _expression_ to evaluate it first [3]
+ map(m_bytecodeOffset + dynamic ? OPCODE_LENGTH(op_resolve_global_dynamic) : OPCODE_LENGTH(op_resolve_global), dst, regT1, regT0);
+ ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 1 error generated.
+
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_resolve_global): Add parenthesis to make the
+ tertiary _expression_ evaluate first.
+
+2011-06-20 Lucas Forschler <[email protected]>
+
Merged 89281.
2011-06-20 Oliver Hunt <[email protected]>
Modified: branches/safari-534.51-branch/Source/_javascript_Core/jit/JITOpcodes32_64.cpp (91402 => 91403)
--- branches/safari-534.51-branch/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2011-07-20 21:09:17 UTC (rev 91402)
+++ branches/safari-534.51-branch/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2011-07-20 21:09:28 UTC (rev 91403)
@@ -845,7 +845,7 @@
load32(BaseIndex(regT2, regT3, TimesEight, OBJECT_OFFSETOF(JSValue, u.asBits.payload)), regT0); // payload
load32(BaseIndex(regT2, regT3, TimesEight, OBJECT_OFFSETOF(JSValue, u.asBits.tag)), regT1); // tag
emitStore(dst, regT1, regT0);
- map(m_bytecodeOffset + dynamic ? OPCODE_LENGTH(op_resolve_global_dynamic) : OPCODE_LENGTH(op_resolve_global), dst, regT1, regT0);
+ map(m_bytecodeOffset + (dynamic ? OPCODE_LENGTH(op_resolve_global_dynamic) : OPCODE_LENGTH(op_resolve_global)), dst, regT1, regT0);
}
void JIT::emitSlow_op_resolve_global(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
