Landing http://codereview.chromium.org/1594017 for Ryan.

TBR=ager@chromium.org

Review URL: http://codereview.chromium.org/1512028

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4367 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/include/v8.h b/include/v8.h
index d4a323f0144d25eab1497ed6c89a84548a72bb2b..db739bb7b68feb10e4280bd9ad246262bf365933 100644 (file)
--- a/include/v8.h
+++ b/include/v8.h
@@ -865,6 +865,13 @@ class V8EXPORT String : public Primitive {
                 int length = -1,
                 int* nchars_ref = NULL) const; // UTF-8
 
+  /**
+   * Flatten internal memory. Operations on the string tend to run faster
+   * after flattening especially if the string is a concatenation of many
+   * others.
+   */
+  void Flatten();
+
   /**
    * A zero length string.
    */

diff --git a/src/api.cc b/src/api.cc
index 0145db67b5e0852132bf3bc5dfcefed3476bbf40..2c7975bab0b90617b140cb1f00c53f14436c984f 100644 (file)
--- a/src/api.cc
+++ b/src/api.cc
@@ -2733,6 +2733,13 @@ int String::Write(uint16_t* buffer, int start, int length) const {
 }
 
 
+void v8::String::Flatten() {
+  if (IsDeadCheck("v8::String::Flatten()")) return;
+  i::Handle<i::String> str = Utils::OpenHandle(this);
+  i::FlattenString(str);
+}
+
+
 bool v8::String::IsExternal() const {
   EnsureInitialized("v8::String::IsExternal()");
   i::Handle<i::String> str = Utils::OpenHandle(this);

diff --git a/test/cctest/test-strings.cc b/test/cctest/test-strings.cc
index 0e30092dbbad90476188044a4821aa3945a8b684..aadb7d01beab0b9eaf50d091e9b31bb13029cd42 100644 (file)
--- a/test/cctest/test-strings.cc
+++ b/test/cctest/test-strings.cc
@@ -347,6 +347,38 @@ TEST(Utf8Conversion) {
 }
 
 
+TEST(StringConcatFlatten) {
+  InitializeVM();
+  v8::HandleScope handle_scope;
+
+  const char* stringA = "0123456789";
+  const char* stringB = "ABCDEFGHIJ";
+
+  v8::Local<v8::String> a = v8::String::New(stringA);
+  v8::Local<v8::String> b = v8::String::New(stringB);
+
+  v8::Local<v8::String> cons = v8::String::Concat(a, b);
+
+  i::Handle<i::String> str = v8::Utils::OpenHandle(*cons);
+  CHECK(!str->IsFlat());
+
+  cons->Flatten();
+
+  CHECK(str->IsFlat());
+
+  char buffer[21];
+  cons->WriteUtf8(buffer);
+
+  for (int i = 0; i < 10; i++) {
+    CHECK_EQ(stringA[i], buffer[i]);
+  }
+
+  for (int i = 0; i < 10; i++) {
+    CHECK_EQ(stringB[i], buffer[i + 10]);
+  }
+}
+
+
 TEST(ExternalShortStringAdd) {
   ZoneScope zone(DELETE_ON_EXIT);