diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 13:14:29 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 13:14:29 +0200 |
| commit | 2e8e6b78cf673d12beb240434e6a92470a9c5603 (patch) | |
| tree | 0388d1fb74f6c72620972b765268f42175041591 | |
| parent | 7d2d1bddfe360c29730598918bf2e6a1e83944f7 (diff) | |
| parent | 0a8af38cf0add7592bf8f491e45a5de8b125a190 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
src/3rdparty/v8/src/objects.cc
Change-Id: I6e3508bd6a8376ac15f354d9002985b79349f684
| -rw-r--r-- | src/3rdparty/v8/src/objects.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/v8/src/objects.cc b/src/3rdparty/v8/src/objects.cc index 8032f0d..bb185a5 100644 --- a/src/3rdparty/v8/src/objects.cc +++ b/src/3rdparty/v8/src/objects.cc @@ -11927,6 +11927,7 @@ class InternalizedStringKey : public HashTableKey { if (map != NULL) { string_->set_map_no_write_barrier(map); ASSERT(string_->IsInternalizedString()); + SeqString::cast(string_)->set_symbol_id(0); return string_; } // Otherwise allocate a new internalized string. |