Reviewers: ulan,

Message:
Committed patchset #1 manually as r18983 (tree was closed).

Description:
Don't unmark dictionary mode maps as unstable.
[email protected]
BUG=

Committed: https://code.google.com/p/v8/source/detail?r=18983

Please review this at https://codereview.chromium.org/148493007/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+6, -3 lines):
  M src/objects-inl.h
  M src/objects.cc


Index: src/objects-inl.h
diff --git a/src/objects-inl.h b/src/objects-inl.h
index 1ea9441b7e5b3507f37075f87f862fdb53639d32..9ac2d6b7f48a60bb2382dd94d0e11deadea85878 100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -3988,8 +3988,9 @@ bool Map::is_shared() {


 void Map::set_dictionary_map(bool value) {
-  if (value) mark_unstable();
-  set_bit_field3(DictionaryMap::update(bit_field3(), value));
+  uint32_t new_bit_field3 = DictionaryMap::update(bit_field3(), value);
+  new_bit_field3 = IsUnstable::update(new_bit_field3, value);
+  set_bit_field3(new_bit_field3);
 }


Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index fe791f308738b326c9d2dfd2ca56a0fa7fdf7a9d..246557bdfc044b05604cd19313b6025f1d8ea724 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -6682,7 +6682,9 @@ MaybeObject* Map::RawCopy(int instance_size) {
   new_bit_field3 = EnumLengthBits::update(new_bit_field3,
                                           kInvalidEnumCacheSentinel);
   new_bit_field3 = Deprecated::update(new_bit_field3, false);
-  new_bit_field3 = IsUnstable::update(new_bit_field3, false);
+  if (!is_dictionary_map()) {
+    new_bit_field3 = IsUnstable::update(new_bit_field3, false);
+  }
   result->set_bit_field3(new_bit_field3);
   return result;
 }


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to