diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-06-07 20:20:19 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-06-07 20:20:19 -0500 |
| commit | 878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b (patch) | |
| tree | 3683d6df35e3618c0e7b456de7c749ca4c8c21a6 /js/xpconnect | |
| parent | a621951327b0c19c0c24dfd9fd973f7bd13ae68f (diff) | |
| parent | cfb9884423faf741de03c5fcc72bf9ac8c6ada4d (diff) | |
| download | aura-central-878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b.tar.gz | |
Merge branch 'TRUNK' into ARE-5.0
Diffstat (limited to 'js/xpconnect')
| -rw-r--r-- | js/xpconnect/src/XPCInlines.h | 2 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCWrappedNative.cpp | 2 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCWrappedNativeProto.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/js/xpconnect/src/XPCInlines.h b/js/xpconnect/src/XPCInlines.h index ad3d0c784..e60fac824 100644 --- a/js/xpconnect/src/XPCInlines.h +++ b/js/xpconnect/src/XPCInlines.h @@ -470,7 +470,7 @@ inline void XPCWrappedNativeTearOff::JSObjectMoved(JSObject* obj, const JSObject* old) { MOZ_ASSERT(!IsMarked()); - MOZ_ASSERT(mJSObject.unbarrieredGetPtr() == old); + MOZ_ASSERT(mJSObject == old); mJSObject = obj; } diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp index 96f825f05..2e3419f28 100644 --- a/js/xpconnect/src/XPCWrappedNative.cpp +++ b/js/xpconnect/src/XPCWrappedNative.cpp @@ -935,7 +935,7 @@ void XPCWrappedNative::FlatJSObjectMoved(JSObject* obj, const JSObject* old) { JS::AutoAssertGCCallback inCallback(obj); - MOZ_ASSERT(mFlatJSObject.unbarrieredGetPtr() == old); + MOZ_ASSERT(mFlatJSObject == old); nsWrapperCache* cache = nullptr; CallQueryInterface(mIdentity, &cache); diff --git a/js/xpconnect/src/XPCWrappedNativeProto.cpp b/js/xpconnect/src/XPCWrappedNativeProto.cpp index 6aa023432..7515ce3f0 100644 --- a/js/xpconnect/src/XPCWrappedNativeProto.cpp +++ b/js/xpconnect/src/XPCWrappedNativeProto.cpp @@ -114,7 +114,7 @@ XPCWrappedNativeProto::CallPostCreatePrototype() void XPCWrappedNativeProto::JSProtoObjectFinalized(js::FreeOp* fop, JSObject* obj) { - MOZ_ASSERT(obj == mJSProtoObject.unbarrieredGet(), "huh?"); + MOZ_ASSERT(obj == mJSProtoObject, "huh?"); // Only remove this proto from the map if it is the one in the map. ClassInfo2WrappedNativeProtoMap* map = GetScope()->GetWrappedNativeProtoMap(); @@ -129,7 +129,7 @@ XPCWrappedNativeProto::JSProtoObjectFinalized(js::FreeOp* fop, JSObject* obj) void XPCWrappedNativeProto::JSProtoObjectMoved(JSObject* obj, const JSObject* old) { - MOZ_ASSERT(mJSProtoObject.unbarrieredGet() == old); + MOZ_ASSERT(mJSProtoObject == old); mJSProtoObject.init(obj); // Update without triggering barriers. } |