Title: [169571] trunk/Source/WebCore
- Revision
- 169571
- Author
- achristen...@apple.com
- Date
- 2014-06-03 14:37:06 -0700 (Tue, 03 Jun 2014)
Log Message
Corrected arm64 assertion in css jit.
Rubber stamped by Benjamin Poulain.
* cssjit/StackAllocator.h:
(WebCore::StackAllocator::pop):
Changed assertion from incorrectly matching x86_64 to using the correct minimum offset,
taking into account that a stackUnitInBytes is used for two registers on arm64
except the last stack unit, which could only be used for one register if there are
an odd number of registers.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169570 => 169571)
--- trunk/Source/WebCore/ChangeLog 2014-06-03 21:31:26 UTC (rev 169570)
+++ trunk/Source/WebCore/ChangeLog 2014-06-03 21:37:06 UTC (rev 169571)
@@ -1,3 +1,16 @@
+2014-06-03 Alex Christensen <achristen...@webkit.org>
+
+ Corrected arm64 assertion in css jit.
+
+ Rubber stamped by Benjamin Poulain.
+
+ * cssjit/StackAllocator.h:
+ (WebCore::StackAllocator::pop):
+ Changed assertion from incorrectly matching x86_64 to using the correct minimum offset,
+ taking into account that a stackUnitInBytes is used for two registers on arm64
+ except the last stack unit, which could only be used for one register if there are
+ an odd number of registers.
+
2014-06-03 Benjamin Poulain <bpoul...@apple.com>
[iOS] Start ignoring common bogus viewport parameters
Modified: trunk/Source/WebCore/cssjit/StackAllocator.h (169570 => 169571)
--- trunk/Source/WebCore/cssjit/StackAllocator.h 2014-06-03 21:31:26 UTC (rev 169570)
+++ trunk/Source/WebCore/cssjit/StackAllocator.h 2014-06-03 21:37:06 UTC (rev 169571)
@@ -111,7 +111,7 @@
unsigned registerCount = registerIDs.size();
RELEASE_ASSERT(stackReferences.size() == registerCount);
#if CPU(ARM64)
- ASSERT(m_offsetFromTop >= stackUnitInBytes * registerCount);
+ ASSERT(m_offsetFromTop >= stackUnitInBytes * ((registerCount + 1) / 2));
unsigned registerCountOdd = registerCount % 2;
if (registerCountOdd) {
RELEASE_ASSERT(stackReferences[registerCount - 1] == m_offsetFromTop);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
