Bug 916531 - Backed out changeset 47e05e8df03b (bug 915482, part 4) for causing hangs on Windows. r=me.

--HG--
extra : rebase_source : 1c3d96a670c031137d984584449704f32f728c3f

js/src/builtin/TypedObject.cpp

@@ -23,8 +23,6 @@
 #include "jsatominlines.h"
 #include "jsobjinlines.h"
 
-#include "vm/Shape-inl.h"
-
 using mozilla::DebugOnly;
 
 using namespace js;

js/src/gc/Marking.cpp

@@ -10,7 +10,6 @@
 
 #include "jit/IonCode.h"
 #include "vm/ArgumentsObject.h"
-#include "vm/ScopeObject.h"
 #include "vm/Shape.h"
 #include "vm/TypedArrayObject.h"
 
@@ -18,6 +17,7 @@
 #include "jsinferinlines.h"
 
 #include "gc/Nursery-inl.h"
+#include "vm/Shape-inl.h"
 #include "vm/String-inl.h"
 
 using namespace js;

js/src/jit/IonCaches.cpp

@@ -20,7 +20,6 @@
 #include "vm/Shape.h"
 
 #include "vm/Interpreter-inl.h"
-#include "vm/Shape-inl.h"
 
 using namespace js;
 using namespace js::jit;

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

@@ -22,6 +22,7 @@
 #include "jsscriptinlines.h"
 
 #include "jit/shared/CodeGenerator-shared-inl.h"
+#include "vm/Shape-inl.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jsapi-tests/testRegExpInstanceProperties.cpp

@@ -11,6 +11,8 @@
 #include "jsapi-tests/tests.h"
 #include "vm/Shape.h"
 
+#include "vm/Shape-inl.h"
+
 BEGIN_TEST(testRegExpInstanceProperties)
 {
     jsval regexpProtoVal;

js/src/jsapi.cpp

@@ -88,6 +88,7 @@
 
 #include "vm/Interpreter-inl.h"
 #include "vm/ObjectImpl-inl.h"
+#include "vm/Shape-inl.h"
 #include "vm/String-inl.h"
 
 using namespace js;

js/src/jsobjinlines.h

@@ -21,6 +21,8 @@
 #include "jsgcinlines.h"
 #include "jsinferinlines.h"
 
+#include "vm/Shape-inl.h"
+
 /* static */ inline bool
 JSObject::setGenericAttributes(JSContext *cx, js::HandleObject obj,
                                js::HandleId id, unsigned *attrsp)

js/src/vm/Shape-inl.h

@@ -9,9 +9,13 @@
 
 #include "vm/Shape.h"
 
+#include "mozilla/PodOperations.h"
+
+#include "jscntxt.h"
+#include "jsgc.h"
 #include "jsobj.h"
 
-#include "vm/Interpreter.h"
+#include "gc/Marking.h"
 #include "vm/ScopeObject.h"
 
 #include "jsatominlines.h"

js/src/vm/TypedArrayObject.cpp

@@ -40,8 +40,6 @@
 #include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
-#include "vm/Shape-inl.h"
-
 #if JS_USE_NEW_OBJECT_REPRESENTATION
 // See the comment above OldObjectRepresentationHack.
 #  error "TypedArray support for new object representation unimplemented."