Bug 830787 - Move jsscope to vm/Shape. r=jorendroff

--HG--
rename : js/src/jsscopeinlines.h => js/src/vm/Shape-inl.h
rename : js/src/jsscope.cpp => js/src/vm/Shape.cpp
rename : js/src/jsscope.h => js/src/vm/Shape.h

js/src/Makefile.in

@@ -108,7 +108,6 @@ CPPSRCS		= \
 		jspropertycache.cpp \
 		jspropertytree.cpp \
 		jsreflect.cpp \
-		jsscope.cpp \
 		jsscript.cpp \
 		jsstr.cpp \
 		jstypedarray.cpp \
@@ -130,6 +129,7 @@ CPPSRCS		= \
 		Object.cpp \
 		ObjectImpl.cpp \
 		ScopeObject.cpp \
+		Shape.cpp \
 		Stack.cpp \
 		String.cpp \
 		BytecodeCompiler.cpp \

js/src/frontend/BytecodeEmitter.cpp

@@ -27,7 +27,6 @@
 #include "jsfun.h"
 #include "jsnum.h"
 #include "jsopcode.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jsautooplen.h"        // generated headers last
 
@@ -37,14 +36,15 @@
 #include "frontend/TokenStream.h"
 #include "vm/Debugger.h"
 #include "vm/RegExpObject.h"
+#include "vm/Shape.h"
 
 #include "jsatominlines.h"
-#include "jsscopeinlines.h"
 #include "jsscriptinlines.h"
 
 #include "frontend/ParseMaps-inl.h"
 #include "frontend/ParseNode-inl.h"
 #include "frontend/SharedContext-inl.h"
+#include "vm/Shape-inl.h"
 
 /* Allocation chunk counts, must be powers of two in general. */
 #define BYTECODE_CHUNK_LENGTH  1024    /* initial bytecode chunk length */

js/src/frontend/Parser.cpp

@@ -37,7 +37,6 @@
 #include "jsnum.h"
 #include "jsobj.h"
 #include "jsopcode.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jsstr.h"
 
@@ -46,6 +45,7 @@
 #include "frontend/Parser.h"
 #include "frontend/TokenStream.h"
 #include "gc/Marking.h"
+#include "vm/Shape.h"
 
 #if JS_HAS_XML_SUPPORT
 #include "jsxml.h"

js/src/gc/Marking.cpp

@@ -8,17 +8,17 @@
 #include "mozilla/DebugOnly.h"
 
 #include "jsprf.h"
-#include "jsscope.h"
 #include "jsstr.h"
 #include "jsxml.h"
 
 #include "gc/Marking.h"
 #include "methodjit/MethodJIT.h"
+#include "vm/Shape.h"
 
 #include "jsobjinlines.h"
-#include "jsscopeinlines.h"
 
 #include "ion/IonCode.h"
+#include "vm/Shape-inl.h"
 #include "vm/String-inl.h"
 
 using namespace js;

js/src/ion/IonCaches.cpp

@@ -7,8 +7,6 @@
 
 #include "mozilla/DebugOnly.h"
 
-#include "jsscope.h"
-
 #include "CodeGenerator.h"
 #include "Ion.h"
 #include "IonCaches.h"
@@ -16,9 +14,10 @@
 #include "IonSpewer.h"
 #include "VMFunctions.h"
 
+#include "vm/Shape.h"
+
 #include "jsinterpinlines.h"
 
-#include "vm/Stack.h"
 #include "IonFrames-inl.h"
 
 using namespace js;

js/src/ion/IonMacroAssembler.h

@@ -19,10 +19,11 @@
 #include "ion/IonInstrumentation.h"
 #include "ion/TypeOracle.h"
 
-#include "jsscope.h"
 #include "jstypedarray.h"
 #include "jscompartment.h"
 
+#include "vm/Shape.h"
+
 namespace js {
 namespace ion {
 

js/src/ion/arm/CodeGenerator-arm.cpp

@@ -5,21 +5,23 @@
  * 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 "CodeGenerator-arm.h"
-#include "ion/shared/CodeGenerator-shared-inl.h"
-#include "ion/MIR.h"
-#include "ion/MIRGraph.h"
-#include "jsnum.h"
-#include "jsscope.h"
-#include "jsscriptinlines.h"
 
 #include "jscntxt.h"
 #include "jscompartment.h"
-#include "ion/IonFrames.h"
-#include "ion/MoveEmitter.h"
-#include "ion/IonCompartment.h"
+#include "jsnum.h"
 
-#include "jsscopeinlines.h"
+#include "CodeGenerator-arm.h"
+#include "ion/IonCompartment.h"
+#include "ion/IonFrames.h"
+#include "ion/MIR.h"
+#include "ion/MIRGraph.h"
+#include "ion/MoveEmitter.h"
+#include "ion/shared/CodeGenerator-shared-inl.h"
+#include "vm/Shape.h"
+
+#include "jsscriptinlines.h"
+
+#include "vm/Shape-inl.h"
 
 using namespace js;
 using namespace js::ion;

js/src/ion/x64/CodeGenerator-x64.cpp

@@ -5,13 +5,15 @@
  * 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 "jsnum.h"
+
 #include "CodeGenerator-x64.h"
-#include "ion/shared/CodeGenerator-shared-inl.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
-#include "jsnum.h"
-#include "jsscope.h"
-#include "jsscopeinlines.h"
+#include "ion/shared/CodeGenerator-shared-inl.h"
+#include "vm/Shape.h"
+
+#include "vm/Shape-inl.h"
 
 using namespace js;
 using namespace js::ion;

js/src/ion/x86/CodeGenerator-x86.cpp

@@ -7,12 +7,14 @@
 
 #include "mozilla/DebugOnly.h"
 
+#include "jsnum.h"
+
 #include "CodeGenerator-x86.h"
-#include "ion/shared/CodeGenerator-shared-inl.h"
 #include "ion/MIR.h"
 #include "ion/MIRGraph.h"
-#include "jsnum.h"
-#include "jsscope.h"
+#include "ion/shared/CodeGenerator-shared-inl.h"
+#include "vm/Shape.h"
+
 #include "jsscriptinlines.h"
 
 using namespace js;

js/src/jsapi-tests/testRegExpInstanceProperties.cpp

@@ -10,9 +10,10 @@
 
 #include "jscompartment.h"
 #include "jsgc.h"
-#include "jsscope.h"
 
-#include "jsscopeinlines.h"
+#include "vm/Shape.h"
+
+#include "vm/Shape-inl.h"
 
 BEGIN_TEST(testRegExpInstanceProperties)
 {

js/src/jsapi.cpp

@@ -45,7 +45,6 @@
 #include "jsopcode.h"
 #include "jsprobes.h"
 #include "jsproxy.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jsstr.h"
 #include "prmjtime.h"
@@ -68,6 +67,7 @@
 #include "js/MemoryMetrics.h"
 #include "vm/Debugger.h"
 #include "vm/NumericConversions.h"
+#include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 #include "vm/Xdr.h"
 #include "yarr/BumpPointerAllocator.h"
@@ -76,12 +76,12 @@
 #include "jsinferinlines.h"
 #include "jsinterpinlines.h"
 #include "jsobjinlines.h"
-#include "jsscopeinlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/ObjectImpl-inl.h"
 #include "vm/RegExpObject-inl.h"
 #include "vm/RegExpStatics-inl.h"
+#include "vm/Shape-inl.h"
 #include "vm/Stack-inl.h"
 #include "vm/String-inl.h"
 

js/src/jsarray.cpp

@@ -30,7 +30,6 @@
 #include "jslock.h"
 #include "jsnum.h"
 #include "jsobj.h"
-#include "jsscope.h"
 #include "jswrapper.h"
 #include "methodjit/MethodJIT.h"
 #include "methodjit/StubCalls.h"
@@ -40,6 +39,7 @@
 #include "vm/ArgumentsObject.h"
 #include "vm/ForkJoin.h"
 #include "vm/NumericConversions.h"
+#include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 #include "vm/ThreadPool.h"
 
@@ -49,11 +49,11 @@
 #include "jscntxtinlines.h"
 #include "jsinterpinlines.h"
 #include "jsobjinlines.h"
-#include "jsscopeinlines.h"
 #include "jsstrinlines.h"
 
 #include "vm/ArgumentsObject-inl.h"
 #include "vm/ObjectImpl-inl.h"
+#include "vm/Shape-inl.h"
 #include "vm/Stack-inl.h"
 
 using namespace js;

js/src/jscntxt.cpp

@@ -43,7 +43,6 @@
 #include "jsobj.h"
 #include "jsopcode.h"
 #include "jspubtd.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jsstr.h"
 #include "jsworkers.h"
@@ -61,6 +60,7 @@
 #include "js/MemoryMetrics.h"
 #include "frontend/TokenStream.h"
 #include "frontend/ParseMaps.h"
+#include "vm/Shape.h"
 #include "yarr/BumpPointerAllocator.h"
 
 #include "jsatominlines.h"

js/src/jscompartment.cpp

@@ -14,13 +14,19 @@
 #include "jsiter.h"
 #include "jsmath.h"
 #include "jsproxy.h"
-#include "jsscope.h"
 #include "jswatchpoint.h"
 #include "jswrapper.h"
 
+#if ENABLE_YARR_JIT
+#include "assembler/jit/ExecutableAllocator.h"
+#endif
 #include "assembler/wtf/Platform.h"
 #include "gc/Marking.h"
 #include "gc/Root.h"
+#ifdef JS_ION
+#include "ion/IonCompartment.h"
+#include "ion/Ion.h"
+#endif
 #include "js/MemoryMetrics.h"
 #include "methodjit/MethodJIT.h"
 #include "methodjit/PolyIC.h"
@@ -32,15 +38,8 @@
 
 #include "jsgcinlines.h"
 #include "jsobjinlines.h"
-#include "jsscopeinlines.h"
-#ifdef JS_ION
-#include "ion/IonCompartment.h"
-#include "ion/Ion.h"
-#endif
 
-#if ENABLE_YARR_JIT
-#include "assembler/jit/ExecutableAllocator.h"
-#endif
+#include "vm/Shape-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/jscompartment.h

@@ -16,12 +16,12 @@
 #include "jsfun.h"
 #include "jsgc.h"
 #include "jsobj.h"
-#include "jsscope.h"
 
 #include "gc/StoreBuffer.h"
 #include "gc/FindSCCs.h"
 #include "vm/GlobalObject.h"
 #include "vm/RegExpObject.h"
+#include "vm/Shape.h"
 
 namespace js {
 

js/src/jsdbgapi.cpp

@@ -26,7 +26,6 @@
 #include "jslock.h"
 #include "jsobj.h"
 #include "jsopcode.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jsstr.h"
 #include "jswatchpoint.h"
@@ -36,14 +35,15 @@
 #include "frontend/BytecodeEmitter.h"
 #include "frontend/Parser.h"
 #include "vm/Debugger.h"
+#include "vm/Shape.h"
 
 #include "jsatominlines.h"
 #include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsinterpinlines.h"
-#include "jsscopeinlines.h"
 #include "jsscriptinlines.h"
 
+#include "vm/Shape-inl.h"
 #include "vm/Stack-inl.h"
 
 #include "jsautooplen.h"

js/src/jsexn.cpp

@@ -26,12 +26,12 @@
 #include "jsnum.h"
 #include "jsobj.h"
 #include "jsopcode.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jswrapper.h"
 
 #include "gc/Marking.h"
 #include "vm/GlobalObject.h"
+#include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 
 #include "jsinferinlines.h"

js/src/jsfun.cpp

@@ -31,7 +31,6 @@
 #include "jsopcode.h"
 #include "jspropertytree.h"
 #include "jsproxy.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jsstr.h"
 
@@ -41,6 +40,7 @@
 #include "gc/Marking.h"
 #include "vm/Debugger.h"
 #include "vm/ScopeObject.h"
+#include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 #include "vm/Xdr.h"
 

js/src/jsgc.cpp

@@ -65,7 +65,6 @@
 #include "jsobj.h"
 #include "jsprobes.h"
 #include "jsproxy.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jswatchpoint.h"
 #include "jsweakmap.h"
@@ -81,8 +80,9 @@
 #include "gc/Memory.h"
 #include "methodjit/MethodJIT.h"
 #include "vm/Debugger.h"
-#include "vm/String.h"
 #include "vm/ForkJoin.h"
+#include "vm/Shape.h"
+#include "vm/String.h"
 #include "ion/IonCode.h"
 #ifdef JS_ION
 # include "ion/IonMacroAssembler.h"

js/src/jsgcinlines.h

@@ -11,12 +11,11 @@
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jslock.h"
-#include "jsscope.h"
 #include "jsxml.h"
 
 #include "gc/Root.h"
-
 #include "js/TemplateLib.h"
+#include "vm/Shape.h"
 
 using JS::AssertCanGC;
 

js/src/jsinfer.cpp

@@ -19,7 +19,6 @@
 #include "jsobj.h"
 #include "jsscript.h"
 #include "jscntxt.h"
-#include "jsscope.h"
 #include "jsstr.h"
 #include "jsiter.h"
 #include "jsworkers.h"
@@ -33,6 +32,7 @@
 #include "js/MemoryMetrics.h"
 #include "methodjit/MethodJIT.h"
 #include "methodjit/Retcon.h"
+#include "vm/Shape.h"
 #ifdef JS_METHODJIT
 # include "assembler/assembler/MacroAssembler.h"
 #endif

js/src/jsinterp.cpp

@@ -36,13 +36,13 @@
 #include "jsobj.h"
 #include "jsopcode.h"
 #include "jspropertycache.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jsstr.h"
 
 #include "builtin/Eval.h"
 #include "gc/Marking.h"
 #include "vm/Debugger.h"
+#include "vm/Shape.h"
 
 #ifdef JS_METHODJIT
 #include "methodjit/MethodJIT.h"
@@ -58,11 +58,11 @@
 #include "jsopcodeinlines.h"
 #include "jsprobes.h"
 #include "jspropertycacheinlines.h"
-#include "jsscopeinlines.h"
 #include "jsscriptinlines.h"
 #include "jstypedarrayinlines.h"
 
 #include "builtin/Iterator-inl.h"
+#include "vm/Shape-inl.h"
 #include "vm/Stack-inl.h"
 #include "vm/String-inl.h"
 

js/src/jsiter.cpp

@@ -28,7 +28,6 @@
 #include "jsobj.h"
 #include "jsopcode.h"
 #include "jsproxy.h"
-#include "jsscope.h"
 #include "jsscript.h"
 
 #if JS_HAS_XML_SUPPORT
@@ -36,11 +35,11 @@
 #endif
 
 #include "builtin/ParallelArray.h"
-
 #include "ds/Sort.h"
 #include "frontend/TokenStream.h"
 #include "gc/Marking.h"
 #include "vm/GlobalObject.h"
+#include "vm/Shape.h"
 
 #include "jsinferinlines.h"
 #include "jsobjinlines.h"

js/src/jsmemorymetrics.cpp

@@ -14,13 +14,13 @@
 #include "jscompartment.h"
 #include "jsgc.h"
 #include "jsobj.h"
-#include "jsscope.h"
 #include "jsscript.h"
 
-#include "jsobjinlines.h"
-
-#include "ion/IonCode.h"
 #include "ion/Ion.h"
+#include "ion/IonCode.h"
+#include "vm/Shape.h"
+
+#include "jsobjinlines.h"
 
 using namespace js;
 

js/src/jsnum.cpp

@@ -39,12 +39,12 @@
 #include "jsobj.h"
 #include "jsopcode.h"
 #include "jsprf.h"
-#include "jsscope.h"
 #include "jsstr.h"
 #include "jslibmath.h"
 
 #include "vm/GlobalObject.h"
 #include "vm/NumericConversions.h"
+#include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 
 #include "jsatominlines.h"

js/src/jsobj.cpp

@@ -36,7 +36,6 @@
 #include "jsprobes.h"
 #include "jsprototypes.h"
 #include "jsproxy.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jsstr.h"
 #include "jsdbgapi.h"
@@ -52,6 +51,7 @@
 #include "frontend/Parser.h"
 #include "gc/Marking.h"
 #include "js/MemoryMetrics.h"
+#include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 #include "vm/Xdr.h"
 
@@ -60,12 +60,12 @@
 #include "jscntxtinlines.h"
 #include "jsinterpinlines.h"
 #include "jsobjinlines.h"
-#include "jsscopeinlines.h"
 #include "jsscriptinlines.h"
 #include "jscompartmentinlines.h"
 
 #include "vm/BooleanObject-inl.h"
 #include "vm/NumberObject-inl.h"
+#include "vm/Shape-inl.h"
 #include "vm/StringObject-inl.h"
 
 #include "jsautooplen.h"

js/src/jsobjinlines.h

@@ -20,7 +20,6 @@
 #include "jsprobes.h"
 #include "jspropertytree.h"
 #include "jsproxy.h"
-#include "jsscope.h"
 #include "jsstr.h"
 #include "jstypedarray.h"
 #include "jsxml.h"
@@ -35,6 +34,7 @@
 #include "js/TemplateLib.h"
 #include "vm/BooleanObject.h"
 #include "vm/GlobalObject.h"
+#include "vm/Shape.h"
 #include "vm/NumberObject.h"
 #include "vm/RegExpStatics.h"
 #include "vm/StringObject.h"
@@ -44,12 +44,12 @@
 #include "jsfuninlines.h"
 #include "jsgcinlines.h"
 #include "jsinferinlines.h"
-#include "jsscopeinlines.h"
 #include "jsscriptinlines.h"
 
 #include "gc/Barrier-inl.h"
 
 #include "vm/ObjectImpl-inl.h"
+#include "vm/Shape-inl.h"
 #include "vm/RegExpStatics-inl.h"
 #include "vm/String-inl.h"
 

js/src/jsopcode.cpp

@@ -33,7 +33,6 @@
 #include "jsnum.h"
 #include "jsobj.h"
 #include "jsopcode.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jsstr.h"
 
@@ -42,6 +41,7 @@
 #include "frontend/TokenStream.h"
 #include "js/CharacterEncoding.h"
 #include "vm/Debugger.h"
+#include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 
 #include "jscntxtinlines.h"

js/src/jspropertycacheinlines.h

@@ -10,7 +10,8 @@
 
 #include "jslock.h"
 #include "jspropertycache.h"
-#include "jsscope.h"
+
+#include "vm/Shape.h"
 
 /*
  * This method is designed to inline the fast path in js_Interpret, so it makes

js/src/jspropertytree.cpp

@@ -10,11 +10,13 @@
 #include "jscntxt.h"
 #include "jsgc.h"
 #include "jspropertytree.h"
-#include "jsscope.h"
+
+#include "vm/Shape.h"
 
 #include "jsgcinlines.h"
 #include "jsobjinlines.h"
-#include "jsscopeinlines.h"
+
+#include "vm/Shape-inl.h"
 
 using namespace js;
 

js/src/jsproxy.cpp

@@ -13,9 +13,9 @@
 #include "jsprvtd.h"
 #include "jsnum.h"
 #include "jsproxy.h"
-#include "jsscope.h"
 
 #include "gc/Marking.h"
+#include "vm/Shape.h"
 
 #include "jsatominlines.h"
 #include "jsinferinlines.h"

js/src/jsscript.cpp

@@ -25,7 +25,6 @@
 #include "jslock.h"
 #include "jsnum.h"
 #include "jsopcode.h"
-#include "jsscope.h"
 #include "jsscript.h"
 
 #include "gc/Marking.h"
@@ -36,6 +35,7 @@
 #include "ion/IonCode.h"
 #include "methodjit/Retcon.h"
 #include "vm/Debugger.h"
+#include "vm/Shape.h"
 #include "vm/Xdr.h"
 
 #include "jsinferinlines.h"

js/src/jsscript.h

@@ -13,10 +13,10 @@
 #include "jsdbgapi.h"
 #include "jsinfer.h"
 #include "jsopcode.h"
-#include "jsscope.h"
 
 #include "gc/Barrier.h"
 #include "gc/Root.h"
+#include "vm/Shape.h"
 
 ForwardDeclareJS(Script);
 

js/src/jsscriptinlines.h

@@ -13,12 +13,12 @@
 #include "jsfun.h"
 #include "jsopcode.h"
 #include "jsscript.h"
-#include "jsscope.h"
 
 #include "vm/GlobalObject.h"
 #include "vm/RegExpObject.h"
+#include "vm/Shape.h"
 
-#include "jsscopeinlines.h"
+#include "vm/Shape-inl.h"
 
 namespace js {
 

js/src/jsstr.cpp

@@ -37,7 +37,6 @@
 #include "jsobj.h"
 #include "jsopcode.h"
 #include "jsprobes.h"
-#include "jsscope.h"
 #include "jsstr.h"
 #include "jsversion.h"
 
@@ -46,6 +45,7 @@
 #include "vm/GlobalObject.h"
 #include "vm/NumericConversions.h"
 #include "vm/RegExpObject.h"
+#include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 
 #include "jsinferinlines.h"

js/src/jsxml.cpp

@@ -32,7 +32,6 @@ size_t sE4XObjectsCreated = 0;
 #include "jsnum.h"
 #include "jsobj.h"
 #include "jsopcode.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jsstr.h"
 #include "jsxml.h"
@@ -41,6 +40,7 @@ size_t sE4XObjectsCreated = 0;
 #include "frontend/TokenStream.h"
 #include "gc/Marking.h"
 #include "vm/GlobalObject.h"
+#include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 
 #include "jsatominlines.h"

js/src/methodjit/BaseAssembler.h

@@ -19,9 +19,10 @@
 #include "methodjit/MachineRegs.h"
 #include "CodeGenIncludes.h"
 #include "jsobjinlines.h"
-#include "jsscopeinlines.h"
 #include "jstypedarrayinlines.h"
 
+#include "vm/Shape-inl.h"
+
 using mozilla::DebugOnly;
 
 namespace js {

js/src/methodjit/FastOps.cpp

@@ -8,12 +8,12 @@
 #include "jsbool.h"
 #include "jscntxt.h"
 #include "jslibmath.h"
-#include "jsscope.h"
 
 #include "methodjit/MethodJIT.h"
 #include "methodjit/Compiler.h"
 #include "methodjit/StubCalls.h"
 #include "vm/NumericConversions.h"
+#include "vm/Shape.h"
 
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"

js/src/methodjit/InvokeHelpers.cpp

@@ -9,7 +9,6 @@
 
 #include "jsanalyze.h"
 #include "jscntxt.h"
-#include "jsscope.h"
 #include "jsobj.h"
 #include "jslibmath.h"
 #include "jsiter.h"
@@ -26,9 +25,9 @@
 #include "methodjit/BaseCompiler.h"
 #include "methodjit/ICRepatcher.h"
 #include "vm/Debugger.h"
+#include "vm/Shape.h"
 
 #include "jsinterpinlines.h"
-#include "jsscopeinlines.h"
 #include "jsscriptinlines.h"
 #include "jsobjinlines.h"
 #include "jscntxtinlines.h"
@@ -36,6 +35,8 @@
 
 #include "StubCalls-inl.h"
 
+#include "vm/Shape-inl.h"
+
 #include "jsautooplen.h"
 
 #include "ion/Ion.h"

js/src/methodjit/MethodJIT.cpp

@@ -5,24 +5,25 @@
  * 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 "MethodJIT.h"
-#include "Logging.h"
-#include "assembler/jit/ExecutableAllocator.h"
-#include "assembler/assembler/RepatchBuffer.h"
-#include "gc/Marking.h"
-#include "js/MemoryMetrics.h"
 #include "BaseAssembler.h"
 #include "Compiler.h"
-#include "MonoIC.h"
-#include "PolyIC.h"
-#include "TrampolineCompiler.h"
 #include "jscntxtinlines.h"
 #include "jscompartment.h"
-#include "jsscope.h"
+#include "Logging.h"
+#include "MethodJIT.h"
+#include "MonoIC.h"
+#include "PolyIC.h"
+#include "Retcon.h"
+#include "TrampolineCompiler.h"
+
+#include "assembler/assembler/RepatchBuffer.h"
+#include "assembler/jit/ExecutableAllocator.h"
+#include "gc/Marking.h"
 #include "ion/Ion.h"
 #include "ion/IonCode.h"
 #include "ion/IonCompartment.h"
-#include "methodjit/Retcon.h"
+#include "js/MemoryMetrics.h"
+#include "vm/Shape.h"
 
 #include "jsgcinlines.h"
 #include "jsinterpinlines.h"

js/src/methodjit/MonoIC.cpp

@@ -8,12 +8,14 @@
 #include "jscntxt.h"
 #include "jsnum.h"
 #include "jsobj.h"
-#include "jsscope.h"
 
+#include "assembler/assembler/CodeLocation.h"
 #include "assembler/assembler/LinkBuffer.h"
 #include "assembler/assembler/MacroAssembler.h"
-#include "assembler/assembler/CodeLocation.h"
-
+#include "builtin/RegExp.h"
+#ifdef JS_ION
+# include "ion/IonMacroAssembler.h"
+#endif
 #include "methodjit/CodeGenIncludes.h"
 #include "methodjit/Compiler.h"
 #include "methodjit/ICRepatcher.h"
@@ -21,18 +23,14 @@
 #include "methodjit/MonoIC.h"
 #include "methodjit/PolyIC.h"
 #include "methodjit/StubCalls.h"
-
-#include "builtin/RegExp.h"
+#include "vm/Shape.h"
 
 #include "jsinterpinlines.h"
 #include "jsobjinlines.h"
-#include "jsscopeinlines.h"
 #include "jsscriptinlines.h"
 
 #include "methodjit/StubCalls-inl.h"
-#ifdef JS_ION
-# include "ion/IonMacroAssembler.h"
-#endif
+#include "vm/Shape-inl.h"
 
 using namespace js;
 using namespace js::mjit;

js/src/methodjit/PolyIC.cpp

@@ -11,20 +11,22 @@
 #include "BaseCompiler.h"
 #include "assembler/assembler/LinkBuffer.h"
 #include "TypedArrayIC.h"
-#include "jsscope.h"
 #include "jsnum.h"
 #include "jstypedarray.h"
-#include "jsatominlines.h"
-#include "jsobjinlines.h"
-#include "jsscopeinlines.h"
-#include "jsinterpinlines.h"
 #include "jsautooplen.h"
 
 #include "js/CharacterEncoding.h"
+#include "vm/Shape.h"
 
 #include "vm/ScopeObject-inl.h"
 #include "vm/StringObject-inl.h"
 
+#include "jsatominlines.h"
+#include "jsobjinlines.h"
+#include "jsinterpinlines.h"
+
+#include "vm/Shape-inl.h"
+
 #if defined JS_POLYIC
 
 using namespace js;

js/src/methodjit/StubCalls.cpp

@@ -9,7 +9,6 @@
 #include "mozilla/FloatingPoint.h"
 
 #include "jscntxt.h"
-#include "jsscope.h"
 #include "jsobj.h"
 #include "jslibmath.h"
 #include "jsiter.h"
@@ -22,6 +21,7 @@
 #include "gc/Marking.h"
 #include "vm/Debugger.h"
 #include "vm/NumericConversions.h"
+#include "vm/Shape.h"
 #include "vm/String.h"
 #include "methodjit/Compiler.h"
 #include "methodjit/StubCalls.h"
@@ -34,12 +34,12 @@
 #include "jsinterpinlines.h"
 #include "jsnuminlines.h"
 #include "jsobjinlines.h"
-#include "jsscopeinlines.h"
 #include "jsscriptinlines.h"
 #include "jstypedarray.h"
 
 #include "StubCalls-inl.h"
 #include "vm/RegExpObject-inl.h"
+#include "vm/Shape-inl.h"
 #include "vm/String-inl.h"
 
 #ifdef JS_ION

js/src/shell/js.cpp

@@ -37,7 +37,6 @@
 #include "jsobj.h"
 #include "json.h"
 #include "jsreflect.h"
-#include "jsscope.h"
 #include "jsscript.h"
 #include "jstypedarray.h"
 #include "jstypedarrayinlines.h"
@@ -49,6 +48,7 @@
 #include "frontend/BytecodeEmitter.h"
 #include "frontend/Parser.h"
 #include "methodjit/MethodJIT.h"
+#include "vm/Shape.h"
 
 #include "prmjtime.h"
 

js/src/vm/ObjectImpl.cpp

@@ -8,17 +8,13 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 
-#include "jsscope.h"
-#include "jsobjinlines.h"
-
-#include "js/TemplateLib.h"
-
-#include "Debugger.h"
-#include "ObjectImpl.h"
-
 #include "gc/Barrier-inl.h"
+#include "js/TemplateLib.h"
+#include "vm/Debugger.h"
+#include "vm/ObjectImpl.h"
 
-#include "ObjectImpl-inl.h"
+#include "vm/ObjectImpl-inl.h"
+#include "vm/Shape-inl.h"
 
 using namespace js;
 

js/src/vm/ScopeObject.cpp

@@ -7,10 +7,10 @@
 
 #include "jscompartment.h"
 #include "jsiter.h"
-#include "jsscope.h"
 
 #include "GlobalObject.h"
 #include "ScopeObject.h"
+#include "Shape.h"
 #include "Xdr.h"
 
 #include "jsatominlines.h"

js/src/vm/Shape-inl.h

@@ -3,8 +3,8 @@
  * 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 jsscopeinlines_h___
-#define jsscopeinlines_h___
+#ifndef Shape_inl_h__
+#define Shape_inl_h__
 
 #include "mozilla/DebugOnly.h"
 
@@ -15,11 +15,11 @@
 #include "jsfun.h"
 #include "jsgc.h"
 #include "jsobj.h"
-#include "jsscope.h"
 
 #include "gc/Marking.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/ScopeObject.h"
+#include "vm/Shape-inl.h"
 #include "vm/StringObject.h"
 
 #include "jscntxtinlines.h"
@@ -528,4 +528,4 @@ GetShapeAttributes(HandleShape shape)
 
 } /* namespace js */
 
-#endif /* jsscopeinlines_h___ */
+#endif /* Shape_inl_h__ */

js/src/vm/Shape.cpp

@@ -22,16 +22,17 @@
 #include "jslock.h"
 #include "jsnum.h"
 #include "jsobj.h"
-#include "jsscope.h"
 #include "jsstr.h"
 
 #include "js/HashTable.h"
 #include "js/MemoryMetrics.h"
+#include "vm/Shape.h"
 
 #include "jsatominlines.h"
 #include "jscntxtinlines.h"
 #include "jsobjinlines.h"
-#include "jsscopeinlines.h"
+
+#include "vm/Shape-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/vm/Shape.h

@@ -5,8 +5,8 @@
  * 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 jsscope_h___
-#define jsscope_h___
+#ifndef Shape_h___
+#define Shape_h___
 
 #include "mozilla/Attributes.h"
 #include "mozilla/GuardObjects.h"
@@ -1105,4 +1105,4 @@ template<> class AnchorPermitted<js::Shape *> { };
 template<> class AnchorPermitted<const js::Shape *> { };
 }
 
-#endif /* jsscope_h___ */
+#endif /* Shape_h___ */