Modified: trunk/Source/_javascript_Core/ChangeLog (156493 => 156494)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-26 20:54:06 UTC (rev 156493)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-26 20:59:51 UTC (rev 156494)
@@ -1,5 +1,13 @@
2013-09-26 Anders Carlsson <[email protected]>
+ Try to fix the Windows build.
+
+ * jit/JITThunks.cpp:
+ (JSC::JITThunks::hostFunctionStub):
+ * jit/JITThunks.h:
+
+2013-09-26 Anders Carlsson <[email protected]>
+
Change a couple of HashMap value types from OwnPtr to std::unique_ptr
https://bugs.webkit.org/show_bug.cgi?id=121973
Modified: trunk/Source/_javascript_Core/jit/JITThunks.cpp (156493 => 156494)
--- trunk/Source/_javascript_Core/jit/JITThunks.cpp 2013-09-26 20:54:06 UTC (rev 156493)
+++ trunk/Source/_javascript_Core/jit/JITThunks.cpp 2013-09-26 20:59:51 UTC (rev 156494)
@@ -81,7 +81,7 @@
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), nativeExecutable);
+ weakAdd(*m_hostFunctionStubMap, std::make_pair(function, constructor), Weak<NativeExecutable>(nativeExecutable));
return nativeExecutable;
}
@@ -102,7 +102,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), nativeExecutable);
+ weakAdd(*m_hostFunctionStubMap, std::make_pair(function, &callHostFunctionAsConstructor), Weak<NativeExecutable>(nativeExecutable));
return nativeExecutable;
}
Modified: trunk/Source/_javascript_Core/jit/JITThunks.h (156493 => 156494)
--- trunk/Source/_javascript_Core/jit/JITThunks.h 2013-09-26 20:54:06 UTC (rev 156493)
+++ trunk/Source/_javascript_Core/jit/JITThunks.h 2013-09-26 20:59:51 UTC (rev 156494)
@@ -69,7 +69,7 @@
typedef HashMap<ThunkGenerator, MacroAssemblerCodeRef> CTIStubMap;
CTIStubMap m_ctiStubMap;
- typedef HashMap<std::pair<NativeFunction, NativeFunction>, Weak<NativeExecutable> > HostFunctionStubMap;
+ typedef HashMap<std::pair<NativeFunction, NativeFunction>, Weak<NativeExecutable>> HostFunctionStubMap;
OwnPtr<HostFunctionStubMap> m_hostFunctionStubMap;
Lock m_lock;
};