1 files changed, 86 insertions, 0 deletions
diff --git a/js/src/jsapi-tests/testCallArgs.cpp b/js/src/jsapi-tests/testCallArgs.cpp
new file mode 100644
index 000000000..b924bbe4e
--- /dev/null
+++ b/js/src/jsapi-tests/testCallArgs.cpp
@@ -0,0 +1,86 @@
+/* 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
+CustomNative(JSContext* cx, unsigned argc, JS::Value* vp)
+{
+    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+
+    MOZ_RELEASE_ASSERT(!JS_IsExceptionPending(cx));
+
+    MOZ_RELEASE_ASSERT(!args.isConstructing());
+    args.rval().setUndefined();
+    MOZ_RELEASE_ASSERT(!args.isConstructing());
+
+    return true;
+}
+
+static bool
+TryConstruct(JSContext* cx, const char* code, const char* filename, decltype(__LINE__) lineno,
+             JS::MutableHandleValue vp)
+{
+    JS::CompileOptions opts(cx);
+    opts.setFileAndLine(filename, lineno);
+    return JS::Evaluate(cx, opts, code, strlen(code), vp);
+}
+
+BEGIN_TEST(testCallArgs_isConstructing_native)
+{
+    CHECK(JS_DefineFunction(cx, global, "customNative", CustomNative, 0, 0));
+
+    JS::RootedValue result(cx);
+
+    CHECK(!TryConstruct(cx, "new customNative();", __FILE__, __LINE__, &result));
+    CHECK(JS_IsExceptionPending(cx));
+    JS_ClearPendingException(cx);
+
+    EVAL("customNative();", &result);
+    CHECK(result.isUndefined());
+
+    return true;
+}
+END_TEST(testCallArgs_isConstructing_native)
+
+static bool
+CustomConstructor(JSContext* cx, unsigned argc, JS::Value* vp)
+{
+    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+
+    MOZ_RELEASE_ASSERT(!JS_IsExceptionPending(cx));
+
+    if (args.isConstructing()) {
+        JSObject* obj = JS_NewPlainObject(cx);
+        if (!obj)
+            return false;
+
+        args.rval().setObject(*obj);
+
+        MOZ_RELEASE_ASSERT(args.isConstructing());
+    } else {
+        args.rval().setUndefined();
+
+        MOZ_RELEASE_ASSERT(!args.isConstructing());
+    }
+
+    return true;
+}
+
+BEGIN_TEST(testCallArgs_isConstructing_constructor)
+{
+    CHECK(JS_DefineFunction(cx, global, "customConstructor", CustomConstructor, 0,
+                            JSFUN_CONSTRUCTOR));
+
+    JS::RootedValue result(cx);
+
+    EVAL("new customConstructor();", &result);
+    CHECK(result.isObject());
+
+    EVAL("customConstructor();", &result);
+    CHECK(result.isUndefined());
+
+    return true;
+}
+END_TEST(testCallArgs_isConstructing_constructor)