summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid McFarland <corngood@gmail.com>2013-06-02 21:35:17 -0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-31 09:28:36 +0200
commit0a8af38cf0add7592bf8f491e45a5de8b125a190 (patch)
tree9b93045fcdb80bcfe70a549d29871f1f86002fbc
parente89f7981d7d2ab566a82b2e4da5fafcedb03d4d7 (diff)
downloadqtjsbackend-0a8af38cf0add7592bf8f491e45a5de8b125a190.tar.gz
Fix for assert in V8 after a string is converted to a symbol
When a string is converted to a symbol by SymbolKey::AsObject, its symbol_id is undefined. Change-Id: I63c41d52e309f67a4c8fc2629bdc9fb6a18fd2b5 bug: https://bugreports.qt-project.org/browse/QTBUG-31513 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
-rw-r--r--src/3rdparty/v8/src/objects.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/v8/src/objects.cc b/src/3rdparty/v8/src/objects.cc
index 0d3836b..81cd105 100644
--- a/src/3rdparty/v8/src/objects.cc
+++ b/src/3rdparty/v8/src/objects.cc
@@ -11710,6 +11710,7 @@ class SymbolKey : public HashTableKey {
if (map != NULL) {
string_->set_map_no_write_barrier(map);
ASSERT(string_->IsSymbol());
+ SeqString::cast(string_)->set_symbol_id(0);
return string_;
}
// Otherwise allocate a new symbol.