Title: [214402] trunk/Source/_javascript_Core
- Revision
- 214402
- Author
- fpi...@apple.com
- Date
- 2017-03-25 12:43:20 -0700 (Sat, 25 Mar 2017)
Log Message
Fix wasm by returning after we do TLS.
Rubber stamped by Keith Miller.
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::storeWasmContext):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (214401 => 214402)
--- trunk/Source/_javascript_Core/ChangeLog 2017-03-25 18:25:47 UTC (rev 214401)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-03-25 19:43:20 UTC (rev 214402)
@@ -1,3 +1,12 @@
+2017-03-25 Filip Pizlo <fpi...@apple.com>
+
+ Fix wasm by returning after we do TLS.
+
+ Rubber stamped by Keith Miller.
+
+ * jit/AssemblyHelpers.h:
+ (JSC::AssemblyHelpers::storeWasmContext):
+
2017-03-24 Mark Lam <mark....@apple.com>
Add some instrumentation in Heap::resumeThePeriphery() to help debug an issue.
Modified: trunk/Source/_javascript_Core/jit/AssemblyHelpers.h (214401 => 214402)
--- trunk/Source/_javascript_Core/jit/AssemblyHelpers.h 2017-03-25 18:25:47 UTC (rev 214401)
+++ trunk/Source/_javascript_Core/jit/AssemblyHelpers.h 2017-03-25 19:43:20 UTC (rev 214402)
@@ -1652,7 +1652,7 @@
{
#if ENABLE(FAST_TLS_JIT)
if (Options::useWebAssemblyFastTLS())
- storeToTLSPtr(src, fastTLSOffsetForKey(WTF_WASM_CONTEXT_KEY));
+ return storeToTLSPtr(src, fastTLSOffsetForKey(WTF_WASM_CONTEXT_KEY));
#endif
// FIXME: Save this state elsewhere to allow PIC. https://bugs.webkit.org/show_bug.cgi?id=169773
storePtr(src, &m_vm->wasmContext);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
