Bug 1429206 - Part 3: Rename jsobj* -> vm/JSObject*. r=jandem.

--HG--
rename : js/src/jsobjinlines.h => js/src/vm/JSObject-inl.h
rename : js/src/jsobj.cpp => js/src/vm/JSObject.cpp
rename : js/src/jsobj.h => js/src/vm/JSObject.h
extra : rebase_source : 56a6d297b6cb63b72670b2310a48e00d56917648
extra : source : f61c33f738a6c5d2e52a6063bd18c632caea9e91

config/check_spidermonkey_style.py

@@ -165,8 +165,8 @@ js/src/tests/style/BadIncludesOrder-inl.h:9:10: error:
 js/src/tests/style/BadIncludesOrder-inl.h:10:11: error:
     <stdio.h> should be included after "mozilla/HashFunctions.h"
 
-js/src/tests/style/BadIncludesOrder-inl.h:27:28: error:
-    "jsobj.h" should be included after "jsfun.h"
+js/src/tests/style/BadIncludesOrder-inl.h:28:29: error:
+    "vm/JSObject.h" should be included after "jsscript.h"
 
 (multiple files): error:
     header files form one or more cycles

js/src/builtin/AtomicsObject.cpp

@@ -66,7 +66,7 @@
 #include "vm/TypedArrayObject.h"
 #include "wasm/WasmInstance.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 

js/src/builtin/AtomicsObject.h

@@ -10,9 +10,8 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/TimeStamp.h"
 
-#include "jsobj.h"
-
 #include "threading/ConditionVariable.h"
+#include "vm/JSObject.h"
 #include "vm/MutexIDs.h"
 #include "vm/NativeObject.h"
 

js/src/builtin/DataViewObject.cpp

@@ -15,7 +15,6 @@
 #include "jsarray.h"
 #include "jscntxt.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #ifdef XP_WIN
 # include "jswin.h"
 #endif
@@ -26,6 +25,7 @@
 #include "vm/ArrayBufferObject.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/SharedMem.h"
 #include "vm/WrapperObject.h"
 

js/src/builtin/DataViewObject.h

@@ -9,11 +9,10 @@
 
 #include "mozilla/Attributes.h"
 
-#include "jsobj.h"
-
 #include "gc/Barrier.h"
 #include "js/Class.h"
 #include "vm/ArrayBufferObject.h"
+#include "vm/JSObject.h"
 #include "vm/SharedArrayObject.h"
 #include "vm/TypedArrayObject.h"
 

js/src/builtin/MapObject.cpp

@@ -8,13 +8,13 @@
 
 #include "jscntxt.h"
 #include "jsiter.h"
-#include "jsobj.h"
 
 #include "ds/OrderedHashTable.h"
 #include "gc/FreeOp.h"
 #include "js/Utility.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/SelfHosting.h"
 #include "vm/Symbol.h"
 

js/src/builtin/MapObject.h

@@ -7,10 +7,9 @@
 #ifndef builtin_MapObject_h
 #define builtin_MapObject_h
 
-#include "jsobj.h"
-
 #include "builtin/SelfHostingDefines.h"
 #include "vm/GlobalObject.h"
+#include "vm/JSObject.h"
 #include "vm/NativeObject.h"
 #include "vm/PIC.h"
 #include "vm/Runtime.h"

js/src/builtin/ModuleObject.cpp

@@ -17,9 +17,10 @@
 #include "vm/AsyncFunction.h"
 #include "vm/AsyncIteration.h"
 
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
+#include "vm/JSObject-inl.h"
+
 using namespace js;
 using namespace js::frontend;
 

js/src/builtin/Object.cpp

@@ -21,8 +21,7 @@
 #include "vm/RegExpObject.h"
 #include "vm/StringBuffer.h"
 
-#include "jsobjinlines.h"
-
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/Shape-inl.h"
 #include "vm/UnboxedObject-inl.h"

js/src/builtin/Promise.cpp

@@ -21,9 +21,8 @@
 #include "vm/AsyncIteration.h"
 #include "vm/Debugger.h"
 
-#include "jsobjinlines.h"
-
 #include "vm/Debugger-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;

js/src/builtin/Reflect.h

@@ -7,7 +7,7 @@
 #ifndef builtin_Reflect_h
 #define builtin_Reflect_h
 
-#include "jsobj.h"
+#include "vm/JSObject.h"
 
 namespace js {
 

js/src/builtin/ReflectParse.cpp

@@ -13,18 +13,17 @@
 #include <stdlib.h>
 
 #include "jsarray.h"
-#include "jsobj.h"
 #include "jspubtd.h"
 
 #include "builtin/Reflect.h"
 #include "frontend/Parser.h"
 #include "frontend/TokenStream.h"
 #include "js/CharacterEncoding.h"
+#include "vm/JSObject.h"
 #include "vm/RegExpObject.h"
 
-#include "jsobjinlines.h"
-
 #include "frontend/ParseNode-inl.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace js::frontend;

js/src/builtin/RegExp.cpp

@@ -19,8 +19,7 @@
 #include "vm/StringBuffer.h"
 #include "vm/Unicode.h"
 
-#include "jsobjinlines.h"
-
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/UnboxedObject-inl.h"
 

js/src/builtin/SIMD.cpp

@@ -28,7 +28,7 @@
 #include "jit/InlinableNatives.h"
 #include "js/Value.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 

js/src/builtin/SymbolObject.cpp

@@ -9,8 +9,7 @@
 #include "vm/StringBuffer.h"
 #include "vm/Symbol.h"
 
-#include "jsobjinlines.h"
-
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using JS::Symbol;

js/src/builtin/TestingFunctions.cpp

@@ -20,7 +20,6 @@
 #include "jscntxt.h"
 #include "jsfriendapi.h"
 #include "jsiter.h"
-#include "jsobj.h"
 #include "jsprf.h"
 #include "jswrapper.h"
 
@@ -44,6 +43,7 @@
 #include "vm/Debugger.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/ProxyObject.h"
 #include "vm/SavedStacks.h"
 #include "vm/Stack.h"
@@ -58,10 +58,10 @@
 #include "wasm/WasmTypes.h"
 
 #include "jscntxtinlines.h"
-#include "jsobjinlines.h"
 
 #include "vm/Debugger-inl.h"
 #include "vm/EnvironmentObject-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;

js/src/builtin/TypedObject.cpp

@@ -21,10 +21,9 @@
 #include "vm/StringBuffer.h"
 #include "vm/TypedArrayObject.h"
 
-#include "jsobjinlines.h"
-
 #include "gc/Nursery-inl.h"
 #include "gc/StoreBuffer-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/Shape-inl.h"
 

js/src/builtin/TypedObject.h

@@ -7,12 +7,12 @@
 #ifndef builtin_TypedObject_h
 #define builtin_TypedObject_h
 
-#include "jsobj.h"
 #include "jsweakmap.h"
 
 #include "builtin/TypedObjectConstants.h"
 #include "js/Conversions.h"
 #include "vm/ArrayBufferObject.h"
+#include "vm/JSObject.h"
 #include "vm/ShapedObject.h"
 
 /*

js/src/builtin/WeakMapObject.h

@@ -7,9 +7,10 @@
 #ifndef builtin_WeakMapObject_h
 #define builtin_WeakMapObject_h
 
-#include "jsobj.h"
 #include "jsweakmap.h"
 
+#include "vm/JSObject.h"
+
 namespace js {
 
 // Abstract base class for WeakMapObject and WeakSetObject.

js/src/builtin/WeakSetObject.cpp

@@ -14,10 +14,9 @@
 #include "vm/GlobalObject.h"
 #include "vm/SelfHosting.h"
 
-#include "jsobjinlines.h"
-
 #include "builtin/WeakMapObject-inl.h"
 #include "vm/Interpreter-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;

js/src/builtin/intl/Collator.cpp

@@ -23,7 +23,7 @@
 #include "vm/Runtime.h"
 #include "vm/String.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 

js/src/builtin/intl/CommonFunctions.cpp

@@ -12,13 +12,13 @@
 
 #include "jscntxt.h"
 #include "jsfriendapi.h" // for GetErrorMessage, JSMSG_INTERNAL_INTL_ERROR
-#include "jsobj.h"
 
 #include "js/Value.h"
+#include "vm/JSObject.h"
 #include "vm/SelfHosting.h"
 #include "vm/Stack.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 bool
 js::intl::InitializeObject(JSContext* cx, JS::Handle<JSObject*> obj,

js/src/builtin/intl/DateTimeFormat.cpp

@@ -23,8 +23,7 @@
 #include "vm/GlobalObject.h"
 #include "vm/Runtime.h"
 
-#include "jsobjinlines.h"
-
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;

js/src/builtin/intl/IntlObject.cpp

@@ -14,7 +14,6 @@
 
 #include "jsapi.h"
 #include "jscntxt.h"
-#include "jsobj.h"
 
 #include "builtin/intl/Collator.h"
 #include "builtin/intl/CommonFunctions.h"
@@ -25,9 +24,10 @@
 #include "builtin/intl/ScopedICUObject.h"
 #include "js/Class.h"
 #include "vm/GlobalObject.h"
+#include "vm/JSObject.h"
 #include "vm/String.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 

js/src/builtin/intl/NumberFormat.cpp

@@ -27,7 +27,7 @@
 #include "vm/SelfHosting.h"
 #include "vm/Stack.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 

js/src/builtin/intl/PluralRules.cpp

@@ -20,8 +20,7 @@
 #include "vm/GlobalObject.h"
 #include "vm/String.h"
 
-#include "jsobjinlines.h"
-
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;

js/src/ctypes/CTypes.cpp

@@ -46,7 +46,7 @@
 #include "jit/AtomicOperations.h"
 #include "js/Vector.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 using namespace std;
 

js/src/frontend/BytecodeCompiler.cpp

@@ -22,10 +22,10 @@
 #include "vm/TraceLogging.h"
 #include "wasm/AsmJS.h"
 
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/EnvironmentObject-inl.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace js::frontend;

js/src/frontend/FoldConstants.cpp

@@ -15,7 +15,8 @@
 #include "js/Conversions.h"
 
 #include "jscntxtinlines.h"
-#include "jsobjinlines.h"
+
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace js::frontend;

js/src/gc/Allocator.cpp

@@ -16,10 +16,9 @@
 #include "vm/Runtime.h"
 #include "vm/String.h"
 
-#include "jsobjinlines.h"
-
 #include "gc/ArenaList-inl.h"
 #include "gc/Heap-inl.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace gc;

js/src/gc/Barrier.cpp

@@ -7,7 +7,6 @@
 #include "gc/Barrier.h"
 
 #include "jscompartment.h"
-#include "jsobj.h"
 
 #include "builtin/TypedObject.h"
 #include "gc/Policy.h"
@@ -15,6 +14,7 @@
 #include "js/HashTable.h"
 #include "js/Value.h"
 #include "vm/EnvironmentObject.h"
+#include "vm/JSObject.h"
 #include "vm/SharedArrayObject.h"
 #include "vm/Symbol.h"
 #include "wasm/WasmJS.h"

js/src/gc/RootMarking.cpp

@@ -9,7 +9,6 @@
 #ifdef MOZ_VALGRIND
 # include <valgrind/memcheck.h>
 #endif
-
 #include "jscntxt.h"
 #include "jsprf.h"
 #include "jstypes.h"
@@ -24,10 +23,10 @@
 #include "vm/JSONParser.h"
 
 #include "jsgcinlines.h"
-#include "jsobjinlines.h"
 
 #include "gc/Iteration-inl.h"
 #include "gc/Nursery-inl.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/jit/BaselineJIT.cpp

@@ -22,13 +22,13 @@
 #include "vm/TraceLogging.h"
 #include "wasm/WasmInstance.h"
 
-#include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 #include "jsscriptinlines.h"
 
 #include "gc/Iteration-inl.h"
 #include "jit/JitFrames-inl.h"
 #include "jit/MacroAssembler-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/Stack-inl.h"
 
 using mozilla::BinarySearchIf;

js/src/jit/CacheIR.cpp

@@ -12,12 +12,11 @@
 #include "jit/BaselineCacheIRCompiler.h"
 #include "jit/BaselineIC.h"
 #include "jit/CacheIRSpewer.h"
-
 #include "vm/SelfHosting.h"
-#include "jsobjinlines.h"
 
 #include "jit/MacroAssembler-inl.h"
 #include "vm/EnvironmentObject-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/UnboxedObject-inl.h"
 
 using namespace js;

js/src/jit/CacheIRSpewer.cpp

@@ -20,11 +20,13 @@
 #include <stdarg.h>
 
 #include "jsfun.h"
-#include "jsobj.h"
 #include "jsscript.h"
 
+#include "vm/JSObject.h"
+
 #include "jscompartmentinlines.h"
-#include "jsobjinlines.h"
+
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/Ion.cpp

@@ -55,7 +55,6 @@
 #include "vtune/VTuneWrapper.h"
 
 #include "jscompartmentinlines.h"
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "gc/Iteration-inl.h"
@@ -64,6 +63,7 @@
 #include "jit/shared/Lowering-shared-inl.h"
 #include "vm/Debugger-inl.h"
 #include "vm/EnvironmentObject-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/Stack-inl.h"
 
 using namespace js;

js/src/jit/IonAnalysis.cpp

@@ -6,7 +6,6 @@
 
 #include "jit/IonAnalysis.h"
 
-
 #include "jit/AliasAnalysis.h"
 #include "jit/BaselineInspector.h"
 #include "jit/BaselineJIT.h"
@@ -20,11 +19,11 @@
 #include "vm/RegExpObject.h"
 #include "vm/SelfHosting.h"
 
-#include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 #include "jsscriptinlines.h"
 
 #include "jit/shared/Lowering-shared-inl.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/JitFrames.cpp

@@ -7,7 +7,6 @@
 #include "jit/JitFrames-inl.h"
 
 #include "jsfun.h"
-#include "jsobj.h"
 #include "jsscript.h"
 #include "jsutil.h"
 
@@ -30,11 +29,13 @@
 #include "vm/Debugger.h"
 #include "vm/GeckoProfiler.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/TraceLogging.h"
 #include "vm/TypeInference.h"
 #include "wasm/WasmBuiltins.h"
 
 #include "jsscriptinlines.h"
+
 #include "gc/Nursery-inl.h"
 #include "jit/JSJitFrameIter-inl.h"
 #include "vm/Debugger-inl.h"

js/src/jit/Lowering.cpp

@@ -14,10 +14,10 @@
 #include "jit/MIRGraph.h"
 #include "wasm/WasmSignalHandlers.h"
 
-#include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 
 #include "jit/shared/Lowering-shared-inl.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace jit;

js/src/jit/MCallOptimize.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/Casting.h"
 
 #include "jsmath.h"
-#include "jsobj.h"
 #include "jsstr.h"
 
 #include "builtin/AtomicsObject.h"
@@ -27,6 +26,7 @@
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
 #include "vm/ArgumentsObject.h"
+#include "vm/JSObject.h"
 #include "vm/ProxyObject.h"
 #include "vm/SelfHosting.h"
 #include "vm/TypedArrayObject.h"

js/src/jit/MIR.cpp

@@ -26,8 +26,9 @@
 #include "js/Conversions.h"
 
 #include "jsboolinlines.h"
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
+
+#include "vm/JSObject-inl.h"
 #include "vm/UnboxedObject-inl.h"
 
 using namespace js;

js/src/jit/MacroAssembler.cpp

@@ -25,11 +25,10 @@
 #include "js/Conversions.h"
 #include "vm/TraceLogging.h"
 
-#include "jsobjinlines.h"
-
 #include "gc/Nursery-inl.h"
 #include "jit/shared/Lowering-shared-inl.h"
 #include "vm/Interpreter-inl.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/Recover.cpp

@@ -6,26 +6,23 @@
 
 #include "jit/Recover.h"
 
-
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsiter.h"
 #include "jsmath.h"
-#include "jsobj.h"
 #include "jsstr.h"
 
 #include "builtin/RegExp.h"
 #include "builtin/SIMD.h"
 #include "builtin/TypedObject.h"
-
 #include "gc/Heap.h"
-
 #include "jit/JitSpewer.h"
 #include "jit/JSJitFrameIter.h"
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
 #include "jit/VMFunctions.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/String.h"
 
 #include "vm/Interpreter-inl.h"

js/src/jit/ScalarReplacement.cpp

@@ -15,7 +15,7 @@
 #include "jit/MIRGraph.h"
 #include "vm/UnboxedObject.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 namespace js {
 namespace jit {

js/src/jsapi-tests/testArgumentsObject.cpp

@@ -7,9 +7,8 @@
 
 #include "jsapi-tests/tests.h"
 
-#include "jsobjinlines.h"
-
 #include "vm/ArgumentsObject-inl.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 

js/src/jsapi-tests/testBug604087.cpp

@@ -7,11 +7,10 @@
  * 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 "jsobj.h"
 #include "jswrapper.h"
 
 #include "jsapi-tests/tests.h"
-
+#include "vm/JSObject.h"
 #include "vm/ProxyObject.h"
 
 const js::Class OuterWrapperClass = PROXY_CLASS_DEF(

js/src/jsapi-tests/testLookup.cpp

@@ -9,7 +9,7 @@
 
 #include "jsapi-tests/tests.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 BEGIN_TEST(testLookup_bug522590)
 {

js/src/jsapi.cpp

@@ -33,7 +33,6 @@
 #include "jsiter.h"
 #include "jsmath.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #include "json.h"
 #include "jsprf.h"
 #include "jsscript.h"
@@ -79,6 +78,7 @@
 #include "vm/ErrorObject.h"
 #include "vm/HelperThreads.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/RegExpStatics.h"
 #include "vm/Runtime.h"
 #include "vm/SavedStacks.h"

js/src/jsarray.cpp

@@ -20,7 +20,6 @@
 #include "jsfun.h"
 #include "jsiter.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
@@ -31,6 +30,7 @@
 #include "js/Conversions.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/SelfHosting.h"
 #include "vm/Shape.h"
 #include "vm/StringBuffer.h"

js/src/jsarray.h

@@ -9,10 +9,10 @@
 #ifndef jsarray_h
 #define jsarray_h
 
-#include "jsobj.h"
 #include "jspubtd.h"
 
 #include "vm/ArrayObject.h"
+#include "vm/JSObject.h"
 
 namespace js {
 /* 2^32-2, inclusive */

js/src/jsarrayinlines.h

@@ -9,9 +9,8 @@
 
 #include "jsarray.h"
 
-#include "jsobj.h"
-
 #include "vm/ArgumentsObject.h"
+#include "vm/JSObject.h"
 
 #include "vm/ArgumentsObject-inl.h"
 #include "vm/UnboxedObject-inl.h"

js/src/jsatom.cpp

@@ -26,9 +26,9 @@
 
 #include "jscntxtinlines.h"
 #include "jscompartmentinlines.h"
-#include "jsobjinlines.h"
 
 #include "gc/AtomMarking-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/String-inl.h"
 
 using namespace js;

js/src/jsbool.cpp

@@ -12,11 +12,11 @@
 
 #include "jsapi.h"
 #include "jscntxt.h"
-#include "jsobj.h"
 #include "jstypes.h"
 
 #include "jit/InlinableNatives.h"
 #include "vm/GlobalObject.h"
+#include "vm/JSObject.h"
 #include "vm/ProxyObject.h"
 #include "vm/StringBuffer.h"
 

js/src/jscntxt.cpp

@@ -34,7 +34,6 @@
 #include "jsfun.h"
 #include "jsiter.h"
 #include "jsnativestack.h"
-#include "jsobj.h"
 #include "jsopcode.h"
 #include "jsprf.h"
 #include "jspubtd.h"
@@ -50,12 +49,13 @@
 #include "js/CharacterEncoding.h"
 #include "vm/ErrorReporting.h"
 #include "vm/HelperThreads.h"
+#include "vm/JSObject.h"
 #include "vm/Shape.h"
 #include "wasm/WasmSignalHandlers.h"
 
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
+#include "vm/JSObject-inl.h"
 #include "vm/Stack-inl.h"
 
 using namespace js;

js/src/jscompartment.cpp

@@ -28,10 +28,10 @@
 
 #include "jsfuninlines.h"
 #include "jsgcinlines.h"
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "gc/Marking-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/UnboxedObject-inl.h"
 

js/src/jsdate.cpp

@@ -29,7 +29,6 @@
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #include "jsprf.h"
 #include "jsstr.h"
 #include "jstypes.h"
@@ -41,11 +40,12 @@
 #include "vm/DateTime.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/String.h"
 #include "vm/StringBuffer.h"
 #include "vm/Time.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 

js/src/jsexn.cpp

@@ -20,7 +20,6 @@
 #include "jscntxt.h"
 #include "jsfun.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #include "jsprf.h"
 #include "jsscript.h"
 #include "jstypes.h"
@@ -32,13 +31,13 @@
 #include "js/CharacterEncoding.h"
 #include "vm/ErrorObject.h"
 #include "vm/GlobalObject.h"
+#include "vm/JSObject.h"
 #include "vm/SavedStacks.h"
 #include "vm/SelfHosting.h"
 #include "vm/StringBuffer.h"
 
-#include "jsobjinlines.h"
-
 #include "vm/ErrorObject-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/SavedStacks-inl.h"
 
 using namespace js;

js/src/jsfriendapi.cpp

@@ -12,7 +12,6 @@
 
 #include "jscntxt.h"
 #include "jscompartment.h"
-#include "jsobj.h"
 #include "jsprf.h"
 #include "jsweakmap.h"
 #include "jswrapper.h"
@@ -23,14 +22,15 @@
 #include "js/Proxy.h"
 #include "proxy/DeadObjectProxy.h"
 #include "vm/ArgumentsObject.h"
+#include "vm/JSObject.h"
 #include "vm/Time.h"
 #include "vm/WrapperObject.h"
 
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "gc/Nursery-inl.h"
 #include "vm/EnvironmentObject-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;

js/src/jsfun.cpp

@@ -21,7 +21,6 @@
 #include "jsapi.h"
 #include "jsarray.h"
 #include "jscntxt.h"
-#include "jsobj.h"
 #include "jsscript.h"
 #include "jsstr.h"
 #include "jstypes.h"
@@ -43,6 +42,7 @@
 #include "vm/Debugger.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/SelfHosting.h"
 #include "vm/Shape.h"
 #include "vm/SharedImmutableStringsCache.h"

js/src/jsfun.h

@@ -11,10 +11,11 @@
  * JS function definitions.
  */
 
-#include "jsobj.h"
 #include "jsscript.h"
 #include "jstypes.h"
 
+#include "vm/JSObject.h"
+
 namespace js {
 
 class FunctionExtended;

js/src/jsgc.cpp

@@ -209,7 +209,6 @@
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsfriendapi.h"
-#include "jsobj.h"
 #include "jsprf.h"
 #include "jsscript.h"
 #include "jstypes.h"
@@ -232,6 +231,7 @@
 #include "proxy/DeadObjectProxy.h"
 #include "vm/Debugger.h"
 #include "vm/GeckoProfiler.h"
+#include "vm/JSObject.h"
 #include "vm/Printer.h"
 #include "vm/ProxyObject.h"
 #include "vm/Shape.h"
@@ -241,7 +241,6 @@
 #include "vm/TraceLogging.h"
 #include "vm/WrapperObject.h"
 
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "gc/Heap-inl.h"
@@ -249,6 +248,7 @@
 #include "gc/Marking-inl.h"
 #include "gc/Nursery-inl.h"
 #include "vm/GeckoProfiler-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/Stack-inl.h"
 #include "vm/String-inl.h"
 

js/src/jsiter.cpp

@@ -17,7 +17,6 @@
 
 #include "jsarray.h"
 #include "jscntxt.h"
-#include "jsobj.h"
 #include "jsopcode.h"
 #include "jsscript.h"
 #include "jstypes.h"
@@ -30,6 +29,7 @@
 #include "vm/GeneratorObject.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/Shape.h"
 #include "vm/TypedArrayObject.h"
 

js/src/jsmath.cpp

@@ -38,7 +38,7 @@
 #include "js/Class.h"
 #include "vm/Time.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 #if defined(XP_WIN)
 // #define needed to link in RtlGenRandom(), a.k.a. SystemFunction036.  See the

js/src/jsnum.cpp

@@ -23,12 +23,12 @@
 
 #include "jscntxt.h"
 #include "jsdtoa.h"
-#include "jsobj.h"
 #include "jsstr.h"
 #include "jstypes.h"
 
 #include "js/Conversions.h"
 #include "vm/GlobalObject.h"
+#include "vm/JSObject.h"
 #include "vm/StringBuffer.h"
 
 #include "vm/NativeObject-inl.h"

js/src/json.cpp

@@ -13,12 +13,12 @@
 #include "jsarray.h"
 #include "jscntxt.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #include "jsstr.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/JSONParser.h"
 #include "vm/StringBuffer.h"
 

js/src/jsopcode.cpp

@@ -28,7 +28,6 @@
 #include "jscompartment.h"
 #include "jsfun.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #include "jsprf.h"
 #include "jsscript.h"
 #include "jsstr.h"
@@ -42,16 +41,17 @@
 #include "js/CharacterEncoding.h"
 #include "vm/CodeCoverage.h"
 #include "vm/EnvironmentObject.h"
+#include "vm/JSObject.h"
 #include "vm/Opcodes.h"
 #include "vm/Shape.h"
 #include "vm/StringBuffer.h"
 
 #include "jscntxtinlines.h"
 #include "jscompartmentinlines.h"
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "gc/Iteration-inl.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/jsscript.cpp

@@ -25,7 +25,6 @@
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsfun.h"
-#include "jsobj.h"
 #include "jsopcode.h"
 #include "jsprf.h"
 #include "jstypes.h"
@@ -44,6 +43,7 @@
 #include "vm/ArgumentsObject.h"
 #include "vm/Compression.h"
 #include "vm/Debugger.h"
+#include "vm/JSObject.h"
 #include "vm/Opcodes.h"
 #include "vm/SelfHosting.h"
 #include "vm/Shape.h"
@@ -53,10 +53,10 @@
 #include "vtune/VTuneWrapper.h"
 
 #include "jsfuninlines.h"
-#include "jsobjinlines.h"
 
 #include "gc/Marking-inl.h"
 #include "vm/EnvironmentObject-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/SharedImmutableStringsCache-inl.h"
 #include "vm/Stack-inl.h"

js/src/jsstr.cpp

@@ -25,7 +25,6 @@
 #include "jsbool.h"
 #include "jscntxt.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #include "jsopcode.h"
 #include "jstypes.h"
 #include "jsutil.h"
@@ -42,6 +41,7 @@
 #endif
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/Opcodes.h"
 #include "vm/Printer.h"
 #include "vm/RegExpObject.h"

js/src/jsweakmap.cpp

@@ -11,12 +11,12 @@
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsfriendapi.h"
-#include "jsobj.h"
 #include "jswrapper.h"
 
 #include "vm/GlobalObject.h"
+#include "vm/JSObject.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/jsweakmap.h

@@ -12,11 +12,11 @@
 
 #include "jscompartment.h"
 #include "jsfriendapi.h"
-#include "jsobj.h"
 
 #include "gc/DeletePolicy.h"
 #include "gc/StoreBuffer.h"
 #include "js/HashTable.h"
+#include "vm/JSObject.h"
 
 namespace js {
 

js/src/moz.build

@@ -301,7 +301,6 @@ UNIFIED_SOURCES += [
     'jsiter.cpp',
     'jsnativestack.cpp',
     'jsnum.cpp',
-    'jsobj.cpp',
     'json.cpp',
     'jsopcode.cpp',
     'jsprf.cpp',
@@ -341,6 +340,7 @@ UNIFIED_SOURCES += [
     'vm/HelperThreads.cpp',
     'vm/Id.cpp',
     'vm/Initialization.cpp',
+    'vm/JSObject.cpp',
     'vm/JSONParser.cpp',
     'vm/JSONPrinter.cpp',
     'vm/MemoryMetrics.cpp',

js/src/perf/jsperf.cpp

@@ -6,9 +6,9 @@
 #include "perf/jsperf.h"
 
 #include "jscntxt.h" /* for error messages */
-#include "jsobj.h" /* for unwrapping without a context */
 
 #include "gc/FreeOp.h"
+#include "vm/JSObject.h" /* for unwrapping without a context */
 
 using namespace js;
 using JS::PerfMeasurement;

js/src/proxy/BaseProxyHandler.cpp

@@ -8,7 +8,8 @@
 #include "vm/ProxyObject.h"
 
 #include "jscntxtinlines.h"
-#include "jsobjinlines.h"
+
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 

js/src/proxy/CrossCompartmentWrapper.cpp

@@ -11,9 +11,9 @@
 #include "vm/WrapperObject.h"
 
 #include "jscompartmentinlines.h"
-#include "jsobjinlines.h"
 
 #include "gc/Nursery-inl.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 

js/src/proxy/OpaqueCrossCompartmentWrapper.cpp

@@ -6,7 +6,7 @@
 
 #include "jswrapper.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 

js/src/proxy/Proxy.cpp

@@ -19,9 +19,8 @@
 #include "proxy/ScriptedProxyHandler.h"
 #include "vm/WrapperObject.h"
 
-#include "jsobjinlines.h"
-
 #include "gc/Marking-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;

js/src/proxy/ScriptedProxyHandler.cpp

@@ -10,7 +10,7 @@
 
 #include "vm/Interpreter.h" // For InstanceOfOperator
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;

js/src/proxy/Wrapper.cpp

@@ -15,9 +15,8 @@
 #include "vm/RegExpObject.h"
 #include "vm/WrapperObject.h"
 
-#include "jsobjinlines.h"
-
 #include "gc/Marking-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;

js/src/shell/OSObject.cpp

@@ -22,7 +22,6 @@
 #include "jsapi.h"
 // For JSFunctionSpecWithHelp
 #include "jsfriendapi.h"
-#include "jsobj.h"
 #include "jsstr.h"
 #ifdef XP_WIN
 # include "jswin.h"
@@ -32,10 +31,11 @@
 #include "gc/FreeOp.h"
 #include "js/Conversions.h"
 #include "shell/jsshell.h"
+#include "vm/JSObject.h"
 #include "vm/StringBuffer.h"
 #include "vm/TypedArrayObject.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 #ifdef XP_WIN
 # ifndef PATH_MAX

js/src/shell/js.cpp

@@ -55,7 +55,6 @@
 #include "jscntxt.h"
 #include "jsfriendapi.h"
 #include "jsfun.h"
-#include "jsobj.h"
 #include "jsprf.h"
 #include "jsscript.h"
 #include "jstypes.h"
@@ -73,11 +72,9 @@
 #include "builtin/ModuleObject.h"
 #include "builtin/RegExp.h"
 #include "builtin/TestingFunctions.h"
-
 #if defined(JS_BUILD_BINAST)
-#include "frontend/BinSource.h"
+# include "frontend/BinSource.h"
 #endif // defined(JS_BUILD_BINAST)
-
 #include "frontend/Parser.h"
 #include "gc/GCInternals.h"
 #include "jit/arm/Simulator-arm.h"
@@ -105,6 +102,7 @@
 #include "vm/Compression.h"
 #include "vm/Debugger.h"
 #include "vm/HelperThreads.h"
+#include "vm/JSObject.h"
 #include "vm/Monitor.h"
 #include "vm/MutexIDs.h"
 #include "vm/Printer.h"
@@ -117,10 +115,10 @@
 #include "wasm/WasmJS.h"
 
 #include "jscompartmentinlines.h"
-#include "jsobjinlines.h"
 
 #include "vm/ErrorObject-inl.h"
 #include "vm/Interpreter-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/Stack-inl.h"
 
 using namespace js;

js/src/tests/style/BadIncludesOrder-inl.h

@@ -24,7 +24,7 @@
 # include "mozilla/HashFunctions.h"
 #endif
 
-#include "jsobj.h"
-#include "jsfun.h"      // out of order
+#include "jsfun.h"
+#include "vm/JSObject.h"  // out of order
 #include "jsscript.h"
 #include "jstypes.h"

js/src/vm/ArgumentsObject.cpp

@@ -14,9 +14,8 @@
 #include "vm/GlobalObject.h"
 #include "vm/Stack.h"
 
-#include "jsobjinlines.h"
-
 #include "gc/Nursery-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/Stack-inl.h"
 

js/src/vm/ArrayBufferObject.cpp

@@ -18,7 +18,6 @@
 #ifndef XP_WIN
 # include <sys/mman.h>
 #endif
-
 #ifdef MOZ_VALGRIND
 # include <valgrind/memcheck.h>
 #endif
@@ -29,7 +28,6 @@
 #include "jscpucfg.h"
 #include "jsfriendapi.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #include "jstypes.h"
 #include "jsutil.h"
 #ifdef XP_WIN
@@ -45,6 +43,7 @@
 #include "js/MemoryMetrics.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/SharedArrayObject.h"
 #include "vm/WrapperObject.h"
 #include "wasm/WasmSignalHandlers.h"

js/src/vm/ArrayBufferObject.h

@@ -9,10 +9,9 @@
 
 #include "mozilla/Maybe.h"
 
-#include "jsobj.h"
-
 #include "builtin/TypedObjectConstants.h"
 #include "js/GCHashTable.h"
+#include "vm/JSObject.h"
 #include "vm/Runtime.h"
 #include "vm/SharedMem.h"
 #include "wasm/WasmTypes.h"

js/src/vm/ArrayObject-inl.h

@@ -12,8 +12,7 @@
 #include "gc/GCTrace.h"
 #include "vm/String.h"
 
-#include "jsobjinlines.h"
-
+#include "vm/JSObject-inl.h"
 #include "vm/TypeInference-inl.h"
 
 namespace js {

js/src/vm/AsyncFunction.h

@@ -8,7 +8,8 @@
 #define vm_AsyncFunction_h
 
 #include "jscntxt.h"
-#include "jsobj.h"
+
+#include "vm/JSObject.h"
 
 namespace js {
 

js/src/vm/AsyncIteration.cpp

@@ -16,8 +16,8 @@
 #include "vm/SelfHosting.h"
 
 #include "jscntxtinlines.h"
-#include "jsobjinlines.h"
 
+#include "vm/JSObject-inl.h"
 #include "vm/List-inl.h"
 #include "vm/NativeObject-inl.h"
 

js/src/vm/AsyncIteration.h

@@ -8,10 +8,10 @@
 #define vm_AsyncIteration_h
 
 #include "jscntxt.h"
-#include "jsobj.h"
 
 #include "builtin/Promise.h"
 #include "vm/GeneratorObject.h"
+#include "vm/JSObject.h"
 
 namespace js {
 

js/src/vm/BooleanObject-inl.h

@@ -9,7 +9,7 @@
 
 #include "vm/BooleanObject.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 namespace js {
 

js/src/vm/Caches-inl.h

@@ -15,7 +15,7 @@
 #include "gc/GCTrace.h"
 #include "vm/Probes.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 namespace js {
 

js/src/vm/Caches.h

@@ -9,7 +9,6 @@
 
 #include "jsbytecode.h"
 #include "jsmath.h"
-#include "jsobj.h"
 #include "jsscript.h"
 
 #include "frontend/SourceNotes.h"
@@ -17,6 +16,7 @@
 #include "js/RootingAPI.h"
 #include "js/UniquePtr.h"
 #include "vm/ArrayObject.h"
+#include "vm/JSObject.h"
 #include "vm/NativeObject.h"
 
 namespace js {

js/src/vm/CallNonGenericMethod.cpp

@@ -7,9 +7,9 @@
 #include "js/CallNonGenericMethod.h"
 
 #include "jsfun.h"
-#include "jsobj.h"
 
 #include "proxy/Proxy.h"
+#include "vm/JSObject.h"
 #include "vm/ProxyObject.h"
 #include "vm/SelfHosting.h"
 

js/src/vm/DateObject.h

@@ -7,10 +7,9 @@
 #ifndef vm_DateObject_h_
 #define vm_DateObject_h_
 
-#include "jsobj.h"
-
 #include "js/Date.h"
 #include "js/Value.h"
+#include "vm/JSObject.h"
 
 namespace js {
 

js/src/vm/Debugger.cpp

@@ -16,7 +16,6 @@
 #include "jsfriendapi.h"
 #include "jshashutil.h"
 #include "jsnum.h"
-#include "jsobj.h"
 #include "jsprf.h"
 #include "jswrapper.h"
 
@@ -37,16 +36,17 @@
 #include "vm/DebuggerMemory.h"
 #include "vm/GeckoProfiler.h"
 #include "vm/GeneratorObject.h"
+#include "vm/JSObject.h"
 #include "vm/TraceLogging.h"
 #include "vm/WrapperObject.h"
 #include "wasm/WasmInstance.h"
 
 #include "jsgcinlines.h"
-#include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/GeckoProfiler-inl.h"
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/Stack-inl.h"
 

js/src/vm/DebuggerMemory.h

@@ -9,9 +9,10 @@
 
 #include "jsapi.h"
 #include "jscntxt.h"
-#include "jsobj.h"
+
 #include "js/Class.h"
 #include "js/Value.h"
+#include "vm/JSObject.h"
 
 namespace js {
 

js/src/vm/EnvironmentObject-inl.h

@@ -9,8 +9,7 @@
 
 #include "vm/EnvironmentObject.h"
 
-#include "jsobjinlines.h"
-
+#include "vm/JSObject-inl.h"
 #include "vm/TypeInference-inl.h"
 
 namespace js {

js/src/vm/EnvironmentObject.h

@@ -8,7 +8,6 @@
 #define vm_EnvironmentObject_h
 
 #include "jscntxt.h"
-#include "jsobj.h"
 #include "jsweakmap.h"
 
 #include "builtin/ModuleObject.h"
@@ -16,6 +15,7 @@
 #include "gc/Barrier.h"
 #include "js/GCHashTable.h"
 #include "vm/ArgumentsObject.h"
+#include "vm/JSObject.h"
 #include "vm/ProxyObject.h"
 #include "vm/Scope.h"
 

js/src/vm/ErrorObject.cpp

@@ -16,8 +16,7 @@
 #include "vm/GlobalObject.h"
 #include "vm/String.h"
 
-#include "jsobjinlines.h"
-
+#include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/SavedStacks-inl.h"
 #include "vm/Shape-inl.h"

js/src/vm/ForOfIterator.cpp

@@ -7,12 +7,12 @@
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jscompartment.h"
-#include "jsobj.h"
 
 #include "vm/Interpreter.h"
+#include "vm/JSObject.h"
 #include "vm/PIC.h"
 
-#include "jsobjinlines.h"
+#include "vm/JSObject-inl.h"
 
 using namespace js;
 using JS::ForOfIterator;

js/src/vm/GeneratorObject.cpp

@@ -6,7 +6,7 @@
 
 #include "vm/GeneratorObject.h"
 
-#include "jsobj.h"
+#include "vm/JSObject.h"
 
 #include "jsscriptinlines.h"