diff options
author | Erik Verbruggen <erik.verbruggen@me.com> | 2013-11-18 11:58:33 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-18 15:54:56 +0100 |
commit | 15bb30b0e90c628cc3812627923d1d459d461505 (patch) | |
tree | 9e8ac40f800bcf9d699e1004224fa5c7579599f5 /src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h | |
parent | 78985c5c2c4ec8c7d06bf0c59c5534f968d62f07 (diff) | |
download | qtscript-15bb30b0e90c628cc3812627923d1d459d461505.tar.gz |
Fix compiler errors.v5.2.0-rc1v5.2.0
On Mavericks with Apple's Clang 5.0 (3.3 based):
../3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h:320:117: error: non-const reference cannot bind to bit-field 'm_attributesInPrevious'
...add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), existingTransition->m_attributesInPrevious), exi...
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
C++11 specific:
../3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h:179:35: error: non-constant-expression cannot be narrowed from type 'size_t'
(aka 'unsigned long') to 'uint32_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
LineInfo info = { instructions().size(), n->lineNo() };
^~~~~~~~~~~~~~~~~~~~~
Both occur in multiple places.
Task-number: QTBUG-34842
Change-Id: I98a29b51718a6e0db8749ac1b495e071e9fe479d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h')
-rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h b/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h index 8b6a425..af74e60 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h @@ -176,7 +176,7 @@ namespace JSC { // Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary. ASSERT(!dst || dst == ignoredResult() || !dst->isTemporary() || dst->refCount()); if (!m_codeBlock->numberOfLineInfos() || m_codeBlock->lastLineInfo().lineNumber != n->lineNo()) { - LineInfo info = { instructions().size(), n->lineNo() }; + LineInfo info = { static_cast<uint32_t>(instructions().size()), n->lineNo() }; m_codeBlock->addLineInfo(info); } if (m_emitNodeDepth >= s_maxEmitNodeDepth) @@ -195,7 +195,7 @@ namespace JSC { void emitNodeInConditionContext(ExpressionNode* n, Label* trueTarget, Label* falseTarget, bool fallThroughMeansTrue) { if (!m_codeBlock->numberOfLineInfos() || m_codeBlock->lastLineInfo().lineNumber != n->lineNo()) { - LineInfo info = { instructions().size(), n->lineNo() }; + LineInfo info = { static_cast<uint32_t>(instructions().size()), n->lineNo() }; m_codeBlock->addLineInfo(info); } if (m_emitNodeDepth >= s_maxEmitNodeDepth) |