Title: [152678] branches/safari-537-branch/Source/_javascript_Core

Diff

Modified: branches/safari-537-branch/Source/_javascript_Core/ChangeLog (152677 => 152678)


--- branches/safari-537-branch/Source/_javascript_Core/ChangeLog	2013-07-15 23:54:29 UTC (rev 152677)
+++ branches/safari-537-branch/Source/_javascript_Core/ChangeLog	2013-07-16 00:00:22 UTC (rev 152678)
@@ -1,5 +1,17 @@
 2013-07-15  Lucas Forschler  <[email protected]>
 
+        Merge r152577
+
+    2013-07-11  Oliver Hunt  <[email protected]>
+
+            Attempt to fix the windows build.
+
+            * jit/JITThunks.cpp:
+            (JSC::JITThunks::hostFunctionStub):
+            * jit/JITThunks.h:
+
+2013-07-15  Lucas Forschler  <[email protected]>
+
         Merge r152573
 
     2013-07-10  Oliver Hunt  <[email protected]>

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


--- branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.cpp	2013-07-15 23:54:29 UTC (rev 152677)
+++ branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.cpp	2013-07-16 00:00:22 UTC (rev 152678)
@@ -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;
 }
 

Modified: branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.h (152677 => 152678)


--- branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.h	2013-07-15 23:54:29 UTC (rev 152677)
+++ branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.h	2013-07-16 00:00:22 UTC (rev 152678)
@@ -64,7 +64,7 @@
 private:
     typedef HashMap<ThunkGenerator, MacroAssemblerCodeRef> CTIStubMap;
     CTIStubMap m_ctiStubMap;
-    typedef HashMap<pair<NativeFunction, NativeFunction>, Weak<NativeExecutable> > HostFunctionStubMap;
+    typedef HashMap<std::pair<NativeFunction, NativeFunction>, Weak<NativeExecutable> > HostFunctionStubMap;
     OwnPtr<HostFunctionStubMap> m_hostFunctionStubMap;
 };
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to