[Development] qt5.2.0: javascriptcore compile fix
Tim Blechmann
tim at klingt.org
Wed Dec 4 09:55:55 CET 2013
hi,
in order to compile qt-5.2.0-rc1 as static library with c++11 on osx, i
need to apply the attached patch.
the issue had been reported in a comment in [1], but i guess the issue
was missed, because the bug was closed before.
iac, attached patch fixes the issue, would be great if it can be included.
thnx,
tim
[1] https://bugreports.qt-project.org/browse/QTBUG-34842
-------------- next part --------------
diff --git a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
index d2ad679..87b70a4 100644
--- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+++ b/qtscript/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)),
More information about the Development
mailing list