Title: [175005] trunk/Source/_javascript_Core
- Revision
- 175005
- Author
- [email protected]
- Date
- 2014-10-21 17:52:40 -0700 (Tue, 21 Oct 2014)
Log Message
Remove erroneous canUseJIT() in the intrinsics version of JITThunks::hostFunctionStub().
<https://webkit.org/b/137937>
Reviewed by Michael Saboff.
This version of JITThunks::hostFunctionStub() can only be called from the intrinsics
version of VM::getHostFunction() which asserts canUseJIT(). Hence, we can eliminate
the canUseJIT() check in JITThunks::hostFunctionStub(). We don't handle the
!canUseJIT() case properly there anyway.
* jit/JITThunks.cpp:
(JSC::JITThunks::hostFunctionStub):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (175004 => 175005)
--- trunk/Source/_javascript_Core/ChangeLog 2014-10-22 00:26:13 UTC (rev 175004)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-10-22 00:52:40 UTC (rev 175005)
@@ -1,3 +1,18 @@
+2014-10-21 Mark Lam <[email protected]>
+
+ Remove erroneous canUseJIT() in the intrinsics version of JITThunks::hostFunctionStub().
+ <https://webkit.org/b/137937>
+
+ Reviewed by Michael Saboff.
+
+ This version of JITThunks::hostFunctionStub() can only be called from the intrinsics
+ version of VM::getHostFunction() which asserts canUseJIT(). Hence, we can eliminate
+ the canUseJIT() check in JITThunks::hostFunctionStub(). We don't handle the
+ !canUseJIT() case properly there anyway.
+
+ * jit/JITThunks.cpp:
+ (JSC::JITThunks::hostFunctionStub):
+
2014-10-21 Michael Saboff <[email protected]>
Add operator==(PropertyName, const char*)
Modified: trunk/Source/_javascript_Core/jit/JITThunks.cpp (175004 => 175005)
--- trunk/Source/_javascript_Core/jit/JITThunks.cpp 2014-10-22 00:26:13 UTC (rev 175004)
+++ trunk/Source/_javascript_Core/jit/JITThunks.cpp 2014-10-22 00:52:40 UTC (rev 175005)
@@ -96,16 +96,15 @@
NativeExecutable* JITThunks::hostFunctionStub(VM* vm, NativeFunction function, ThunkGenerator generator, Intrinsic intrinsic)
{
ASSERT(!isCompilationThread());
+ ASSERT(vm->canUseJIT());
if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap->get(std::make_pair(function, &callHostFunctionAsConstructor)))
return nativeExecutable;
RefPtr<JITCode> forCall;
if (generator) {
- if (vm->canUseJIT()) {
- MacroAssemblerCodeRef entry = generator(vm);
- forCall = adoptRef(new DirectJITCode(entry, entry.code(), JITCode::HostCallThunk));
- }
+ MacroAssemblerCodeRef entry = generator(vm);
+ forCall = adoptRef(new DirectJITCode(entry, entry.code(), JITCode::HostCallThunk));
} else
forCall = adoptRef(new NativeJITCode(JIT::compileCTINativeCall(vm, function), JITCode::HostCallThunk));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
