Update V8

Change-Id: Ic239ef1e55bed06260e4a04cc2199f64c2d30059
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

1 files changed, 64 insertions, 72 deletions

diff --git a/src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch b/src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch
index 8a844f5f25..7172cbf703 100644
--- a/src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch
+++ b/src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch
@@ -1,25 +1,25 @@
-From 3dff2e903674d8ab5310d44281b57de36db659c9 Mon Sep 17 00:00:00 2001
+From 0a86a97f554c4aaa727da1c4481ca6368c68bf85 Mon Sep 17 00:00:00 2001
 From: Aaron Kennedy <aaron.kennedy@nokia.com>
-Date: Mon, 23 May 2011 15:47:20 +1000
-Subject: [PATCH 01/16] Add hashing and comparison methods to v8::String
+Date: Tue, 4 Oct 2011 15:04:21 +1000
+Subject: [PATCH 01/11] Add hashing and comparison methods to v8::String
 
-This allows us to more rapidly search for a v8::String inside
-a hash of QStrings.
+This allows us to more rapidly search for a v8::String inside a hash
+of QStrings.
 ---
- include/v8.h      |   45 +++++++++++++++++++++++++++++++
- src/api.cc        |   43 +++++++++++++++++++++++++++++
+ include/v8.h      |   45 +++++++++++++++++++++++++++++
+ src/api.cc        |   51 +++++++++++++++++++++++++++++++++
  src/heap-inl.h    |    2 +
  src/heap.cc       |    3 ++
  src/objects-inl.h |    1 +
- src/objects.cc    |   77 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- src/objects.h     |   15 +++++++++-
- 7 files changed, 183 insertions(+), 3 deletions(-)
+ src/objects.cc    |   82 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/objects.h     |   10 ++++++-
+ 7 files changed, 192 insertions(+), 2 deletions(-)
 
 diff --git a/include/v8.h b/include/v8.h
-index d15d024..be1ee71 100644
+index 73b7fbe..86ea70f 100644
 --- a/include/v8.h
 +++ b/include/v8.h
-@@ -994,6 +994,49 @@ class String : public Primitive {
+@@ -1021,6 +1021,49 @@ class String : public Primitive {
    V8EXPORT int Utf8Length() const;
  
    /**
@@ -69,29 +69,30 @@ index d15d024..be1ee71 100644
     * Write the contents of the string to an external buffer.
     * If no arguments are given, expects the buffer to be large
     * enough to hold the entire string and NULL terminator. Copies
-@@ -1023,6 +1066,8 @@ class String : public Primitive {
-     HINT_MANY_WRITES_EXPECTED = 1
+@@ -1051,6 +1094,8 @@ class String : public Primitive {
+     NO_NULL_TERMINATION = 2
    };
  
 +  V8EXPORT uint16_t GetCharacter(int index);
 +
+   // 16-bit character codes.
    V8EXPORT int Write(uint16_t* buffer,
                       int start = 0,
-                      int length = -1,
 diff --git a/src/api.cc b/src/api.cc
-index a2373cd..381935b 100644
+index ac4f07f..996812e 100644
 --- a/src/api.cc
 +++ b/src/api.cc
-@@ -3284,6 +3284,49 @@ int String::Utf8Length() const {
-   return str->Utf8Length();
+@@ -3633,6 +3633,57 @@ int String::Utf8Length() const {
  }
  
+ 
 +uint32_t String::Hash() const {
 +  i::Handle<i::String> str = Utils::OpenHandle(this);
 +  if (IsDeadCheck(str->GetIsolate(), "v8::String::Hash()")) return 0;
 +  return str->Hash();
 +}
 +
++
 +String::CompleteHashData String::CompleteHash() const {
 +  i::Handle<i::String> str = Utils::OpenHandle(this);
 +  if (IsDeadCheck(str->GetIsolate(), "v8::String::CompleteHash()")) return CompleteHashData();
@@ -103,40 +104,47 @@ index a2373cd..381935b 100644
 +  return result;
 +}
 +
++
 +uint32_t String::ComputeHash(uint16_t *string, int length) {
 +  return i::HashSequentialString<i::uc16>(string, length) >> i::String::kHashShift;
 +}
 +
++
 +uint32_t String::ComputeHash(char *string, int length) {
 +  return i::HashSequentialString<char>(string, length) >> i::String::kHashShift;
 +}
 +
++
 +uint16_t String::GetCharacter(int index)
 +{
 +  i::Handle<i::String> str = Utils::OpenHandle(this);
 +  return str->Get(index);
 +}
 +
++
 +bool String::Equals(uint16_t *string, int length) {
 +  i::Handle<i::String> str = Utils::OpenHandle(this);
 +  if (IsDeadCheck(str->GetIsolate(), "v8::String::Equals()")) return 0;
 +  return str->SlowEqualsExternal(string, length);
 +}
 +
++
 +bool String::Equals(char *string, int length)
 +{
 +  i::Handle<i::String> str = Utils::OpenHandle(this);
 +  if (IsDeadCheck(str->GetIsolate(), "v8::String::Equals()")) return 0;
 +  return str->SlowEqualsExternal(string, length);
 +}
- 
++
++
  int String::WriteUtf8(char* buffer,
                        int capacity,
+                       int* nchars_ref,
 diff --git a/src/heap-inl.h b/src/heap-inl.h
-index 99737ed..f4fce7b 100644
+index aaf2927..4c55d63 100644
 --- a/src/heap-inl.h
 +++ b/src/heap-inl.h
-@@ -93,6 +93,7 @@ MaybeObject* Heap::AllocateAsciiSymbol(Vector<const char> str,
+@@ -105,6 +105,7 @@ MaybeObject* Heap::AllocateAsciiSymbol(Vector<const char> str,
    String* answer = String::cast(result);
    answer->set_length(str.length());
    answer->set_hash_field(hash_field);
@@ -144,7 +152,7 @@ index 99737ed..f4fce7b 100644
  
    ASSERT_EQ(size, answer->Size());
  
-@@ -126,6 +127,7 @@ MaybeObject* Heap::AllocateTwoByteSymbol(Vector<const uc16> str,
+@@ -138,6 +139,7 @@ MaybeObject* Heap::AllocateTwoByteSymbol(Vector<const uc16> str,
    String* answer = String::cast(result);
    answer->set_length(str.length());
    answer->set_hash_field(hash_field);
@@ -153,18 +161,18 @@ index 99737ed..f4fce7b 100644
    ASSERT_EQ(size, answer->Size());
  
 diff --git a/src/heap.cc b/src/heap.cc
-index 2b6c11f..930c97b 100644
+index bbb9d3e..d287ead 100644
 --- a/src/heap.cc
 +++ b/src/heap.cc
-@@ -3519,6 +3519,7 @@ MaybeObject* Heap::AllocateInternalSymbol(unibrow::CharacterStream* buffer,
+@@ -4009,6 +4009,7 @@ MaybeObject* Heap::AllocateInternalSymbol(unibrow::CharacterStream* buffer,
    String* answer = String::cast(result);
    answer->set_length(chars);
    answer->set_hash_field(hash_field);
-+  SeqString::cast(result)->set_symbol_id(0);
++  SeqString::cast(answer)->set_symbol_id(0);
  
    ASSERT_EQ(size, answer->Size());
  
-@@ -3561,6 +3562,7 @@ MaybeObject* Heap::AllocateRawAsciiString(int length, PretenureFlag pretenure) {
+@@ -4051,6 +4052,7 @@ MaybeObject* Heap::AllocateRawAsciiString(int length, PretenureFlag pretenure) {
    HeapObject::cast(result)->set_map(ascii_string_map());
    String::cast(result)->set_length(length);
    String::cast(result)->set_hash_field(String::kEmptyHashField);
@@ -172,7 +180,7 @@ index 2b6c11f..930c97b 100644
    ASSERT_EQ(size, HeapObject::cast(result)->Size());
    return result;
  }
-@@ -3596,6 +3598,7 @@ MaybeObject* Heap::AllocateRawTwoByteString(int length,
+@@ -4086,6 +4088,7 @@ MaybeObject* Heap::AllocateRawTwoByteString(int length,
    HeapObject::cast(result)->set_map(string_map());
    String::cast(result)->set_length(length);
    String::cast(result)->set_hash_field(String::kEmptyHashField);
@@ -181,11 +189,11 @@ index 2b6c11f..930c97b 100644
    return result;
  }
 diff --git a/src/objects-inl.h b/src/objects-inl.h
-index 65aec5d..c82080d 100644
+index dc3aa46..34cae9f 100644
 --- a/src/objects-inl.h
 +++ b/src/objects-inl.h
-@@ -1924,6 +1924,7 @@ INT_ACCESSORS(ExternalArray, length, kLengthOffset)
- 
+@@ -2082,6 +2082,7 @@ SMI_ACCESSORS(FixedArrayBase, length, kLengthOffset)
+ SMI_ACCESSORS(FreeSpace, size, kSizeOffset)
  
  SMI_ACCESSORS(String, length, kLengthOffset)
 +SMI_ACCESSORS(SeqString, symbol_id, kSymbolIdOffset)
@@ -193,13 +201,13 @@ index 65aec5d..c82080d 100644
  
  uint32_t String::hash_field() {
 diff --git a/src/objects.cc b/src/objects.cc
-index df61956..dc4b260 100644
+index 9a87ac5..2946d02 100644
 --- a/src/objects.cc
 +++ b/src/objects.cc
-@@ -5346,6 +5346,66 @@ static inline bool CompareStringContentsPartial(Isolate* isolate,
-   }
+@@ -6716,6 +6716,71 @@ static inline bool CompareStringContentsPartial(Isolate* isolate,
  }
  
+ 
 +bool String::SlowEqualsExternal(uc16 *string, int length) {
 +  int len = this->length();
 +  if (len != length) return false;
@@ -212,13 +220,14 @@ index df61956..dc4b260 100644
 +  String* lhs = this->TryFlattenGetString();
 +
 +  if (lhs->IsFlat()) {
++    String::FlatContent lhs_content = lhs->GetFlatContent();
 +    if (lhs->IsAsciiRepresentation()) {
-+      Vector<const char> vec1 = lhs->ToAsciiVector();
++      Vector<const char> vec1 = lhs_content.ToAsciiVector();
 +      VectorIterator<char> buf1(vec1);
 +      VectorIterator<uc16> ib(string, length);
 +      return CompareStringContents(&buf1, &ib);
 +    } else {
-+      Vector<const uc16> vec1 = lhs->ToUC16Vector();
++      Vector<const uc16> vec1 = lhs_content.ToUC16Vector();
 +      Vector<const uc16> vec2(string, length);
 +      return CompareRawStringContents(vec1, vec2);
 +    }
@@ -230,6 +239,7 @@ index df61956..dc4b260 100644
 +  }
 +}
 +
++
 +bool String::SlowEqualsExternal(char *string, int length)
 +{
 +  int len = this->length();
@@ -249,10 +259,11 @@ index df61956..dc4b260 100644
 +  }
 +
 +  if (lhs->IsFlat()) {
-+      Vector<const uc16> vec1 = lhs->ToUC16Vector();
-+      VectorIterator<const uc16> buf1(vec1);
-+      VectorIterator<char> buf2(string, length);
-+      return CompareStringContents(&buf1, &buf2);
++    String::FlatContent lhs_content = lhs->GetFlatContent();
++    Vector<const uc16> vec1 = lhs_content.ToUC16Vector();
++    VectorIterator<const uc16> buf1(vec1);
++    VectorIterator<char> buf2(string, length);
++    return CompareStringContents(&buf1, &buf2);
 +  } else {
 +    Isolate* isolate = GetIsolate();
 +    isolate->objects_string_compare_buffer_a()->Reset(0, lhs);
@@ -260,10 +271,12 @@ index df61956..dc4b260 100644
 +    return CompareStringContents(isolate->objects_string_compare_buffer_a(), &ib);
 +  }
 +}
- 
++
++
  bool String::SlowEquals(String* other) {
    // Fast check: negative check with lengths.
-@@ -8655,9 +8715,24 @@ class AsciiSymbolKey : public SequentialSymbolKey<char> {
+   int len = length();
+@@ -10716,9 +10781,24 @@ class AsciiSymbolKey : public SequentialSymbolKey<char> {
  
    MaybeObject* AsObject() {
      if (hash_field_ == 0) Hash();
@@ -288,12 +301,12 @@ index df61956..dc4b260 100644
 +Atomic32 AsciiSymbolKey::next_symbol_id = 1;
  
  
- class TwoByteSymbolKey : public SequentialSymbolKey<uc16> {
+ class SubStringAsciiSymbolKey : public HashTableKey {
 diff --git a/src/objects.h b/src/objects.h
-index e966b3d..6e26f57 100644
+index f7d2180..d96e5f9 100644
 --- a/src/objects.h
 +++ b/src/objects.h
-@@ -5359,6 +5359,9 @@ class String: public HeapObject {
+@@ -6201,6 +6201,9 @@ class String: public HeapObject {
    bool IsAsciiEqualTo(Vector<const char> str);
    bool IsTwoByteEqualTo(Vector<const uc16> str);
  
@@ -303,42 +316,21 @@ index e966b3d..6e26f57 100644
    // Return a UTF8 representation of the string.  The string is null
    // terminated but may optionally contain nulls.  Length is returned
    // in length_output if length_output is not a null pointer  The string
-@@ -5610,9 +5613,17 @@ class String: public HeapObject {
- class SeqString: public String {
-  public:
+@@ -6457,8 +6460,13 @@ class SeqString: public String {
+   // Casting.
+   static inline SeqString* cast(Object* obj);
  
 +  // Get and set the symbol id of the string
 +  inline int symbol_id();
 +  inline void set_symbol_id(int value);
 +
-   // Casting.
-   static inline SeqString* cast(Object* obj);
- 
-+  // Layout description.
-+  static const int kSymbolIdOffset = String::kSize;
-+  static const int kSize = kSymbolIdOffset + kPointerSize;
-+
-  private:
-   DISALLOW_IMPLICIT_CONSTRUCTORS(SeqString);
- };
-@@ -5647,7 +5658,7 @@ class SeqAsciiString: public SeqString {
-   }
- 
    // Layout description.
 -  static const int kHeaderSize = String::kSize;
-+  static const int kHeaderSize = SeqString::kSize;
-   static const int kAlignedSize = POINTER_SIZE_ALIGN(kHeaderSize);
- 
-   // Maximal memory usage for a single sequential ASCII string.
-@@ -5701,7 +5712,7 @@ class SeqTwoByteString: public SeqString {
-   }
- 
-   // Layout description.
--  static const int kHeaderSize = String::kSize;
-+  static const int kHeaderSize = SeqString::kSize;
-   static const int kAlignedSize = POINTER_SIZE_ALIGN(kHeaderSize);
++  static const int kSymbolIdOffset = String::kSize;
++  static const int kHeaderSize = kSymbolIdOffset + kPointerSize;
  
-   // Maximal memory usage for a single sequential two-byte string.
+  private:
+   DISALLOW_IMPLICIT_CONSTRUCTORS(SeqString);
 -- 
 1.7.4.4