2013-04-22 Oliver Hunt <oliver@apple.com>
authoroliver@apple.com <oliver@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Apr 2013 18:19:06 +0000 (18:19 +0000)
committeroliver@apple.com <oliver@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Apr 2013 18:19:06 +0000 (18:19 +0000)
        Fix assertions to account for new Vector layout

        RS=Gavin

        * llint/LLIntData.cpp:
        (JSC::LLInt::Data::performAssertions):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148896 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/llint/LLIntData.cpp

index 8bada1a..b88765f 100644 (file)
@@ -1,3 +1,12 @@
+2013-04-22  Oliver Hunt  <oliver@apple.com>
+
+        Fix assertions to account for new Vector layout
+
+        RS=Gavin
+
+        * llint/LLIntData.cpp:
+        (JSC::LLInt::Data::performAssertions):
+
 2013-04-22  Mark Lam  <mark.lam@apple.com>
 
         Change baseline JIT watchdog timer check to use the proper fast slow path
index f7f62b2..f91da9c 100644 (file)
@@ -116,8 +116,8 @@ void Data::performAssertions(VM& vm)
 #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);