summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJeremy Andrews <athenian200@outlook.com>2022-05-27 07:25:48 -0500
committerJeremy Andrews <athenian200@outlook.com>2022-05-27 07:25:48 -0500
commit7e570f010f82cc07c9e5c951e375d7479147ce6a (patch)
tree251bf4173cbf9944eae810b3a61b98a02e5476f5 /js
parent64ea1e09c2dfd09bf71738f08e15ec3d7d80e33b (diff)
downloaduxp-7e570f010f82cc07c9e5c951e375d7479147ce6a.tar.gz
Issue #1742 - Part 5: Remove unnecessary GCPtr::unbarrieredGet
Ref: BZ 1323441
Diffstat (limited to 'js')
-rw-r--r--js/src/gc/Barrier.h4
-rw-r--r--js/src/vm/NativeObject-inl.h2
-rw-r--r--js/src/vm/ObjectGroup.cpp2
-rw-r--r--js/src/vm/Shape-inl.h2
4 files changed, 3 insertions, 7 deletions
diff --git a/js/src/gc/Barrier.h b/js/src/gc/Barrier.h
index 1ec269abf3..345131a296 100644
--- a/js/src/gc/Barrier.h
+++ b/js/src/gc/Barrier.h
@@ -454,10 +454,6 @@ class GCPtr : public WriteBarrieredBase<T>
DECLARE_POINTER_ASSIGN_OPS(GCPtr, T);
- T unbarrieredGet() const {
- return this->value;
- }
-
private:
void set(const T& v) {
this->pre();
diff --git a/js/src/vm/NativeObject-inl.h b/js/src/vm/NativeObject-inl.h
index 67dff24b7b..004b308f05 100644
--- a/js/src/vm/NativeObject-inl.h
+++ b/js/src/vm/NativeObject-inl.h
@@ -290,7 +290,7 @@ NativeObject::setSlotWithType(ExclusiveContext* cx, Shape* shape,
inline void
NativeObject::updateShapeAfterMovingGC()
{
- Shape* shape = shape_.unbarrieredGet();
+ Shape* shape = shape_;
if (IsForwarded(shape))
shape_.unsafeSet(Forwarded(shape));
}
diff --git a/js/src/vm/ObjectGroup.cpp b/js/src/vm/ObjectGroup.cpp
index f2a3305cfd..741531f015 100644
--- a/js/src/vm/ObjectGroup.cpp
+++ b/js/src/vm/ObjectGroup.cpp
@@ -421,7 +421,7 @@ struct ObjectGroupCompartment::NewEntry
}
static inline bool match(const ObjectGroupCompartment::NewEntry& key, const Lookup& lookup) {
- TaggedProto proto = key.group.unbarrieredGet()->proto().unbarrieredGet();
+ TaggedProto proto = key.group.unbarrieredGet()->proto();
JSObject* assoc = key.associated;
MOZ_ASSERT(proto.hasUniqueId());
MOZ_ASSERT_IF(assoc, assoc->zone()->hasUniqueId(assoc));
diff --git a/js/src/vm/Shape-inl.h b/js/src/vm/Shape-inl.h
index ab16bfb192..7b7561220e 100644
--- a/js/src/vm/Shape-inl.h
+++ b/js/src/vm/Shape-inl.h
@@ -123,7 +123,7 @@ Shape::new_(ExclusiveContext* cx, Handle<StackShape> other, uint32_t nfixed)
inline void
Shape::updateBaseShapeAfterMovingGC()
{
- BaseShape* base = base_.unbarrieredGet();
+ BaseShape* base = base_;
if (IsForwarded(base))
base_.unsafeSet(Forwarded(base));
}