Modified: branches/safari-537-branch/Source/_javascript_Core/ChangeLog (152818 => 152819)
--- branches/safari-537-branch/Source/_javascript_Core/ChangeLog 2013-07-17 23:43:53 UTC (rev 152818)
+++ branches/safari-537-branch/Source/_javascript_Core/ChangeLog 2013-07-17 23:53:22 UTC (rev 152819)
@@ -1,5 +1,9 @@
2013-07-17 Lucas Forschler <[email protected]>
+ Rollout r152600
+
+2013-07-17 Lucas Forschler <[email protected]>
+
Merge r152600
2013-07-12 Brent Fulgham <[email protected]>
Modified: branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.cpp (152818 => 152819)
--- branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.cpp 2013-07-17 23:43:53 UTC (rev 152818)
+++ branches/safari-537-branch/Source/_javascript_Core/jit/JITThunks.cpp 2013-07-17 23:53:22 UTC (rev 152819)
@@ -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;
}