Commit 25a7a93a authored by Petar Koretic's avatar Petar Koretic Committed by Thomas Petazzoni
Browse files

qt5declarative: backport 'Fix alignment issue on ARMv7' patch to 5.9.1

This resolves a QML issues reported in
https://bugreports.qt.io/browse/QTBUG-61522

 that will be fixed in the
5.9.2.

Signed-off-by: default avatarPetar Koretic <petar.koretic@qaap.io>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 9fda08fd
From 03c2661b1243cc529fc3d8cfa65073f1da420307 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Thu, 22 Jun 2017 13:34:09 +0200
Subject: [PATCH 1/1] Fix alignment issue on ARMv7
As analyzed in the bug report, it appears that we may get
QV4::CompiledData::Function pointers for writing that are not aligned
for the 64-bit fields at the beginning.
[ChangeLog][QtQml] Fix crash due to misaligned data structures on ARMv7
Task-number: QTBUG-61552
Change-Id: I6b2c166b725496150c8850475577628ccd811d65
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
commit: https://codereview.qt-project.org/#/c/198278/
Signed-off-by: Petar Koretic <petar.koretic@qaap.io>
---
src/qml/compiler/qv4compiler.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp
index e32749bbf7..c32e1685a0 100644
--- a/src/qml/compiler/qv4compiler.cpp
+++ b/src/qml/compiler/qv4compiler.cpp
@@ -406,6 +406,8 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp
*jsClassDataOffset = nextOffset;
nextOffset += jsClassData.size();
+ nextOffset = (nextOffset + 7) & ~quint32(0x7);
+
for (int i = 0; i < irModule->functions.size(); ++i) {
QV4::IR::Function *f = irModule->functions.at(i);
functionOffsets[i] = nextOffset;
--
2.13.3
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment