Title: [152811] branches/safari-537-branch/Source/_javascript_Core
Revision
152811
Author
[email protected]
Date
2013-07-17 16:06:44 -0700 (Wed, 17 Jul 2013)

Log Message

Merged r152600.  <rdar://problem/14474400>

Modified Paths

Diff

Modified: branches/safari-537-branch/Source/_javascript_Core/ChangeLog (152810 => 152811)


--- branches/safari-537-branch/Source/_javascript_Core/ChangeLog	2013-07-17 23:05:32 UTC (rev 152810)
+++ branches/safari-537-branch/Source/_javascript_Core/ChangeLog	2013-07-17 23:06:44 UTC (rev 152811)
@@ -1,5 +1,20 @@
 2013-07-17  Lucas Forschler  <[email protected]>
 
+        Merge r152600
+
+    2013-07-12  Brent Fulgham  <[email protected]>
+
+            [Windows] Build correction after r152573/r152577.
+            https://bugs.webkit.org/show_bug.cgi?id=118610
+
+            Reviewed by Oliver Hunt.
+
+            * jit/JITThunks.cpp:
+            (JSC::JITThunks::hostFunctionStub): Hand-feed MSVC++ the fact that we want the second
+            argument of the make_pair to be a function pointer.
+
+2013-07-17  Lucas Forschler  <[email protected]>
+
         Merge r152742
 
     2013-07-16  Filip Pizlo  <[email protected]>

Modified: branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.cpp (152810 => 152811)


--- branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.cpp	2013-07-17 23:05:32 UTC (rev 152810)
+++ branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.cpp	2013-07-17 23:06:44 UTC (rev 152811)
@@ -71,17 +71,17 @@
 
 NativeExecutable* JITThunks::hostFunctionStub(VM* vm, NativeFunction function, NativeFunction constructor)
 {
-    if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap->get(std::make_pair(*function, *constructor)))
+    if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap->get(std::make_pair(function, constructor)))
         return nativeExecutable;
 
     NativeExecutable* nativeExecutable = NativeExecutable::create(*vm, JIT::compileCTINativeCall(vm, function), function, MacroAssemblerCodeRef::createSelfManagedCodeRef(ctiNativeConstruct(vm)), constructor, NoIntrinsic);
-    weakAdd(*m_hostFunctionStubMap, std::make_pair(*function, *constructor), PassWeak<NativeExecutable>(nativeExecutable));
+    weakAdd(*m_hostFunctionStubMap, std::make_pair(function, constructor), PassWeak<NativeExecutable>(nativeExecutable));
     return nativeExecutable;
 }
 
 NativeExecutable* JITThunks::hostFunctionStub(VM* vm, NativeFunction function, ThunkGenerator generator, Intrinsic intrinsic)
 {
-    if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap->get(std::make_pair(*function, *callHostFunctionAsConstructor)))
+    if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap->get(std::make_pair(function, &callHostFunctionAsConstructor)))
         return nativeExecutable;
 
     MacroAssemblerCodeRef code;
@@ -94,7 +94,7 @@
         code = JIT::compileCTINativeCall(vm, function);
 
     NativeExecutable* nativeExecutable = NativeExecutable::create(*vm, code, function, MacroAssemblerCodeRef::createSelfManagedCodeRef(ctiNativeConstruct(vm)), callHostFunctionAsConstructor, intrinsic);
-    weakAdd(*m_hostFunctionStubMap, std::make_pair(*function, *callHostFunctionAsConstructor), PassWeak<NativeExecutable>(nativeExecutable));
+    weakAdd(*m_hostFunctionStubMap, std::make_pair(function, &callHostFunctionAsConstructor), PassWeak<NativeExecutable>(nativeExecutable));
     return nativeExecutable;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to