Title: [148896] trunk/Source/_javascript_Core
- Revision
- 148896
- Author
- [email protected]
- Date
- 2013-04-22 11:19:06 -0700 (Mon, 22 Apr 2013)
Log Message
2013-04-22 Oliver Hunt <[email protected]>
Fix assertions to account for new Vector layout
RS=Gavin
* llint/LLIntData.cpp:
(JSC::LLInt::Data::performAssertions):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (148895 => 148896)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-22 18:11:44 UTC (rev 148895)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-22 18:19:06 UTC (rev 148896)
@@ -1,3 +1,12 @@
+2013-04-22 Oliver Hunt <[email protected]>
+
+ Fix assertions to account for new Vector layout
+
+ RS=Gavin
+
+ * llint/LLIntData.cpp:
+ (JSC::LLInt::Data::performAssertions):
+
2013-04-22 Mark Lam <[email protected]>
Change baseline JIT watchdog timer check to use the proper fast slow path
Modified: trunk/Source/_javascript_Core/llint/LLIntData.cpp (148895 => 148896)
--- trunk/Source/_javascript_Core/llint/LLIntData.cpp 2013-04-22 18:11:44 UTC (rev 148895)
+++ trunk/Source/_javascript_Core/llint/LLIntData.cpp 2013-04-22 18:19:06 UTC (rev 148896)
@@ -116,8 +116,8 @@
#if !ASSERT_DISABLED
Vector<int> testVector;
testVector.resize(42);
- ASSERT(bitwise_cast<size_t*>(&testVector)[0] == 42);
- ASSERT(bitwise_cast<int**>(&testVector)[1] == testVector.begin());
+ ASSERT(bitwise_cast<uint32_t*>(&testVector)[sizeof(void*)/sizeof(uint32_t) + 1] == 42);
+ ASSERT(bitwise_cast<int**>(&testVector)[0] == testVector.begin());
#endif
ASSERT(StringImpl::s_hashFlag8BitBuffer == 64);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
