Changeset 195145 in webkit

Timestamp:

Jan 15, 2016 1:43:57 PM (8 years ago)

Author:

peavo@outlook.com

Message:

[B3][Win64] Compile fixes.
​https://bugs.webkit.org/show_bug.cgi?id=153127

Reviewed by Alex Christensen.

MSVC have several overloads of fmod, pow, and ceil. We need to suggest to MSVC
which one we want to use.

• b3/B3LowerMacros.cpp:
• b3/B3LowerMacrosAfterOptimizations.cpp:
• b3/B3MathExtras.cpp:

(JSC::B3::powDoubleInt32):

• b3/B3ReduceStrength.cpp:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• b3/B3LowerMacros.cpp (modified) (2 diffs)
• b3/B3LowerMacrosAfterOptimizations.cpp (modified) (1 diff)
• b3/B3MathExtras.cpp (modified) (1 diff)
• b3/B3ReduceStrength.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-01-15  Per Arne Vollan  <peavo@outlook.com>
+
+        [B3][Win64] Compile fixes.
+        https://bugs.webkit.org/show_bug.cgi?id=153127
+
+        Reviewed by Alex Christensen.
+
+        MSVC have several overloads of fmod, pow, and ceil. We need to suggest to MSVC
+        which one we want to use.
+
+        * b3/B3LowerMacros.cpp:
+        * b3/B3LowerMacrosAfterOptimizations.cpp:
+        * b3/B3MathExtras.cpp:
+        (JSC::B3::powDoubleInt32):
+        * b3/B3ReduceStrength.cpp:
+
 2016-01-15  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/b3/B3LowerMacros.cpp

@@ -77 +77 @@
             switch (m_value->opcode()) {
             case Mod: {
+                double (*fmodDouble)(double, double) = fmod;
                 if (m_value->type() == Double) {
-                    Value* functionAddress = m_insertionSet.insert<ConstPtrValue>(m_index, m_origin, fmod);
+                    Value* functionAddress = m_insertionSet.insert<ConstPtrValue>(m_index, m_origin, fmodDouble);
                     Value* result = m_insertionSet.insert<CCallValue>(m_index, Double, m_origin,
                         Effects::none(),
@@ -89 +90 @@
                     Value* numeratorAsDouble = m_insertionSet.insert<Value>(m_index, FloatToDouble, m_origin, m_value->child(0));
                     Value* denominatorAsDouble = m_insertionSet.insert<Value>(m_index, FloatToDouble, m_origin, m_value->child(1));
-                    Value* functionAddress = m_insertionSet.insert<ConstPtrValue>(m_index, m_origin, fmod);
+                    Value* functionAddress = m_insertionSet.insert<ConstPtrValue>(m_index, m_origin, fmodDouble);
                     Value* doubleMod = m_insertionSet.insert<CCallValue>(m_index, Double, m_origin,
                         Effects::none(),

trunk/Source/JavaScriptCore/b3/B3LowerMacrosAfterOptimizations.cpp

@@ -93 +93 @@
 
                 Value* functionAddress = nullptr;
+                double (*ceilDouble)(double) = ceil;
                 if (m_value->type() == Double)
-                    functionAddress = m_insertionSet.insert<ConstPtrValue>(m_index, m_origin, ceil);
+                    functionAddress = m_insertionSet.insert<ConstPtrValue>(m_index, m_origin, ceilDouble);
                 else if (m_value->type() == Float)
                     functionAddress = m_insertionSet.insert<ConstPtrValue>(m_index, m_origin, ceilf);

trunk/Source/JavaScriptCore/b3/B3MathExtras.cpp

@@ -59 +59 @@
     // Function call.
     Value* yAsDouble = functionCallCase->appendNew<Value>(procedure, IToD, origin, y);
+    double (*powDouble)(double, double) = pow;
     Value* powResult = functionCallCase->appendNew<CCallValue>(
         procedure, Double, origin,
-        functionCallCase->appendNew<ConstPtrValue>(procedure, origin, bitwise_cast<void*>(pow)),
+        functionCallCase->appendNew<ConstPtrValue>(procedure, origin, bitwise_cast<void*>(powDouble)),
         x, yAsDouble);
     UpsilonValue* powResultUpsilon = functionCallCase->appendNew<UpsilonValue>(procedure, origin, powResult);

trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp

@@ -949 +949 @@
         }
 
-        case CCall:
+        case CCall: {
             // Turn this: Call(fmod, constant1, constant2)
             // Into this: fcall-constant(constant1, constant2)
+            double(*fmodDouble)(double, double) = fmod;
             if (m_value->type() == Double
                 && m_value->numChildren() == 3
-                && m_value->child(0)->isIntPtr(reinterpret_cast<intptr_t>(fmod))
+                && m_value->child(0)->isIntPtr(reinterpret_cast<intptr_t>(fmodDouble))
                 && m_value->child(1)->type() == Double
                 && m_value->child(2)->type() == Double) {
@@ -960 +961 @@
             }
             break;
-
+        }
         case Equal:
             handleCommutativity();