diff -r 000000000000 -r 6474c204b198 js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "jsapi-tests/tests.h"
+
+static bool
+NativeGetterSetter(JSContext *cx, unsigned argc, jsval *vp)
+{
+    return true;
+}
+
+BEGIN_TEST(testDefineGetterSetterNonEnumerable)
+{
+    static const char PROPERTY_NAME[] = "foo";
+
+    JS::RootedValue vobj(cx);
+    JS::RootedObject obj(cx, JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr()));
+    CHECK(obj);
+    vobj = OBJECT_TO_JSVAL(obj);
+
+    JSFunction *funGet = JS_NewFunction(cx, NativeGetterSetter, 0, 0, JS::NullPtr(), "get");
+    CHECK(funGet);
+    JS::RootedObject funGetObj(cx, JS_GetFunctionObject(funGet));
+    JS::RootedValue vget(cx, OBJECT_TO_JSVAL(funGetObj));
+
+    JSFunction *funSet = JS_NewFunction(cx, NativeGetterSetter, 1, 0, JS::NullPtr(), "set");
+    CHECK(funSet);
+    JS::RootedObject funSetObj(cx, JS_GetFunctionObject(funSet));
+    JS::RootedValue vset(cx, OBJECT_TO_JSVAL(funSetObj));
+
+    JS::RootedObject vObject(cx, JSVAL_TO_OBJECT(vobj));
+    CHECK(JS_DefineProperty(cx, vObject, PROPERTY_NAME,
+                            JS::UndefinedHandleValue,
+                            JSPROP_GETTER | JSPROP_SETTER | JSPROP_SHARED | JSPROP_ENUMERATE,
+                            JS_DATA_TO_FUNC_PTR(JSPropertyOp, (JSObject*) funGetObj),
+                            JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, (JSObject*) funSetObj)));
+
+    CHECK(JS_DefineProperty(cx, vObject, PROPERTY_NAME,
+                            JS::UndefinedHandleValue,
+                            JSPROP_GETTER | JSPROP_SETTER | JSPROP_SHARED | JSPROP_PERMANENT,
+                            JS_DATA_TO_FUNC_PTR(JSPropertyOp, (JSObject*) funGetObj),
+                            JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, (JSObject*) funSetObj)));
+
+    JS::Rooted<JSPropertyDescriptor> desc(cx);
+    CHECK(JS_GetOwnPropertyDescriptor(cx, vObject, PROPERTY_NAME, &desc));
+    CHECK(desc.object());
+    CHECK(desc.hasGetterObject());
+    CHECK(desc.hasSetterObject());
+    CHECK(desc.isPermanent());
+    CHECK(!desc.isEnumerable());
+
+    return true;
+}
+END_TEST(testDefineGetterSetterNonEnumerable)