Changeset 174371 in webkit for trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h

Timestamp:

Oct 6, 2014, 3:17:09 PM (11 years ago)

Author:

[email protected]

Message:

Fixed compiler warnings on Windows build.
<​https://webkit.org/b/135205>

Reviewed by Geoffrey Garen.

Benchmarking with jsc shows that perf is neutral with this change.

• assembler/MacroAssemblerX86_64.h:

(JSC::MacroAssemblerX86_64::call):

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::CodeBlock):

• dfg/DFGArgumentPosition.h:

(JSC::DFG::ArgumentPosition::mergeShouldNeverUnbox):
(JSC::DFG::ArgumentPosition::mergeArgumentUnboxingAwareness):

• dfg/DFGEdge.h:

(JSC::DFG::Edge::makeWord):

• dfg/DFGNodeFlags.h:

(JSC::DFG::nodeMayOverflow):
(JSC::DFG::nodeMayNegZero):

• dfg/DFGOSRExitCompilerCommon.cpp:

(JSC::DFG::reifyInlinedCallFrames):

• dfg/DFGVariableAccessData.cpp:

(JSC::DFG::VariableAccessData::mergeIsCaptured):

• dfg/DFGVariableAccessData.h:

(JSC::DFG::VariableAccessData::mergeIsProfitableToUnbox):
(JSC::DFG::VariableAccessData::mergeStructureCheckHoistingFailed):
(JSC::DFG::VariableAccessData::mergeCheckArrayHoistingFailed):
(JSC::DFG::VariableAccessData::mergeIsArgumentsAlias):
(JSC::DFG::VariableAccessData::mergeIsLoadedFrom):

• runtime/JSDataViewPrototype.cpp:

(JSC::getData):

File:

• trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h

@@ -65 +65 @@
     bool mergeShouldNeverUnbox(bool shouldNeverUnbox)
     {
-        return checkAndSet(m_shouldNeverUnbox, m_shouldNeverUnbox | shouldNeverUnbox);
+        return checkAndSet(m_shouldNeverUnbox, m_shouldNeverUnbox || shouldNeverUnbox);
     }
     
@@ -94 +94 @@
         for (unsigned i = 0; i < m_variables.size(); ++i) {
             VariableAccessData* variable = m_variables[i]->find();
-            changed |= checkAndSet(m_isProfitableToUnbox, m_isProfitableToUnbox | variable->isProfitableToUnbox());
+            changed |= checkAndSet(m_isProfitableToUnbox, m_isProfitableToUnbox || variable->isProfitableToUnbox());
         }
         if (!changed)