# HG changeset patch # User Jason Orendorff # Date 1518461499 21600 # Node ID 23d76102a2e8acd0e79c26faa44eec833db58529 # Parent df20a18accded460e215e7552f778e1cc6f6bee9 Bug 1429206 - Part 4: Rename jsfun* -> vm/JSFunction*. diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py --- a/config/check_spidermonkey_style.py +++ b/config/check_spidermonkey_style.py @@ -161,17 +161,17 @@ js/src/tests/style/BadIncludesOrder-inl. js/src/tests/style/BadIncludesOrder-inl.h:9:10: error: "jsapi.h" should be included after js/src/tests/style/BadIncludesOrder-inl.h:10:11: error: 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 tests/style/HeaderCycleA1.h -> tests/style/HeaderCycleA2.h -> tests/style/HeaderCycleA3.h -> tests/style/HeaderCycleA1.h diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp --- a/js/src/builtin/TypedObject.cpp +++ b/js/src/builtin/TypedObject.cpp @@ -5,23 +5,23 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "builtin/TypedObject-inl.h" #include "mozilla/Casting.h" #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" #include "gc/Nursery-inl.h" #include "gc/StoreBuffer-inl.h" #include "vm/JSObject-inl.h" #include "vm/NativeObject-inl.h" diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp --- a/js/src/ctypes/CTypes.cpp +++ b/js/src/ctypes/CTypes.cpp @@ -28,28 +28,28 @@ #endif #if defined(XP_UNIX) #include #endif #include "jscntxt.h" #include "jsexn.h" -#include "jsfun.h" #include "jsnum.h" #include "jsprf.h" #include "jswin.h" #include "builtin/TypedObject.h" #include "ctypes/Library.h" #include "gc/FreeOp.h" #include "gc/Policy.h" #include "gc/Zone.h" #include "jit/AtomicOperations.h" #include "js/Vector.h" +#include "vm/JSFunction.h" #include "vm/JSObject-inl.h" using namespace std; using JS::AutoCheckCannotGC; namespace js { diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp --- a/js/src/frontend/BytecodeEmitter.cpp +++ b/js/src/frontend/BytecodeEmitter.cpp @@ -15,28 +15,28 @@ #include "mozilla/FloatingPoint.h" #include "mozilla/Maybe.h" #include "mozilla/PodOperations.h" #include #include "jsapi.h" #include "jscntxt.h" -#include "jsfun.h" #include "jsnum.h" #include "jsopcode.h" #include "jsscript.h" #include "jstypes.h" #include "jsutil.h" #include "ds/Nestable.h" #include "frontend/Parser.h" #include "frontend/TokenStream.h" #include "vm/Debugger.h" #include "vm/GeneratorObject.h" +#include "vm/JSFunction.h" #include "vm/Stack.h" #include "wasm/AsmJS.h" #include "jsscriptinlines.h" #include "frontend/ParseNode-inl.h" #include "vm/EnvironmentObject-inl.h" #include "vm/NativeObject-inl.h" diff --git a/js/src/frontend/NameFunctions.cpp b/js/src/frontend/NameFunctions.cpp --- a/js/src/frontend/NameFunctions.cpp +++ b/js/src/frontend/NameFunctions.cpp @@ -4,22 +4,22 @@ * 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 "frontend/NameFunctions.h" #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; using namespace js::frontend; namespace { class NameResolver diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp --- a/js/src/frontend/Parser.cpp +++ b/js/src/frontend/Parser.cpp @@ -20,27 +20,27 @@ #include "frontend/Parser.h" #include "mozilla/Range.h" #include "mozilla/Sprintf.h" #include "mozilla/TypeTraits.h" #include "jsapi.h" #include "jscntxt.h" -#include "jsfun.h" #include "jsopcode.h" #include "jsscript.h" #include "jstypes.h" #include "builtin/ModuleObject.h" #include "builtin/SelfHostingDefines.h" #include "frontend/BytecodeCompiler.h" #include "frontend/FoldConstants.h" #include "frontend/TokenStream.h" #include "irregexp/RegExpParser.h" +#include "vm/JSFunction.h" #include "vm/RegExpObject.h" #include "wasm/AsmJS.h" #include "jsscriptinlines.h" #include "frontend/ParseContext-inl.h" #include "frontend/ParseNode-inl.h" #include "vm/EnvironmentObject-inl.h" diff --git a/js/src/gc/Tracer.cpp b/js/src/gc/Tracer.cpp --- a/js/src/gc/Tracer.cpp +++ b/js/src/gc/Tracer.cpp @@ -3,26 +3,25 @@ * 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/. */ #include "gc/Tracer.h" #include "mozilla/DebugOnly.h" -#include "jsfun.h" #include "jsprf.h" #include "jsscript.h" #include "jsutil.h" #include "NamespaceImports.h" #include "gc/GCInternals.h" #include "gc/Marking.h" #include "gc/Zone.h" - +#include "vm/JSFunction.h" #include "vm/Shape.h" #include "vm/Symbol.h" #include "jscompartmentinlines.h" #include "jsgcinlines.h" #include "vm/ObjectGroup-inl.h" diff --git a/js/src/gdb/tests/test-Root.cpp b/js/src/gdb/tests/test-Root.cpp --- a/js/src/gdb/tests/test-Root.cpp +++ b/js/src/gdb/tests/test-Root.cpp @@ -1,14 +1,14 @@ #include "gdb-tests.h" #include "jsapi.h" -#include "jsfun.h" #include "gc/Barrier.h" +#include "vm/JSFunction.h" FRAGMENT(Root, null) { JS::Rooted null(cx, nullptr); breakpoint(); (void) null; } diff --git a/js/src/jit/BaselineCompiler.cpp b/js/src/jit/BaselineCompiler.cpp --- a/js/src/jit/BaselineCompiler.cpp +++ b/js/src/jit/BaselineCompiler.cpp @@ -3,18 +3,16 @@ * 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/. */ #include "jit/BaselineCompiler.h" #include "mozilla/Casting.h" -#include "jsfun.h" - #include "jit/BaselineIC.h" #include "jit/BaselineJIT.h" #include "jit/FixedList.h" #include "jit/IonAnalysis.h" #include "jit/JitcodeMap.h" #include "jit/JitSpewer.h" #include "jit/Linker.h" #ifdef JS_ION_PERF @@ -22,16 +20,17 @@ #endif #include "jit/SharedICHelpers.h" #include "jit/VMFunctions.h" #include "js/UniquePtr.h" #include "vm/AsyncFunction.h" #include "vm/AsyncIteration.h" #include "vm/EnvironmentObject.h" #include "vm/Interpreter.h" +#include "vm/JSFunction.h" #include "vm/TraceLogging.h" #include "vtune/VTuneWrapper.h" #include "jsscriptinlines.h" #include "jit/BaselineFrameInfo-inl.h" #include "jit/MacroAssembler-inl.h" #include "vm/Interpreter-inl.h" diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp --- a/js/src/jit/BaselineIC.cpp +++ b/js/src/jit/BaselineIC.cpp @@ -5,17 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "jit/BaselineIC.h" #include "mozilla/DebugOnly.h" #include "mozilla/TemplateLib.h" #include "jsfriendapi.h" -#include "jsfun.h" #include "jslibmath.h" #include "jstypes.h" #include "builtin/Eval.h" #include "builtin/SIMD.h" #include "gc/Policy.h" #include "jit/BaselineCacheIRCompiler.h" #include "jit/BaselineDebugModeOSR.h" @@ -26,16 +25,17 @@ #include "jit/Lowering.h" #ifdef JS_ION_PERF # include "jit/PerfSpewer.h" #endif #include "jit/SharedICHelpers.h" #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" #include "jsboolinlines.h" #include "jsscriptinlines.h" #include "jit/JitFrames-inl.h" diff --git a/js/src/jit/CacheIRSpewer.cpp b/js/src/jit/CacheIRSpewer.cpp --- a/js/src/jit/CacheIRSpewer.cpp +++ b/js/src/jit/CacheIRSpewer.cpp @@ -11,22 +11,21 @@ #include "mozilla/Sprintf.h" #ifdef XP_WIN #include #define getpid _getpid #else #include #endif - #include -#include "jsfun.h" #include "jsscript.h" +#include "vm/JSFunction.h" #include "vm/JSObject.h" #include "jscompartmentinlines.h" #include "vm/JSObject-inl.h" using namespace js; using namespace js::jit; diff --git a/js/src/jit/CompileInfo.h b/js/src/jit/CompileInfo.h --- a/js/src/jit/CompileInfo.h +++ b/js/src/jit/CompileInfo.h @@ -4,22 +4,21 @@ * 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 jit_CompileInfo_h #define jit_CompileInfo_h #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 { class TrackedOptimizations; inline unsigned StartArgSlot(JSScript* script) diff --git a/js/src/jit/JSJitFrameIter.h b/js/src/jit/JSJitFrameIter.h --- a/js/src/jit/JSJitFrameIter.h +++ b/js/src/jit/JSJitFrameIter.h @@ -2,24 +2,23 @@ * 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 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 { typedef void * CalleeToken; enum FrameType { diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp --- a/js/src/jit/JitFrames.cpp +++ b/js/src/jit/JitFrames.cpp @@ -1,17 +1,16 @@ /* -*- 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/. */ #include "jit/JitFrames-inl.h" -#include "jsfun.h" #include "jsscript.h" #include "jsutil.h" #include "gc/Marking.h" #include "jit/BaselineDebugModeOSR.h" #include "jit/BaselineFrame.h" #include "jit/BaselineIC.h" #include "jit/BaselineJIT.h" @@ -24,16 +23,17 @@ #include "jit/Recover.h" #include "jit/Safepoints.h" #include "jit/Snapshots.h" #include "jit/VMFunctions.h" #include "vm/ArgumentsObject.h" #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" #include "wasm/WasmBuiltins.h" #include "jsscriptinlines.h" #include "gc/Nursery-inl.h" diff --git a/js/src/jit/JitFrames.h b/js/src/jit/JitFrames.h --- a/js/src/jit/JitFrames.h +++ b/js/src/jit/JitFrames.h @@ -5,20 +5,20 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef jit_JitFrames_h #define jit_JitFrames_h #include #include "jscntxt.h" -#include "jsfun.h" #include "jit/JSJitFrameIter.h" #include "jit/Safepoints.h" +#include "vm/JSFunction.h" namespace js { namespace jit { enum CalleeTokenTag { CalleeToken_Function = 0x0, // untagged CalleeToken_FunctionConstructing = 0x1, diff --git a/js/src/jit/JitOptions.cpp b/js/src/jit/JitOptions.cpp --- a/js/src/jit/JitOptions.cpp +++ b/js/src/jit/JitOptions.cpp @@ -3,17 +3,19 @@ * 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/. */ #include "jit/JitOptions.h" #include "mozilla/TypeTraits.h" #include -#include "jsfun.h" + +#include "vm/JSFunction.h" + using namespace js; using namespace js::jit; using mozilla::Maybe; namespace js { namespace jit { diff --git a/js/src/jit/RematerializedFrame.h b/js/src/jit/RematerializedFrame.h --- a/js/src/jit/RematerializedFrame.h +++ b/js/src/jit/RematerializedFrame.h @@ -4,22 +4,20 @@ * 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 jit_RematerializedFrame_h #define jit_RematerializedFrame_h #include -#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 { namespace jit { // // An optimized frame that has been rematerialized with values read out of // Snapshots. diff --git a/js/src/jsapi-tests/testLookup.cpp b/js/src/jsapi-tests/testLookup.cpp --- a/js/src/jsapi-tests/testLookup.cpp +++ b/js/src/jsapi-tests/testLookup.cpp @@ -1,18 +1,18 @@ /* -*- 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/. */ -#include "jsfun.h" // for js::IsInternalFunctionObject +#include "jsapi-tests/tests.h" -#include "jsapi-tests/tests.h" +#include "vm/JSFunction.h" // for js::IsInternalFunctionObject #include "vm/JSObject-inl.h" BEGIN_TEST(testLookup_bug522590) { // Define a function that makes method-bearing objects. JS::RootedValue x(cx); EXEC("function mkobj() { return {f: function () {return 2;}} }"); diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -24,17 +24,16 @@ #include #include "jsarray.h" #include "jsbool.h" #include "jscntxt.h" #include "jsdate.h" #include "jsexn.h" #include "jsfriendapi.h" -#include "jsfun.h" #include "jsiter.h" #include "jsmath.h" #include "jsnum.h" #include "json.h" #include "jsprf.h" #include "jsscript.h" #include "jsstr.h" #include "jstypes.h" @@ -73,34 +72,35 @@ #include "vm/AsyncFunction.h" #include "vm/AsyncIteration.h" #include "vm/DateObject.h" #include "vm/Debugger.h" #include "vm/EnvironmentObject.h" #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" #include "vm/SavedStacks.h" #include "vm/SelfHosting.h" #include "vm/Shape.h" #include "vm/String.h" #include "vm/StringBuffer.h" #include "vm/Symbol.h" #include "vm/WrapperObject.h" #include "vm/Xdr.h" #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" using namespace js; using namespace js::gc; using mozilla::Maybe; diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp --- a/js/src/jsarray.cpp +++ b/js/src/jsarray.cpp @@ -12,29 +12,29 @@ #include "mozilla/FloatingPoint.h" #include "mozilla/MathAlgorithms.h" #include #include "jsapi.h" #include "jscntxt.h" #include "jsfriendapi.h" -#include "jsfun.h" #include "jsiter.h" #include "jsnum.h" #include "jstypes.h" #include "jsutil.h" #include "ds/Sort.h" #include "gc/Heap.h" #include "jit/InlinableNatives.h" #include "js/Class.h" #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" #include "vm/StringBuffer.h" #include "vm/TypedArrayObject.h" #include "vm/WrapperObject.h" #include "vm/ArgumentsObject-inl.h" diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp --- a/js/src/jscntxt.cpp +++ b/js/src/jscntxt.cpp @@ -26,17 +26,16 @@ #endif // ANDROID #ifdef XP_WIN #include #endif // XP_WIN #include "jscompartment.h" #include "jsdtoa.h" #include "jsexn.h" -#include "jsfun.h" #include "jsiter.h" #include "jsnativestack.h" #include "jsopcode.h" #include "jsprf.h" #include "jspubtd.h" #include "jsscript.h" #include "jsstr.h" #include "jstypes.h" @@ -44,16 +43,17 @@ #include "gc/FreeOp.h" #include "gc/Marking.h" #include "jit/Ion.h" #include "jit/PcScriptCache.h" #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" #include "jsscriptinlines.h" #include "vm/JSObject-inl.h" #include "vm/Stack-inl.h" diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp --- a/js/src/jscompartment.cpp +++ b/js/src/jscompartment.cpp @@ -21,21 +21,21 @@ #include "jit/JitOptions.h" #include "js/Date.h" #include "js/Proxy.h" #include "js/RootingAPI.h" #include "proxy/DeadObjectProxy.h" #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" using namespace js; using namespace js::gc; using namespace js::jit; diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp --- a/js/src/jsexn.cpp +++ b/js/src/jsexn.cpp @@ -13,29 +13,29 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/PodOperations.h" #include "mozilla/Sprintf.h" #include #include "jsapi.h" #include "jscntxt.h" -#include "jsfun.h" #include "jsnum.h" #include "jsprf.h" #include "jsscript.h" #include "jstypes.h" #include "jsutil.h" #include "jswrapper.h" #include "gc/FreeOp.h" #include "gc/Marking.h" #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" #include "vm/StringBuffer.h" #include "vm/ErrorObject-inl.h" #include "vm/JSObject-inl.h" #include "vm/SavedStacks-inl.h" diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp --- a/js/src/jsopcode.cpp +++ b/js/src/jsopcode.cpp @@ -21,31 +21,31 @@ #include #include #include #include #include "jsapi.h" #include "jscntxt.h" #include "jscompartment.h" -#include "jsfun.h" #include "jsnum.h" #include "jsprf.h" #include "jsscript.h" #include "jsstr.h" #include "jstypes.h" #include "jsutil.h" #include "frontend/BytecodeCompiler.h" #include "frontend/SourceNotes.h" #include "gc/FreeOp.h" #include "gc/GCInternals.h" #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" #include "vm/StringBuffer.h" #include "jscntxtinlines.h" #include "jscompartmentinlines.h" #include "jsscriptinlines.h" diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp --- a/js/src/jsscript.cpp +++ b/js/src/jsscript.cpp @@ -19,17 +19,16 @@ #include "mozilla/Unused.h" #include "mozilla/Vector.h" #include #include #include "jsapi.h" #include "jscntxt.h" -#include "jsfun.h" #include "jsopcode.h" #include "jsprf.h" #include "jstypes.h" #include "jsutil.h" #include "jswrapper.h" #include "frontend/BytecodeCompiler.h" #include "frontend/BytecodeEmitter.h" @@ -38,29 +37,29 @@ #include "jit/BaselineJIT.h" #include "jit/Ion.h" #include "jit/IonCode.h" #include "js/MemoryMetrics.h" #include "js/Utility.h" #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" #include "vm/Shape.h" #include "vm/SharedImmutableStringsCache.h" #include "vm/StringBuffer.h" #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" #include "vm/Stack-inl.h" using namespace js; using namespace js::gc; using namespace js::frontend; diff --git a/js/src/moz.build b/js/src/moz.build --- a/js/src/moz.build +++ b/js/src/moz.build @@ -290,17 +290,16 @@ UNIFIED_SOURCES += [ 'jsalloc.cpp', 'jsapi.cpp', 'jsbool.cpp', 'jscntxt.cpp', 'jscompartment.cpp', 'jsdate.cpp', 'jsexn.cpp', 'jsfriendapi.cpp', - 'jsfun.cpp', 'jsgc.cpp', 'jsiter.cpp', 'jsnativestack.cpp', 'jsnum.cpp', 'json.cpp', 'jsopcode.cpp', 'jsprf.cpp', 'jsscript.cpp', @@ -334,16 +333,17 @@ UNIFIED_SOURCES += [ 'vm/ErrorReporting.cpp', 'vm/ForOfIterator.cpp', 'vm/GeckoProfiler.cpp', 'vm/GeneratorObject.cpp', 'vm/GlobalObject.cpp', 'vm/HelperThreads.cpp', 'vm/Id.cpp', 'vm/Initialization.cpp', + 'vm/JSFunction.cpp', 'vm/JSObject.cpp', 'vm/JSONParser.cpp', 'vm/JSONPrinter.cpp', 'vm/MemoryMetrics.cpp', 'vm/NativeObject.cpp', 'vm/ObjectGroup.cpp', 'vm/PIC.cpp', 'vm/Printer.cpp', diff --git a/js/src/proxy/DeadObjectProxy.cpp b/js/src/proxy/DeadObjectProxy.cpp --- a/js/src/proxy/DeadObjectProxy.cpp +++ b/js/src/proxy/DeadObjectProxy.cpp @@ -2,18 +2,18 @@ * 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/. */ #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; using namespace js::gc; const DeadObjectProxy DeadObjectProxy::singleton; const char DeadObjectProxy::family = 0; diff --git a/js/src/proxy/Proxy.cpp b/js/src/proxy/Proxy.cpp --- a/js/src/proxy/Proxy.cpp +++ b/js/src/proxy/Proxy.cpp @@ -7,21 +7,21 @@ #include "js/Proxy.h" #include "mozilla/Attributes.h" #include #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" #include "vm/JSObject-inl.h" #include "vm/NativeObject-inl.h" using namespace js; using namespace js::gc; diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp --- a/js/src/shell/js.cpp +++ b/js/src/shell/js.cpp @@ -49,17 +49,16 @@ # include # include #endif #include "jsapi.h" #include "jsarray.h" #include "jscntxt.h" #include "jsfriendapi.h" -#include "jsfun.h" #include "jsprf.h" #include "jsscript.h" #include "jstypes.h" #include "jsutil.h" #ifdef XP_WIN # include "jswin.h" #endif #include "jswrapper.h" @@ -94,16 +93,17 @@ #include "threading/LockGuard.h" #include "threading/Thread.h" #include "vm/ArgumentsObject.h" #include "vm/AsyncFunction.h" #include "vm/AsyncIteration.h" #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" #include "vm/Printer.h" #include "vm/Shape.h" #include "vm/SharedArrayObject.h" #include "vm/StringBuffer.h" #include "vm/Time.h" diff --git a/js/src/tests/style/BadIncludesOrder-inl.h b/js/src/tests/style/BadIncludesOrder-inl.h --- a/js/src/tests/style/BadIncludesOrder-inl.h +++ b/js/src/tests/style/BadIncludesOrder-inl.h @@ -19,12 +19,12 @@ # if D # include "jsapi.h" # endif # include # endif # include "mozilla/HashFunctions.h" #endif -#include "jsfun.h" +#include "jsscript.h" #include "vm/JSObject.h" // out of order -#include "jsscript.h" #include "jstypes.h" +#include "vm/JSFunction.h" diff --git a/js/src/vm/CallNonGenericMethod.cpp b/js/src/vm/CallNonGenericMethod.cpp --- a/js/src/vm/CallNonGenericMethod.cpp +++ b/js/src/vm/CallNonGenericMethod.cpp @@ -1,19 +1,18 @@ /* -*- 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/. */ #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" using namespace js; bool JS::detail::CallMethodIfWrapped(JSContext* cx, IsAcceptableThis test, NativeImpl impl, diff --git a/js/src/vm/GlobalObject.h b/js/src/vm/GlobalObject.h --- a/js/src/vm/GlobalObject.h +++ b/js/src/vm/GlobalObject.h @@ -5,22 +5,22 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef vm_GlobalObject_h #define vm_GlobalObject_h #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" namespace js { class Debugger; class TypedObjectModuleObject; class LexicalEnvironmentObject; diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp --- a/js/src/vm/Interpreter.cpp +++ b/js/src/vm/Interpreter.cpp @@ -16,17 +16,16 @@ #include "mozilla/Maybe.h" #include "mozilla/PodOperations.h" #include "mozilla/Sprintf.h" #include #include "jsarray.h" #include "jscntxt.h" -#include "jsfun.h" #include "jsiter.h" #include "jslibmath.h" #include "jsnum.h" #include "jsopcode.h" #include "jsprf.h" #include "jsscript.h" #include "jsstr.h" @@ -35,32 +34,33 @@ #include "jit/BaselineJIT.h" #include "jit/Ion.h" #include "jit/IonAnalysis.h" #include "jit/Jit.h" #include "vm/AsyncFunction.h" #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" #include "vm/Shape.h" #include "vm/Stopwatch.h" #include "vm/StringBuffer.h" #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" using namespace js; using namespace js::gc; using mozilla::ArrayLength; diff --git a/js/src/jsfuninlines.h b/js/src/vm/JSFunction-inl.h rename from js/src/jsfuninlines.h rename to js/src/vm/JSFunction-inl.h --- a/js/src/jsfuninlines.h +++ b/js/src/vm/JSFunction-inl.h @@ -1,18 +1,18 @@ /* -*- 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 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" namespace js { inline const char* GetFunctionNameBytes(JSContext* cx, JSFunction* fun, JSAutoByteString* bytes) { @@ -92,9 +92,9 @@ CloneFunctionObjectIfNotSingleton(JSCont if (!script) return nullptr; RootedScope enclosingScope(cx, script->enclosingScope()); return CloneFunctionAndScript(cx, fun, parent, enclosingScope, kind, proto); } } /* namespace js */ -#endif /* jsfuninlines_h */ +#endif /* vm_JSFunction_inl_h */ diff --git a/js/src/jsfun.cpp b/js/src/vm/JSFunction.cpp rename from js/src/jsfun.cpp rename to js/src/vm/JSFunction.cpp --- a/js/src/jsfun.cpp +++ b/js/src/vm/JSFunction.cpp @@ -3,17 +3,17 @@ * 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/. */ /* * JS function support. */ -#include "jsfuninlines.h" +#include "vm/JSFunction-inl.h" #include "mozilla/ArrayUtils.h" #include "mozilla/CheckedInt.h" #include "mozilla/Maybe.h" #include "mozilla/PodOperations.h" #include "mozilla/Range.h" #include diff --git a/js/src/jsfun.h b/js/src/vm/JSFunction.h rename from js/src/jsfun.h rename to js/src/vm/JSFunction.h --- a/js/src/jsfun.h +++ b/js/src/vm/JSFunction.h @@ -1,16 +1,16 @@ /* -*- 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 jsfun_h -#define jsfun_h +#ifndef vm_JSFunction_h +#define vm_JSFunction_h /* * JS function definitions. */ #include "jsscript.h" #include "jstypes.h" @@ -965,9 +965,9 @@ namespace detail { JS_PUBLIC_API(void) CheckIsValidConstructible(const Value& calleev); } // namespace detail } // namespace JS #endif -#endif /* jsfun_h */ +#endif /* vm_JSFunction_h */ diff --git a/js/src/vm/JSObject-inl.h b/js/src/vm/JSObject-inl.h --- a/js/src/vm/JSObject-inl.h +++ b/js/src/vm/JSObject-inl.h @@ -7,25 +7,25 @@ #ifndef vm_JSObject_inl_h #define vm_JSObject_inl_h #include "vm/JSObject.h" #include "mozilla/DebugOnly.h" #include "jsfriendapi.h" -#include "jsfun.h" #include "builtin/MapObject.h" #include "builtin/TypedObject.h" #include "gc/Allocator.h" #include "gc/FreeOp.h" #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" #include "vm/TypedArrayObject.h" #include "jsatominlines.h" #include "jscompartmentinlines.h" diff --git a/js/src/vm/JSObject.cpp b/js/src/vm/JSObject.cpp --- a/js/src/vm/JSObject.cpp +++ b/js/src/vm/JSObject.cpp @@ -17,17 +17,16 @@ #include #include "jsapi.h" #include "jsarray.h" #include "jscntxt.h" #include "jsexn.h" #include "jsfriendapi.h" -#include "jsfun.h" #include "jsiter.h" #include "jsnum.h" #include "jsopcode.h" #include "jsprf.h" #include "jsscript.h" #include "jsstr.h" #include "jstypes.h" #include "jsutil.h" @@ -41,16 +40,17 @@ #include "gc/Policy.h" #include "jit/BaselineJIT.h" #include "js/MemoryMetrics.h" #include "js/Proxy.h" #include "js/UbiNode.h" #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" #include "vm/TypedArrayObject.h" #include "jsboolinlines.h" #include "jscntxtinlines.h" #include "jscompartmentinlines.h" diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp --- a/js/src/vm/SelfHosting.cpp +++ b/js/src/vm/SelfHosting.cpp @@ -11,17 +11,16 @@ #include "mozilla/DebugOnly.h" #include "mozilla/Maybe.h" #include "jsarray.h" #include "jscntxt.h" #include "jscompartment.h" #include "jsdate.h" #include "jsfriendapi.h" -#include "jsfun.h" #include "jshashutil.h" #include "jsiter.h" #include "jsstr.h" #include "jswrapper.h" #include "selfhosted.out.h" #include "builtin/intl/Collator.h" #include "builtin/intl/DateTimeFormat.h" @@ -44,28 +43,29 @@ #include "gc/Policy.h" #include "jit/AtomicOperations.h" #include "jit/InlinableNatives.h" #include "js/CharacterEncoding.h" #include "js/Date.h" #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" #include "vm/StringBuffer.h" #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" #include "vm/StringObject-inl.h" using namespace js; using namespace js::selfhosted; diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h --- a/js/src/vm/Stack.h +++ b/js/src/vm/Stack.h @@ -9,28 +9,28 @@ #include "mozilla/Atomics.h" #include "mozilla/HashFunctions.h" #include "mozilla/Maybe.h" #include "mozilla/MaybeOneOf.h" #include "mozilla/MemoryReporting.h" #include "mozilla/Variant.h" -#include "jsfun.h" #include "jsscript.h" #include "jsutil.h" #include "gc/Rooting.h" #ifdef CHECK_OSIPOINT_REGISTERS #include "jit/Registers.h" // for RegisterDump #endif #include "jit/JSJitFrameIter.h" #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" namespace JS { namespace dbg { #ifdef JS_BROKEN_GCC_ATTRIBUTE_WARNING #pragma GCC diagnostic push diff --git a/js/src/vm/TaggedProto.cpp b/js/src/vm/TaggedProto.cpp --- a/js/src/vm/TaggedProto.cpp +++ b/js/src/vm/TaggedProto.cpp @@ -1,19 +1,18 @@ /* -*- 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/. */ #include "vm/TaggedProto.h" -#include "jsfun.h" - #include "gc/Barrier.h" +#include "vm/JSFunction.h" #include "vm/JSObject.h" namespace js { /* static */ void InternalBarrierMethods::preBarrier(TaggedProto& proto) { InternalBarrierMethods::preBarrier(proto.toObjectOrNull());