Merge branch 'TRUNK' into ARE-5.0

1 files changed, 3 insertions, 3 deletions

diff --git a/js/src/proxy/Proxy.cpp b/js/src/proxy/Proxy.cpp
index 376bbcdda..6f91dfb10 100644
--- a/js/src/proxy/Proxy.cpp
+++ b/js/src/proxy/Proxy.cpp
@@ -530,18 +530,18 @@ Proxy::trace(JSTracer* trc, JSObject* proxy)
 
 bool
 js::proxy_LookupProperty(JSContext* cx, HandleObject obj, HandleId id,
-                         MutableHandleObject objp, MutableHandleShape propp)
+                         MutableHandleObject objp, MutableHandle<JS::PropertyResult> propp)
 {
     bool found;
     if (!Proxy::has(cx, obj, id, &found))
         return false;
 
     if (found) {
-        MarkNonNativePropertyFound<CanGC>(propp);
+        propp.setNonNativeProperty();
         objp.set(obj);
     } else {
+        propp.setNotFound();
         objp.set(nullptr);
-        propp.set(nullptr);
     }
     return true;
 }