Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I6498ca9158162e2c2b9db6867128ba4ae687f5f9

1 files changed, 7 insertions, 1 deletions

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
index d2ad679..046b11c 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
@@ -1835,7 +1835,13 @@ RegisterID* BytecodeGenerator::emitNextPropertyName(RegisterID* dst, RegisterID*
 RegisterID* BytecodeGenerator::emitCatch(RegisterID* targetRegister, Label* start, Label* end)
 {
 #if ENABLE(JIT)
-    HandlerInfo info = { start->bind(0, 0), end->bind(0, 0), instructions().size(), m_dynamicScopeDepth + m_baseScopeDepth, CodeLocationLabel() };
+    HandlerInfo info = {
+        static_cast<uint32_t>(start->bind(0, 0)),
+        static_cast<uint32_t>(end->bind(0, 0)),
+        static_cast<uint32_t>(instructions().size()),
+        static_cast<uint32_t>(m_dynamicScopeDepth + m_baseScopeDepth),
+        CodeLocationLabel()
+    };
 #else
     HandlerInfo info = {
         static_cast<uint32_t>(start->bind(0, 0)),