diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-12 19:49:23 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-12 19:49:33 +0200 |
commit | d52e92469d7bd1f1bdacb3e16739bf5adbb44995 (patch) | |
tree | e362ff28d18fc73a3b6d1420da382c27f06d0081 /src/qml/jit/qv4assemblercommon_p.h | |
parent | c950ce0daf4b9fbfbcf6c00aa8ef4875297046f9 (diff) | |
parent | 9a1e4ffa661648f4d5715874bbf2470bd5ec489b (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/qml/jit/qv4assemblercommon_p.h')
-rw-r--r-- | src/qml/jit/qv4assemblercommon_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jit/qv4assemblercommon_p.h b/src/qml/jit/qv4assemblercommon_p.h index d3d7eedae2..67c7c9cd82 100644 --- a/src/qml/jit/qv4assemblercommon_p.h +++ b/src/qml/jit/qv4assemblercommon_p.h @@ -621,9 +621,9 @@ public: loadPtr(exceptionHandlerAddress(), ScratchRegister); Jump exitFunction = branchPtr(Equal, ScratchRegister, TrustedImmPtr(0)); + loadUndefined(); jump(ScratchRegister); exitFunction.link(this); - loadUndefined(); if (functionExit.isSet()) jump(functionExit); |