Bug 1429206 - Part 4: Rename jsfun* -> vm/JSFunction*.

--HG--
rename : js/src/jsfuninlines.h => js/src/vm/JSFunction-inl.h
rename : js/src/jsfun.cpp => js/src/vm/JSFunction.cpp
rename : js/src/jsfun.h => js/src/vm/JSFunction.h
extra : rebase_source : 2fe8f01ec6ec2ad4dba3f80fb99cca89b0bcba9e
extra : source : 29b51bc766687c21a809acf8dae10ec214626ba3

config/check_spidermonkey_style.py

@@ -166,7 +166,7 @@ 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:28:29: error:
-    "vm/JSObject.h" should be included after "jsscript.h"
+    "vm/JSObject.h" should be included after "jstypes.h"
 
 (multiple files): error:
     header files form one or more cycles

js/src/builtin/TypedObject.cpp

@@ -10,13 +10,13 @@
 #include "mozilla/CheckedInt.h"
 
 #include "jscompartment.h"
-#include "jsfun.h"
 #include "jsutil.h"
 
 #include "builtin/SIMD.h"
 #include "gc/Marking.h"
 #include "js/Vector.h"
 #include "vm/GlobalObject.h"
+#include "vm/JSFunction.h"
 #include "vm/String.h"
 #include "vm/StringBuffer.h"
 #include "vm/TypedArrayObject.h"

js/src/ctypes/CTypes.cpp

@@ -33,7 +33,6 @@
 
 #include "jscntxt.h"
 #include "jsexn.h"
-#include "jsfun.h"
 #include "jsnum.h"
 #include "jsprf.h"
 #include "jswin.h"
@@ -45,6 +44,7 @@
 #include "gc/Zone.h"
 #include "jit/AtomicOperations.h"
 #include "js/Vector.h"
+#include "vm/JSFunction.h"
 
 #include "vm/JSObject-inl.h"
 

js/src/frontend/BytecodeEmitter.cpp

@@ -20,7 +20,6 @@
 
 #include "jsapi.h"
 #include "jscntxt.h"
-#include "jsfun.h"
 #include "jsnum.h"
 #include "jsopcode.h"
 #include "jsscript.h"
@@ -32,6 +31,7 @@
 #include "frontend/TokenStream.h"
 #include "vm/Debugger.h"
 #include "vm/GeneratorObject.h"
+#include "vm/JSFunction.h"
 #include "vm/Stack.h"
 #include "wasm/AsmJS.h"
 

js/src/frontend/NameFunctions.cpp

@@ -9,12 +9,12 @@
 #include "mozilla/MemoryChecking.h"
 #include "mozilla/Sprintf.h"
 
-#include "jsfun.h"
 #include "jsprf.h"
 
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/ParseNode.h"
 #include "frontend/SharedContext.h"
+#include "vm/JSFunction.h"
 #include "vm/StringBuffer.h"
 
 using namespace js;

js/src/frontend/Parser.cpp

@@ -25,7 +25,6 @@
 
 #include "jsapi.h"
 #include "jscntxt.h"
-#include "jsfun.h"
 #include "jsopcode.h"
 #include "jsscript.h"
 #include "jstypes.h"
@@ -36,6 +35,7 @@
 #include "frontend/FoldConstants.h"
 #include "frontend/TokenStream.h"
 #include "irregexp/RegExpParser.h"
+#include "vm/JSFunction.h"
 #include "vm/RegExpObject.h"
 #include "wasm/AsmJS.h"
 

js/src/gc/Tracer.cpp

@@ -8,7 +8,6 @@
 
 #include "mozilla/DebugOnly.h"
 
-#include "jsfun.h"
 #include "jsprf.h"
 #include "jsscript.h"
 #include "jsutil.h"
@@ -17,7 +16,7 @@
 #include "gc/GCInternals.h"
 #include "gc/Marking.h"
 #include "gc/Zone.h"
-
+#include "vm/JSFunction.h"
 #include "vm/Shape.h"
 #include "vm/Symbol.h"
 

js/src/gdb/tests/test-Root.cpp

@@ -1,9 +1,9 @@
 #include "gdb-tests.h"
 
 #include "jsapi.h"
-#include "jsfun.h"
 
 #include "gc/Barrier.h"
+#include "vm/JSFunction.h"
 
 FRAGMENT(Root, null) {
   JS::Rooted<JSObject*> null(cx, nullptr);

js/src/jit/BaselineCompiler.cpp

@@ -8,8 +8,6 @@
 
 #include "mozilla/Casting.h"
 
-#include "jsfun.h"
-
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
 #include "jit/FixedList.h"
@@ -27,6 +25,7 @@
 #include "vm/AsyncIteration.h"
 #include "vm/EnvironmentObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSFunction.h"
 #include "vm/TraceLogging.h"
 #include "vtune/VTuneWrapper.h"
 

js/src/jit/BaselineIC.cpp

@@ -10,7 +10,6 @@
 #include "mozilla/TemplateLib.h"
 
 #include "jsfriendapi.h"
-#include "jsfun.h"
 #include "jslibmath.h"
 #include "jstypes.h"
 
@@ -31,6 +30,7 @@
 #include "jit/VMFunctions.h"
 #include "js/Conversions.h"
 #include "js/GCVector.h"
+#include "vm/JSFunction.h"
 #include "vm/Opcodes.h"
 #include "vm/SelfHosting.h"
 #include "vm/TypedArrayObject.h"

js/src/jit/CacheIRSpewer.cpp

@@ -16,12 +16,11 @@
 #else
 #include <unistd.h>
 #endif
-
 #include <stdarg.h>
 
-#include "jsfun.h"
 #include "jsscript.h"
 
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 
 #include "jscompartmentinlines.h"

js/src/jit/CompileInfo.h

@@ -9,12 +9,11 @@
 
 #include "mozilla/Maybe.h"
 
-#include "jsfun.h"
-
 #include "jit/JitAllocPolicy.h"
 #include "jit/JitFrames.h"
 #include "jit/Registers.h"
 #include "vm/EnvironmentObject.h"
+#include "vm/JSFunction.h"
 
 namespace js {
 namespace jit {

js/src/jit/JSJitFrameIter.h

@@ -7,14 +7,13 @@
 #ifndef jit_JSJitFrameIter_h
 #define jit_JSJitFrameIter_h
 
-#include "jsfun.h"
 #include "jsscript.h"
 #include "jstypes.h"
 
 #include "jit/IonCode.h"
 #include "jit/Snapshots.h"
-
 #include "js/ProfilingFrameIterator.h"
+#include "vm/JSFunction.h"
 
 namespace js {
 namespace jit {

js/src/jit/JitFrames.cpp

@@ -6,7 +6,6 @@
 
 #include "jit/JitFrames-inl.h"
 
-#include "jsfun.h"
 #include "jsscript.h"
 #include "jsutil.h"
 
@@ -29,6 +28,7 @@
 #include "vm/Debugger.h"
 #include "vm/GeckoProfiler.h"
 #include "vm/Interpreter.h"
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 #include "vm/TraceLogging.h"
 #include "vm/TypeInference.h"

js/src/jit/JitFrames.h

@@ -10,10 +10,10 @@
 #include <stdint.h>
 
 #include "jscntxt.h"
-#include "jsfun.h"
 
 #include "jit/JSJitFrameIter.h"
 #include "jit/Safepoints.h"
+#include "vm/JSFunction.h"
 
 namespace js {
 namespace jit {

js/src/jit/JitOptions.cpp

@@ -8,7 +8,9 @@
 #include "mozilla/TypeTraits.h"
 
 #include <cstdlib>
-#include "jsfun.h"
+
+#include "vm/JSFunction.h"
+
 using namespace js;
 using namespace js::jit;
 

js/src/jit/RematerializedFrame.h

@@ -9,12 +9,10 @@
 
 #include <algorithm>
 
-#include "jsfun.h"
-
 #include "jit/JitFrames.h"
 #include "jit/JSJitFrameIter.h"
-
 #include "vm/EnvironmentObject.h"
+#include "vm/JSFunction.h"
 #include "vm/Stack.h"
 
 namespace js {

js/src/jsapi-tests/testLookup.cpp

@@ -5,10 +5,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 "jsfun.h"  // for js::IsInternalFunctionObject
-
 #include "jsapi-tests/tests.h"
 
+#include "vm/JSFunction.h"  // for js::IsInternalFunctionObject
+
 #include "vm/JSObject-inl.h"
 
 BEGIN_TEST(testLookup_bug522590)

js/src/jsapi.cpp

@@ -29,7 +29,6 @@
 #include "jsdate.h"
 #include "jsexn.h"
 #include "jsfriendapi.h"
-#include "jsfun.h"
 #include "jsiter.h"
 #include "jsmath.h"
 #include "jsnum.h"
@@ -78,6 +77,7 @@
 #include "vm/ErrorObject.h"
 #include "vm/HelperThreads.h"
 #include "vm/Interpreter.h"
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 #include "vm/RegExpStatics.h"
 #include "vm/Runtime.h"
@@ -92,10 +92,10 @@
 #include "wasm/AsmJS.h"
 #include "wasm/WasmModule.h"
 
-#include "jsfuninlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/Interpreter-inl.h"
+#include "vm/JSFunction-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/SavedStacks-inl.h"
 #include "vm/String-inl.h"

js/src/jsarray.cpp

@@ -17,7 +17,6 @@
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsfriendapi.h"
-#include "jsfun.h"
 #include "jsiter.h"
 #include "jsnum.h"
 #include "jstypes.h"
@@ -30,6 +29,7 @@
 #include "js/Conversions.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 #include "vm/SelfHosting.h"
 #include "vm/Shape.h"

js/src/jscntxt.cpp

@@ -31,7 +31,6 @@
 #include "jscompartment.h"
 #include "jsdtoa.h"
 #include "jsexn.h"
-#include "jsfun.h"
 #include "jsiter.h"
 #include "jsnativestack.h"
 #include "jsopcode.h"
@@ -49,6 +48,7 @@
 #include "js/CharacterEncoding.h"
 #include "vm/ErrorReporting.h"
 #include "vm/HelperThreads.h"
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 #include "vm/Shape.h"
 #include "wasm/WasmSignalHandlers.h"

js/src/jscompartment.cpp

@@ -26,11 +26,11 @@
 #include "vm/Debugger.h"
 #include "vm/WrapperObject.h"
 
-#include "jsfuninlines.h"
 #include "jsgcinlines.h"
 #include "jsscriptinlines.h"
 
 #include "gc/Marking-inl.h"
+#include "vm/JSFunction-inl.h"
 #include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/UnboxedObject-inl.h"

js/src/jsexn.cpp

@@ -18,7 +18,6 @@
 
 #include "jsapi.h"
 #include "jscntxt.h"
-#include "jsfun.h"
 #include "jsnum.h"
 #include "jsprf.h"
 #include "jsscript.h"
@@ -31,6 +30,7 @@
 #include "js/CharacterEncoding.h"
 #include "vm/ErrorObject.h"
 #include "vm/GlobalObject.h"
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 #include "vm/SavedStacks.h"
 #include "vm/SelfHosting.h"

js/src/jsopcode.cpp

@@ -26,7 +26,6 @@
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jscompartment.h"
-#include "jsfun.h"
 #include "jsnum.h"
 #include "jsprf.h"
 #include "jsscript.h"
@@ -41,6 +40,7 @@
 #include "js/CharacterEncoding.h"
 #include "vm/CodeCoverage.h"
 #include "vm/EnvironmentObject.h"
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 #include "vm/Opcodes.h"
 #include "vm/Shape.h"

js/src/jsscript.cpp

@@ -24,7 +24,6 @@
 
 #include "jsapi.h"
 #include "jscntxt.h"
-#include "jsfun.h"
 #include "jsopcode.h"
 #include "jsprf.h"
 #include "jstypes.h"
@@ -43,6 +42,7 @@
 #include "vm/ArgumentsObject.h"
 #include "vm/Compression.h"
 #include "vm/Debugger.h"
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 #include "vm/Opcodes.h"
 #include "vm/SelfHosting.h"
@@ -52,10 +52,9 @@
 #include "vm/Xdr.h"
 #include "vtune/VTuneWrapper.h"
 
-#include "jsfuninlines.h"
-
 #include "gc/Marking-inl.h"
 #include "vm/EnvironmentObject-inl.h"
+#include "vm/JSFunction-inl.h"
 #include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/SharedImmutableStringsCache-inl.h"

js/src/moz.build

@@ -296,7 +296,6 @@ UNIFIED_SOURCES += [
     'jsdate.cpp',
     'jsexn.cpp',
     'jsfriendapi.cpp',
-    'jsfun.cpp',
     'jsgc.cpp',
     'jsiter.cpp',
     'jsnativestack.cpp',
@@ -340,6 +339,7 @@ UNIFIED_SOURCES += [
     'vm/HelperThreads.cpp',
     'vm/Id.cpp',
     'vm/Initialization.cpp',
+    'vm/JSFunction.cpp',
     'vm/JSObject.cpp',
     'vm/JSONParser.cpp',
     'vm/JSONPrinter.cpp',

js/src/proxy/DeadObjectProxy.cpp

@@ -7,8 +7,8 @@
 #include "proxy/DeadObjectProxy.h"
 
 #include "jsapi.h"
-#include "jsfun.h" // XXXefaust Bug 1064662
 
+#include "vm/JSFunction.h" // XXXefaust Bug 1064662
 #include "vm/ProxyObject.h"
 
 using namespace js;

js/src/proxy/Proxy.cpp

@@ -12,11 +12,11 @@
 
 #include "jsapi.h"
 #include "jscntxt.h"
-#include "jsfun.h"
 #include "jswrapper.h"
 
 #include "proxy/DeadObjectProxy.h"
 #include "proxy/ScriptedProxyHandler.h"
+#include "vm/JSFunction.h"
 #include "vm/WrapperObject.h"
 
 #include "gc/Marking-inl.h"

js/src/shell/js.cpp

@@ -54,7 +54,6 @@
 #include "jsarray.h"
 #include "jscntxt.h"
 #include "jsfriendapi.h"
-#include "jsfun.h"
 #include "jsprf.h"
 #include "jsscript.h"
 #include "jstypes.h"
@@ -102,6 +101,7 @@
 #include "vm/Compression.h"
 #include "vm/Debugger.h"
 #include "vm/HelperThreads.h"
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 #include "vm/Monitor.h"
 #include "vm/MutexIDs.h"

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

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

js/src/vm/CallNonGenericMethod.cpp

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

js/src/vm/GlobalObject.h

@@ -10,12 +10,12 @@
 #include "jsarray.h"
 #include "jsbool.h"
 #include "jsexn.h"
-#include "jsfun.h"
 #include "jsnum.h"
 
 #include "js/Vector.h"
 #include "vm/ArrayBufferObject.h"
 #include "vm/ErrorObject.h"
+#include "vm/JSFunction.h"
 #include "vm/RegExpStatics.h"
 #include "vm/Runtime.h"
 

js/src/vm/Interpreter.cpp

@@ -21,7 +21,6 @@
 
 #include "jsarray.h"
 #include "jscntxt.h"
-#include "jsfun.h"
 #include "jsiter.h"
 #include "jslibmath.h"
 #include "jsnum.h"
@@ -40,6 +39,7 @@
 #include "vm/AsyncIteration.h"
 #include "vm/Debugger.h"
 #include "vm/GeneratorObject.h"
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 #include "vm/Opcodes.h"
 #include "vm/Scope.h"
@@ -49,13 +49,13 @@
 #include "vm/TraceLogging.h"
 
 #include "jsboolinlines.h"
-#include "jsfuninlines.h"
 #include "jsscriptinlines.h"
 
 #include "jit/JitFrames-inl.h"
 #include "vm/Debugger-inl.h"
 #include "vm/EnvironmentObject-inl.h"
 #include "vm/GeckoProfiler-inl.h"
+#include "vm/JSFunction-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/Probes-inl.h"
 #include "vm/Stack-inl.h"

js/src/vm/JSFunction-inl.h

@@ -4,10 +4,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/. */
 
-#ifndef jsfuninlines_h
-#define jsfuninlines_h
+#ifndef vm_JSFunction_inl_h
+#define vm_JSFunction_inl_h
 
-#include "jsfun.h"
+#include "vm/JSFunction.h"
 
 #include "vm/EnvironmentObject.h"
 
@@ -97,4 +97,4 @@ CloneFunctionObjectIfNotSingleton(JSContext* cx, HandleFunction fun, HandleObjec
 
 } /* namespace js */
 
-#endif /* jsfuninlines_h */
+#endif /* vm_JSFunction_inl_h */

js/src/vm/JSFunction.cpp

@@ -8,7 +8,7 @@
  * JS function support.
  */
 
-#include "jsfuninlines.h"
+#include "vm/JSFunction-inl.h"
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/CheckedInt.h"

js/src/vm/JSFunction.h

@@ -4,8 +4,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 jsfun_h
-#define jsfun_h
+#ifndef vm_JSFunction_h
+#define vm_JSFunction_h
 
 /*
  * JS function definitions.
@@ -1000,4 +1000,4 @@ CheckIsValidConstructible(const Value& calleev);
 } // namespace JS
 #endif
 
-#endif /* jsfun_h */
+#endif /* vm_JSFunction_h */

js/src/vm/JSObject-inl.h

@@ -12,7 +12,6 @@
 #include "mozilla/DebugOnly.h"
 
 #include "jsfriendapi.h"
-#include "jsfun.h"
 
 #include "builtin/MapObject.h"
 #include "builtin/TypedObject.h"
@@ -21,6 +20,7 @@
 #include "vm/ArrayObject.h"
 #include "vm/DateObject.h"
 #include "vm/EnvironmentObject.h"
+#include "vm/JSFunction.h"
 #include "vm/NumberObject.h"
 #include "vm/Probes.h"
 #include "vm/StringObject.h"

js/src/vm/JSObject.cpp

@@ -22,7 +22,6 @@
 #include "jscntxt.h"
 #include "jsexn.h"
 #include "jsfriendapi.h"
-#include "jsfun.h"
 #include "jsiter.h"
 #include "jsnum.h"
 #include "jsopcode.h"
@@ -46,6 +45,7 @@
 #include "js/UniquePtr.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSFunction.h"
 #include "vm/ProxyObject.h"
 #include "vm/RegExpStaticsObject.h"
 #include "vm/Shape.h"

js/src/vm/SelfHosting.cpp

@@ -16,7 +16,6 @@
 #include "jscompartment.h"
 #include "jsdate.h"
 #include "jsfriendapi.h"
-#include "jsfun.h"
 #include "jshashutil.h"
 #include "jsiter.h"
 #include "jsstr.h"
@@ -49,6 +48,7 @@
 #include "vm/Compression.h"
 #include "vm/GeneratorObject.h"
 #include "vm/Interpreter.h"
+#include "vm/JSFunction.h"
 #include "vm/Printer.h"
 #include "vm/RegExpObject.h"
 #include "vm/String.h"
@@ -56,11 +56,11 @@
 #include "vm/TypedArrayObject.h"
 #include "vm/WrapperObject.h"
 
-#include "jsfuninlines.h"
 #include "jsscriptinlines.h"
 
 #include "gc/Iteration-inl.h"
 #include "vm/BooleanObject-inl.h"
+#include "vm/JSFunction-inl.h"
 #include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/NumberObject-inl.h"

js/src/vm/Stack.h

@@ -14,7 +14,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Variant.h"
 
-#include "jsfun.h"
 #include "jsscript.h"
 #include "jsutil.h"
 
@@ -26,6 +25,7 @@
 #include "js/RootingAPI.h"
 #include "js/TypeDecls.h"
 #include "vm/ArgumentsObject.h"
+#include "vm/JSFunction.h"
 #include "vm/SavedFrame.h"
 #include "wasm/WasmFrameIter.h"
 #include "wasm/WasmTypes.h"

js/src/vm/TaggedProto.cpp

@@ -6,9 +6,8 @@
 
 #include "vm/TaggedProto.h"
 
-#include "jsfun.h"
-
 #include "gc/Barrier.h"
+#include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 
 namespace js {