From a2da34be8426b41047f895a3e8463d58baf3b576 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Wed, 4 Dec 2013 12:05:00 +0100
Subject: [PATCH] JavaScriptCore: c++11 compile fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I0de4140323db25765243748dfed8533bca39217c
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
---
.../JavaScriptCore/bytecompiler/BytecodeGenerator.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
index d2ad6793..046b11c8 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)),
--
GitLab