From c22a493144e39d76bfa42c46f9d6d17a5143ac35 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Sat, 22 Feb 2020 21:09:32 +0100
Subject: Revert #1142 - Remove unboxed objects

- accounting for removal of watch()/unwatch()
---
 js/src/vm/NativeObject.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'js/src/vm/NativeObject.h')

diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h
index 9cc6d5436..6595703dc 100644
--- a/js/src/vm/NativeObject.h
+++ b/js/src/vm/NativeObject.h
@@ -470,6 +470,11 @@ class NativeObject : public ShapedObject
     // that are (temporarily) inconsistent.
     void setLastPropertyMakeNonNative(Shape* shape);
 
+    // As for setLastProperty(), but changes the class associated with the
+    // object to a native one. The object's type has already been changed, and
+    // this brings the shape into sync with it.
+    void setLastPropertyMakeNative(ExclusiveContext* cx, Shape* shape);
+
     // Newly-created TypedArrays that map a SharedArrayBuffer are
     // marked as shared by giving them an ObjectElements that has the
     // ObjectElements::SHARED_MEMORY flag set.
-- 
cgit v1.2.3


From af69cb07db0d810a1a1a507b890e6beb23dc421c Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Sun, 23 Feb 2020 14:41:40 +0100
Subject: Revert #1137 - Remove unboxed arrays

- accounting for removal of watch()/unwatch()
- updated for intermediate code changes.
---
 js/src/vm/NativeObject.h | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'js/src/vm/NativeObject.h')

diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h
index 6595703dc..107fade8c 100644
--- a/js/src/vm/NativeObject.h
+++ b/js/src/vm/NativeObject.h
@@ -339,19 +339,16 @@ IsObjectValueInCompartment(const Value& v, JSCompartment* comp);
 #endif
 
 // Operations which change an object's dense elements can either succeed, fail,
-// or be unable to complete. The latter is used when the object's elements must
-// become sparse instead. The enum below is used for such operations.
+// or be unable to complete. For native objects, the latter is used when the
+// object's elements must become sparse instead. The enum below is used for
+// such operations, and for similar operations on unboxed arrays and methods
+// that work on both kinds of objects.
 enum class DenseElementResult {
     Failure,
     Success,
     Incomplete
 };
 
-enum class ShouldUpdateTypes {
-    Update,
-    DontUpdate
-};
-
 /*
  * NativeObject specifies the internal implementation of a native object.
  *
@@ -1154,10 +1151,6 @@ class NativeObject : public ShapedObject
         elementsRangeWriteBarrierPost(dstStart, count);
     }
 
-    inline DenseElementResult
-    setOrExtendDenseElements(ExclusiveContext* cx, uint32_t start, const Value* vp, uint32_t count,
-                             ShouldUpdateTypes updateTypes = ShouldUpdateTypes::Update);
-
     bool shouldConvertDoubleElements() {
         return getElementsHeader()->shouldConvertDoubleElements();
     }
-- 
cgit v1.2.3


From b9e692af05df98d3efc43996dda0983d31dfa7b4 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Sat, 22 Feb 2020 21:07:48 +0100
Subject: Revert 1320408 part 15: Make addDataProperty static

---
 js/src/vm/NativeObject.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js/src/vm/NativeObject.h')

diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h
index 107fade8c..3a3e50244 100644
--- a/js/src/vm/NativeObject.h
+++ b/js/src/vm/NativeObject.h
@@ -746,10 +746,10 @@ class NativeObject : public ShapedObject
                               bool allowDictionary = true);
 
     /* Add a data property whose id is not yet in this scope. */
-    static Shape* addDataProperty(ExclusiveContext* cx, HandleNativeObject obj,
-                                  jsid id_, uint32_t slot, unsigned attrs);
-    static Shape* addDataProperty(ExclusiveContext* cx, HandleNativeObject obj,
-                                  HandlePropertyName name, uint32_t slot, unsigned attrs);
+    Shape* addDataProperty(ExclusiveContext* cx,
+                           jsid id_, uint32_t slot, unsigned attrs);
+    Shape* addDataProperty(ExclusiveContext* cx, HandlePropertyName name,
+                           uint32_t slot, unsigned attrs);
 
     /* Add or overwrite a property for id in this scope. */
     static Shape*
-- 
cgit v1.2.3