Add m-esr52 at 52.6.0

1 files changed, 37 insertions, 0 deletions

diff --git a/js/src/vm/CallNonGenericMethod.cpp b/js/src/vm/CallNonGenericMethod.cpp
new file mode 100644
index 000000000..131c44742
--- /dev/null
+++ b/js/src/vm/CallNonGenericMethod.cpp
@@ -0,0 +1,37 @@
+/* -*- 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 "js/CallNonGenericMethod.h"
+
+#include "jsfun.h"
+#include "jsobj.h"
+
+#include "proxy/Proxy.h"
+#include "vm/ProxyObject.h"
+#include "vm/SelfHosting.h"
+
+using namespace js;
+
+bool
+JS::detail::CallMethodIfWrapped(JSContext* cx, IsAcceptableThis test, NativeImpl impl,
+                                const CallArgs& args)
+{
+    HandleValue thisv = args.thisv();
+    MOZ_ASSERT(!test(thisv));
+
+    if (thisv.isObject()) {
+        JSObject& thisObj = args.thisv().toObject();
+        if (thisObj.is<ProxyObject>())
+            return Proxy::nativeCall(cx, test, impl, args);
+    }
+
+    if (IsCallSelfHostedNonGenericMethod(impl))
+        return ReportIncompatibleSelfHostedMethod(cx, args);
+
+    ReportIncompatible(cx, args);
+    return false;
+}
+