Title: [222939] trunk/Source/_javascript_Core
Revision
222939
Author
[email protected]
Date
2017-10-05 15:52:27 -0700 (Thu, 05 Oct 2017)

Log Message

Unreviewed, rolling out r222929.

Caused assertion failures during LayoutTests.

Reverted changeset:

"Only add prototypes to the PrototypeMap if they're not
already present"
https://bugs.webkit.org/show_bug.cgi?id=177952
http://trac.webkit.org/changeset/222929

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (222938 => 222939)


--- trunk/Source/_javascript_Core/ChangeLog	2017-10-05 22:43:02 UTC (rev 222938)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-10-05 22:52:27 UTC (rev 222939)
@@ -1,3 +1,16 @@
+2017-10-05  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r222929.
+
+        Caused assertion failures during LayoutTests.
+
+        Reverted changeset:
+
+        "Only add prototypes to the PrototypeMap if they're not
+        already present"
+        https://bugs.webkit.org/show_bug.cgi?id=177952
+        http://trac.webkit.org/changeset/222929
+
 2017-10-05  Carlos Alberto Lopez Perez  <[email protected]>
 
         Generate a compile error if release is built without compiler optimizations

Modified: trunk/Source/_javascript_Core/runtime/PrototypeMapInlines.h (222938 => 222939)


--- trunk/Source/_javascript_Core/runtime/PrototypeMapInlines.h	2017-10-05 22:43:02 UTC (rev 222938)
+++ trunk/Source/_javascript_Core/runtime/PrototypeMapInlines.h	2017-10-05 22:52:27 UTC (rev 222939)
@@ -44,11 +44,7 @@
 
 ALWAYS_INLINE void PrototypeMap::addPrototype(JSObject* object)
 {
-    auto addResult = m_prototypes.add(object, Weak<JSObject>());
-    if (addResult.isNewEntry)
-        addResult.iterator->value = Weak<JSObject>(object);
-    else
-        ASSERT(addResult.iterator->value.get() == object);
+    m_prototypes.set(object, object);
 
     // Note that this method makes the somewhat odd decision to not check if this
     // object currently has indexed accessors. We could do that check here, and if

Modified: trunk/Source/_javascript_Core/runtime/WeakGCMap.h (222938 => 222939)


--- trunk/Source/_javascript_Core/runtime/WeakGCMap.h	2017-10-05 22:43:02 UTC (rev 222938)
+++ trunk/Source/_javascript_Core/runtime/WeakGCMap.h	2017-10-05 22:52:27 UTC (rev 222939)
@@ -58,11 +58,6 @@
         return m_map.set(key, WTFMove(value));
     }
 
-    AddResult add(const KeyType& key, ValueType value)
-    {
-        return m_map.add(key, WTFMove(value));
-    }
-
     bool remove(const KeyType& key)
     {
         return m_map.remove(key);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to