diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-23 03:01:38 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-23 03:01:38 +0200 |
commit | 583dcc6d31bb44d9d36c6a18dd71d54cbb6d5683 (patch) | |
tree | 81ac6b8d539c86258b2cbcdfc6183e95eec9efb0 /src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp | |
parent | fc99750865129c3abe9c827dd136ab717a7f4601 (diff) | |
parent | 732962319eeae2881890bd146146e7e6f486c9fb (diff) | |
download | qtscript-583dcc6d31bb44d9d36c6a18dd71d54cbb6d5683.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ib0c08186ea28decda3b39baeb323a0c84bdb259e
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp')
-rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp index 9f60761..f9f77b1 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp @@ -1762,7 +1762,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_call_NotJSFunction) CallFrame* previousCallFrame = stackFrame.callFrame; CallFrame* callFrame = CallFrame::create(previousCallFrame->registers() + registerOffset); - callFrame->init(0, static_cast<Instruction*>((STUB_RETURN_ADDRESS).value()), previousCallFrame->scopeChain(), previousCallFrame, 0, argCount, 0); + callFrame->init(0, static_cast<Instruction*>((STUB_RETURN_ADDRESS).value()), previousCallFrame->scopeChain(), previousCallFrame, 0, argCount, asObject(funcVal)); stackFrame.callFrame = callFrame; Register* argv = stackFrame.callFrame->registers() - RegisterFile::CallFrameHeaderSize - argCount; |