Changeset 174455 in webkit for trunk/Source/JavaScriptCore/dfg

Timestamp:

Oct 8, 2014, 9:18:03 AM (11 years ago)

Author:

Brent Fulgham

Message:

[Win] Resolve some static analysis warnings in JavaScriptCore
​https://bugs.webkit.org/show_bug.cgi?id=137508

Reviewed by Geoffrey Garen.

• API/tests/testapi.c:

(assertEqualsAsCharactersPtr): MSVC insists on using %Iu as its format specifier
for size_t. Make the format string conditional on Windows.

• bytecode/Watchpoint.h:

(JSC::InlineWatchpointSet::encodeState): Silence warning about left-shifting 'state'
as a 32-bit value before OR-ing it with a 64-bit value.

• dfg/DFGFixupPhase.cpp:

(JSC::DFG::FixupPhase::fixupNode): Silence warning about operator prescedence

causing the

operation to take place before the >= test.

• dfg/DFGInPlaceAbstractState.cpp:

(JSC::DFG::InPlaceAbstractState::endBasicBlock): Ditto (

before !=)

• testRegExp.cpp:

(testOneRegExp): Ditto %Iu format specifier.

• yarr/YarrInterpreter.cpp:

(JSC::Yarr::Interpreter::allocParenthesesDisjunctionContext): Silence warning about
using a 32-bit value as part of a 64-bit calculation.

Location:

trunk/Source/JavaScriptCore/dfg

Files:

• DFGFixupPhase.cpp (modified) (2 diffs)
• DFGInPlaceAbstractState.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp

@@ -440 +440 @@
                 break;
             }
-            if (node->child1()->shouldSpeculateString() && node->child2()->shouldSpeculateString() && (GPRInfo::numberOfRegisters >= 7 || isFTL(m_graph.m_plan.mode))) {
+            if (node->child1()->shouldSpeculateString() && node->child2()->shouldSpeculateString() && ((GPRInfo::numberOfRegisters >= 7) || isFTL(m_graph.m_plan.mode))) {
                 fixEdge<StringUse>(node->child1());
                 fixEdge<StringUse>(node->child2());
@@ -470 +470 @@
                 break;
             }
-            if (node->child1()->shouldSpeculateString() && (GPRInfo::numberOfRegisters >= 8 || isFTL(m_graph.m_plan.mode))) {
+            if (node->child1()->shouldSpeculateString() && ((GPRInfo::numberOfRegisters >= 8) || isFTL(m_graph.m_plan.mode))) {
                 fixEdge<StringUse>(node->child1());
                 break;
             }
-            if (node->child2()->shouldSpeculateString() && (GPRInfo::numberOfRegisters >= 8 || isFTL(m_graph.m_plan.mode))) {
+            if (node->child2()->shouldSpeculateString() && ((GPRInfo::numberOfRegisters >= 8) || isFTL(m_graph.m_plan.mode))) {
                 fixEdge<StringUse>(node->child2());
                 break;

trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp

@@ -195 +195 @@
     bool changed = false;
     
-    if (mergeMode != DontMerge || !ASSERT_DISABLED) {
+    if ((mergeMode != DontMerge) || !ASSERT_DISABLED) {
         changed |= checkAndSet(block->cfaStructureClobberStateAtTail, m_structureClobberState);