diff -r 000000000000 -r 6474c204b198 js/src/jsapi-tests/testDefineProperty.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jsapi-tests/testDefineProperty.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,23 @@
+/* -*- 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"
+
+BEGIN_TEST(testDefineProperty_bug564344)
+{
+    JS::RootedValue x(cx);
+    EVAL("function f() {}\n"
+         "var x = {p: f};\n"
+         "x.p();  // brand x's scope\n"
+         "x;", &x);
+
+    JS::RootedObject obj(cx, JSVAL_TO_OBJECT(x));
+    for (int i = 0; i < 2; i++)
+        CHECK(JS_DefineProperty(cx, obj, "q", JS::UndefinedHandleValue, JSPROP_SHARED));
+    return true;
+}
+END_TEST(testDefineProperty_bug564344)