diff -r 000000000000 -r 6474c204b198 js/src/vm/ScopeObject-inl.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/vm/ScopeObject-inl.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,129 @@
+/* -*- 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_ScopeObject_inl_h
+#define vm_ScopeObject_inl_h
+
+#include "vm/ScopeObject.h"
+
+#include "jsinferinlines.h"
+
+namespace js {
+
+inline void
+ScopeObject::setAliasedVar(JSContext *cx, ScopeCoordinate sc, PropertyName *name, const Value &v)
+{
+    JS_ASSERT(is<CallObject>() || is<ClonedBlockObject>());
+    JS_STATIC_ASSERT(CallObject::RESERVED_SLOTS == BlockObject::RESERVED_SLOTS);
+
+    setSlot(sc.slot(), v);
+
+    // name may be null if we don't need to track side effects on the object.
+    if (hasSingletonType() && !hasLazyType()) {
+        JS_ASSERT(name);
+        types::AddTypePropertyId(cx, this, NameToId(name), v);
+    }
+}
+
+inline void
+CallObject::setAliasedVar(JSContext *cx, AliasedFormalIter fi, PropertyName *name, const Value &v)
+{
+    JS_ASSERT(name == fi->name());
+    setSlot(fi.scopeSlot(), v);
+    if (hasSingletonType())
+        types::AddTypePropertyId(cx, this, NameToId(name), v);
+}
+
+inline void
+CallObject::setAliasedVarFromArguments(JSContext *cx, const Value &argsValue, jsid id, const Value &v)
+{
+    setSlot(argsValue.magicUint32(), v);
+    if (hasSingletonType())
+        types::AddTypePropertyId(cx, this, id, v);
+}
+
+template <AllowGC allowGC>
+inline bool
+StaticScopeIter<allowGC>::done() const
+{
+    return !obj;
+}
+
+template <AllowGC allowGC>
+inline void
+StaticScopeIter<allowGC>::operator++(int)
+{
+    if (obj->template is<NestedScopeObject>()) {
+        obj = obj->template as<NestedScopeObject>().enclosingScopeForStaticScopeIter();
+    } else if (onNamedLambda || !obj->template as<JSFunction>().isNamedLambda()) {
+        onNamedLambda = false;
+        obj = obj->template as<JSFunction>().nonLazyScript()->enclosingStaticScope();
+    } else {
+        onNamedLambda = true;
+    }
+    JS_ASSERT_IF(obj, obj->template is<NestedScopeObject>() || obj->template is<JSFunction>());
+    JS_ASSERT_IF(onNamedLambda, obj->template is<JSFunction>());
+}
+
+template <AllowGC allowGC>
+inline bool
+StaticScopeIter<allowGC>::hasDynamicScopeObject() const
+{
+    return obj->template is<StaticBlockObject>()
+           ? obj->template as<StaticBlockObject>().needsClone()
+           : (obj->template is<StaticWithObject>() ||
+              obj->template as<JSFunction>().isHeavyweight());
+}
+
+template <AllowGC allowGC>
+inline Shape *
+StaticScopeIter<allowGC>::scopeShape() const
+{
+    JS_ASSERT(hasDynamicScopeObject());
+    JS_ASSERT(type() != NAMED_LAMBDA);
+    if (type() == BLOCK)
+        return block().lastProperty();
+    return funScript()->callObjShape();
+}
+
+template <AllowGC allowGC>
+inline typename StaticScopeIter<allowGC>::Type
+StaticScopeIter<allowGC>::type() const
+{
+    if (onNamedLambda)
+        return NAMED_LAMBDA;
+    return obj->template is<StaticBlockObject>()
+           ? BLOCK
+           : (obj->template is<StaticWithObject>() ? WITH : FUNCTION);
+}
+
+template <AllowGC allowGC>
+inline StaticBlockObject &
+StaticScopeIter<allowGC>::block() const
+{
+    JS_ASSERT(type() == BLOCK);
+    return obj->template as<StaticBlockObject>();
+}
+
+template <AllowGC allowGC>
+inline StaticWithObject &
+StaticScopeIter<allowGC>::staticWith() const
+{
+    JS_ASSERT(type() == WITH);
+    return obj->template as<StaticWithObject>();
+}
+
+template <AllowGC allowGC>
+inline JSScript *
+StaticScopeIter<allowGC>::funScript() const
+{
+    JS_ASSERT(type() == FUNCTION);
+    return obj->template as<JSFunction>().nonLazyScript();
+}
+
+}  /* namespace js */
+
+#endif /* vm_ScopeObject_inl_h */