diff -r 000000000000 -r 6474c204b198 js/src/jsapi-tests/testSetPropertyIgnoringNamedGetter.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jsapi-tests/testSetPropertyIgnoringNamedGetter.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ */
+
+#include "jsfriendapi.h"
+#include "jsproxy.h"
+
+#include "jsapi-tests/tests.h"
+
+using namespace js;
+using namespace JS;
+
+class CustomProxyHandler : public DirectProxyHandler {
+  public:
+    CustomProxyHandler() : DirectProxyHandler(nullptr) {}
+
+    bool getPropertyDescriptor(JSContext *cx, HandleObject proxy, HandleId id,
+                               MutableHandle<JSPropertyDescriptor> desc) MOZ_OVERRIDE
+    {
+        return impl(cx, proxy, id, desc, false);
+    }
+
+    bool getOwnPropertyDescriptor(JSContext *cx, HandleObject proxy, HandleId id,
+                                  MutableHandle<JSPropertyDescriptor> desc) MOZ_OVERRIDE
+    {
+        return impl(cx, proxy, id, desc, true);
+    }
+
+    bool set(JSContext *cx, HandleObject proxy, HandleObject receiver,
+             HandleId id, bool strict, MutableHandleValue vp) MOZ_OVERRIDE
+    {
+        Rooted<JSPropertyDescriptor> desc(cx);
+        if (!DirectProxyHandler::getPropertyDescriptor(cx, proxy, id, &desc))
+            return false;
+        return SetPropertyIgnoringNamedGetter(cx, this, proxy, receiver, id, &desc,
+                                              desc.object() == proxy, strict, vp);
+    }
+
+  private:
+    bool impl(JSContext *cx, HandleObject proxy, HandleId id,
+              MutableHandle<JSPropertyDescriptor> desc, bool ownOnly)
+    {
+        if (JSID_IS_STRING(id)) {
+            bool match;
+            if (!JS_StringEqualsAscii(cx, JSID_TO_STRING(id), "phantom", &match))
+                return false;
+            if (match) {
+                desc.object().set(proxy);
+                desc.attributesRef() = JSPROP_READONLY | JSPROP_ENUMERATE;
+                desc.value().setInt32(42);
+                return true;
+            }
+        }
+
+        if (ownOnly)
+            return DirectProxyHandler::getOwnPropertyDescriptor(cx, proxy, id, desc);
+        return DirectProxyHandler::getPropertyDescriptor(cx, proxy, id, desc);
+    }
+
+};
+
+CustomProxyHandler customProxyHandler;
+
+
+BEGIN_TEST(testSetPropertyIgnoringNamedGetter_direct)
+{
+    RootedValue protov(cx);
+    EVAL("Object.prototype", &protov);
+
+    RootedValue targetv(cx);
+    EVAL("({})", &targetv);
+
+    RootedObject proxyObj(cx, NewProxyObject(cx, &customProxyHandler, targetv,
+                                             &protov.toObject(), global, ProxyOptions()));
+    CHECK(proxyObj);
+
+    CHECK(JS_DefineProperty(cx, global, "target", targetv, 0));
+    CHECK(JS_DefineProperty(cx, global, "proxy", proxyObj, 0));
+
+    RootedValue v(cx);
+    EVAL("Object.getOwnPropertyDescriptor(proxy, 'phantom').value", &v);
+    CHECK_SAME(v, Int32Value(42));
+
+    EXEC("proxy.phantom = 123");
+    EVAL("Object.getOwnPropertyDescriptor(proxy, 'phantom').value", &v);
+    CHECK_SAME(v, Int32Value(42));
+    EVAL("target.phantom", &v);
+    CHECK_SAME(v, Int32Value(123));
+
+    return true;
+}
+END_TEST(testSetPropertyIgnoringNamedGetter_direct)