[webkit-changes] [152577] trunk/Source/JavaScriptCore

Thu, 11 Jul 2013 14:56:16 -0700

Title: [152577] trunk/Source/_javascript_Core
Revision
152577
Author
[email protected]
Date
2013-07-11 14:57:18 -0700 (Thu, 11 Jul 2013)

Log Message

Attempt to fix the windows build.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (152576 => 152577)


--- trunk/Source/_javascript_Core/ChangeLog	2013-07-11 21:40:31 UTC (rev 152576)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-07-11 21:57:18 UTC (rev 152577)
@@ -1,3 +1,11 @@
+2013-07-11  Oliver Hunt  <[email protected]>
+
+        Attempt to fix the windows build.
+
+        * jit/JITThunks.cpp:
+        (JSC::JITThunks::hostFunctionStub):
+        * jit/JITThunks.h:
+
 2013-07-10  Oliver Hunt  <[email protected]>
 
         NativeExecutable cache needs to use both call and construct functions for key

Modified: trunk/Source/_javascript_Core/jit/JITThunks.cpp (152576 => 152577)


--- trunk/Source/_javascript_Core/jit/JITThunks.cpp	2013-07-11 21:40:31 UTC (rev 152576)
+++ trunk/Source/_javascript_Core/jit/JITThunks.cpp	2013-07-11 21:57:18 UTC (rev 152577)
@@ -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: trunk/Source/_javascript_Core/jit/JITThunks.h (152576 => 152577)


--- trunk/Source/_javascript_Core/jit/JITThunks.h	2013-07-11 21:40:31 UTC (rev 152576)
+++ trunk/Source/_javascript_Core/jit/JITThunks.h	2013-07-11 21:57:18 UTC (rev 152577)
@@ -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