Add m-esr52 at 52.6.0

1 files changed, 86 insertions, 0 deletions

diff --git a/js/src/vm/EnvironmentObject-inl.h b/js/src/vm/EnvironmentObject-inl.h
new file mode 100644
index 000000000..0cb3a41e9
--- /dev/null
+++ b/js/src/vm/EnvironmentObject-inl.h
@@ -0,0 +1,86 @@
+/* -*- 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/. */
+
+#ifndef vm_EnvironmentObject_inl_h
+#define vm_EnvironmentObject_inl_h
+
+#include "vm/EnvironmentObject.h"
+#include "frontend/SharedContext.h"
+
+#include "jsobjinlines.h"
+
+#include "vm/TypeInference-inl.h"
+
+namespace js {
+
+inline LexicalEnvironmentObject&
+NearestEnclosingExtensibleLexicalEnvironment(JSObject* env)
+{
+    while (!IsExtensibleLexicalEnvironment(env))
+        env = env->enclosingEnvironment();
+    return env->as<LexicalEnvironmentObject>();
+}
+
+inline void
+EnvironmentObject::setAliasedBinding(JSContext* cx, uint32_t slot, PropertyName* name,
+                                     const Value& v)
+{
+    if (isSingleton()) {
+        MOZ_ASSERT(name);
+        AddTypePropertyId(cx, this, NameToId(name), v);
+
+        // Keep track of properties which have ever been overwritten.
+        if (!getSlot(slot).isUndefined()) {
+            Shape* shape = lookup(cx, name);
+            shape->setOverwritten();
+        }
+    }
+
+    setSlot(slot, v);
+}
+
+inline void
+EnvironmentObject::setAliasedBinding(JSContext* cx, EnvironmentCoordinate ec, PropertyName* name,
+                                     const Value& v)
+{
+    setAliasedBinding(cx, ec.slot(), name, v);
+}
+
+inline void
+EnvironmentObject::setAliasedBinding(JSContext* cx, const BindingIter& bi, const Value& v)
+{
+    MOZ_ASSERT(bi.location().kind() == BindingLocation::Kind::Environment);
+    setAliasedBinding(cx, bi.location().slot(), bi.name()->asPropertyName(), v);
+}
+
+inline void
+CallObject::setAliasedFormalFromArguments(JSContext* cx, const Value& argsValue, jsid id,
+                                          const Value& v)
+{
+    setSlot(ArgumentsObject::SlotFromMagicScopeSlotValue(argsValue), v);
+    if (isSingleton())
+        AddTypePropertyId(cx, this, id, v);
+}
+
+}  /* namespace js */
+
+inline JSObject*
+JSObject::enclosingEnvironment() const
+{
+    if (is<js::EnvironmentObject>())
+        return &as<js::EnvironmentObject>().enclosingEnvironment();
+
+    if (is<js::DebugEnvironmentProxy>())
+        return &as<js::DebugEnvironmentProxy>().enclosingEnvironment();
+
+    if (is<js::GlobalObject>())
+        return nullptr;
+
+    MOZ_ASSERT_IF(is<JSFunction>(), as<JSFunction>().isInterpreted());
+    return &global();
+}
+
+#endif /* vm_EnvironmentObject_inl_h */