diff options
| author | Tim Blechmann <tim@klingt.org> | 2013-12-04 12:05:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-05 09:57:10 +0100 |
| commit | a2da34be8426b41047f895a3e8463d58baf3b576 (patch) | |
| tree | bd9028a9d024b3a02613df4c1f17884ccdf35a09 | |
| parent | 8cc5a741d016d49952d4eb15dac57cc34c1e2344 (diff) | |
| download | qtscript-a2da34be8426b41047f895a3e8463d58baf3b576.tar.gz | |
JavaScriptCore: c++11 compile fixv5.2.1
Change-Id: I0de4140323db25765243748dfed8533bca39217c
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp | 8 |
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)), |