Modified: trunk/Source/_javascript_Core/ChangeLog (152599 => 152600)
--- trunk/Source/_javascript_Core/ChangeLog 2013-07-12 18:36:25 UTC (rev 152599)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-07-12 18:54:07 UTC (rev 152600)
@@ -1,3 +1,14 @@
+2013-07-12 Brent Fulgham <bfulg...@apple.com>
+
+ [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-11 Oliver Hunt <oli...@apple.com>
Attempt to fix the windows build.
Modified: trunk/Source/_javascript_Core/jit/JITThunks.cpp (152599 => 152600)
--- trunk/Source/_javascript_Core/jit/JITThunks.cpp 2013-07-12 18:36:25 UTC (rev 152599)
+++ trunk/Source/_javascript_Core/jit/JITThunks.cpp 2013-07-12 18:54:07 UTC (rev 152600)
@@ -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;
}
