Remove two now-incorrect assertions after r168256.

* runtime/JSString.cpp:
(JSC::JSRopeString::resolveRopeSlowCase8):
(JSC::JSRopeString::resolveRopeSlowCase):

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index e1c3c42..01288c0 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2014-05-05  Andreas Kling  <akling@apple.com>
+
+        Remove two now-incorrect assertions after r168256.
+
+        * runtime/JSString.cpp:
+        (JSC::JSRopeString::resolveRopeSlowCase8):
+        (JSC::JSRopeString::resolveRopeSlowCase):
+
 2014-05-04  Andreas Kling  <akling@apple.com>
 
         Optimize JSRopeString for resolving directly to AtomicString.

diff --git a/Source/JavaScriptCore/runtime/JSString.cpp b/Source/JavaScriptCore/runtime/JSString.cpp
index b911a4a..b831784 100644 (file)
--- a/Source/JavaScriptCore/runtime/JSString.cpp
+++ b/Source/JavaScriptCore/runtime/JSString.cpp
@@ -265,7 +265,6 @@ void JSRopeString::resolveRopeSlowCase8(LChar* buffer) const
     }
 
     ASSERT(buffer == position);
-    ASSERT(!isRope());
 }
 
 void JSRopeString::resolveRopeSlowCase(UChar* buffer) const
@@ -297,7 +296,6 @@ void JSRopeString::resolveRopeSlowCase(UChar* buffer) const
     }
 
     ASSERT(buffer == position);
-    ASSERT(!isRope());
 }
 
 void JSRopeString::outOfMemory(ExecState* exec) const