Bug 1130849 - Rename jsinfer files, r=jandem.

js/src/asmjs/AsmJSValidate.cpp

@@ -44,7 +44,6 @@
 #include "vm/HelperThreads.h"
 #include "vm/Interpreter.h"
 
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "frontend/ParseNode-inl.h"

js/src/frontend/BytecodeEmitter.cpp

@@ -540,8 +540,8 @@ EmitLoopEntry(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *nextpn)
 }
 
 /*
- * If op is JOF_TYPESET (see the type barriers comment in jsinfer.h), reserve
- * a type set to store its result.
+ * If op is JOF_TYPESET (see the type barriers comment in TypeInference.h),
+ * reserve a type set to store its result.
  */
 static inline void
 CheckTypeSet(ExclusiveContext *cx, BytecodeEmitter *bce, JSOp op)

js/src/frontend/FoldConstants.cpp

@@ -15,7 +15,6 @@
 #include "js/Conversions.h"
 
 #include "jscntxtinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;

js/src/gc/Marking.cpp

@@ -22,7 +22,6 @@
 #include "vm/UnboxedObject.h"
 
 #include "jscompartmentinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "gc/Nursery-inl.h"

js/src/gc/Nursery.cpp

@@ -11,7 +11,6 @@
 
 #include "jscompartment.h"
 #include "jsgc.h"
-#include "jsinfer.h"
 #include "jsutil.h"
 #include "prmjtime.h"
 
@@ -24,6 +23,7 @@
 #include "vm/ScopeObject.h"
 #endif
 #include "vm/TypedArrayObject.h"
+#include "vm/TypeInference.h"
 
 #include "jsgcinlines.h"
 

js/src/gc/Zone.h

@@ -12,11 +12,11 @@
 #include "mozilla/MemoryReporting.h"
 
 #include "jscntxt.h"
-#include "jsinfer.h"
 
 #include "gc/FindSCCs.h"
 #include "gc/GCRuntime.h"
 #include "js/TracingAPI.h"
+#include "vm/TypeInference.h"
 
 namespace js {
 

js/src/jit/Ion.cpp

@@ -44,7 +44,6 @@
 
 #include "jscompartmentinlines.h"
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;

js/src/jit/IonAnalysis.cpp

@@ -16,7 +16,6 @@
 #include "jit/Lowering.h"
 #include "jit/MIRGraph.h"
 
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 

js/src/jit/IonBuilder.cpp

@@ -23,8 +23,6 @@
 #include "vm/RegExpStatics.h"
 #include "vm/TraceLogging.h"
 
-#include "jsinferinlines.h"
-#include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 #include "jsscriptinlines.h"
 

js/src/jit/IonCode.h

@@ -11,7 +11,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PodOperations.h"
 
-#include "jsinfer.h"
 #include "jstypes.h"
 
 #include "gc/Heap.h"
@@ -20,6 +19,7 @@
 #include "jit/IonTypes.h"
 #include "js/UbiNode.h"
 #include "vm/TraceLogging.h"
+#include "vm/TypeInference.h"
 
 namespace js {
 

js/src/jit/JitFrames.cpp

@@ -7,7 +7,6 @@
 #include "jit/JitFrames-inl.h"
 
 #include "jsfun.h"
-#include "jsinfer.h"
 #include "jsobj.h"
 #include "jsscript.h"
 
@@ -31,13 +30,14 @@
 #include "vm/Interpreter.h"
 #include "vm/SPSProfiler.h"
 #include "vm/TraceLogging.h"
+#include "vm/TypeInference.h"
 
-#include "jsinferinlines.h"
 #include "jsscriptinlines.h"
 #include "gc/Nursery-inl.h"
 #include "jit/JitFrameIterator-inl.h"
 #include "vm/Debugger-inl.h"
 #include "vm/Probes-inl.h"
+#include "vm/TypeInference-inl.h"
 
 namespace js {
 namespace jit {

js/src/jit/JitOptions.h

@@ -7,6 +7,8 @@
 #ifndef jit_JitOptions_h
 #define jit_JitOptions_h
 
+#include "mozilla/Maybe.h"
+
 #include "jit/IonTypes.h"
 #include "js/TypeDecls.h"
 

js/src/jit/Lowering.cpp

@@ -13,7 +13,6 @@
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
 
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 

js/src/jit/MIR.cpp

@@ -22,7 +22,6 @@
 #include "js/Conversions.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;

js/src/jit/MacroAssembler.cpp

@@ -6,7 +6,6 @@
 
 #include "jit/MacroAssembler.h"
 
-#include "jsinfer.h"
 #include "jsprf.h"
 
 #include "builtin/TypedObject.h"
@@ -22,7 +21,6 @@
 #include "vm/TraceLogging.h"
 
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "vm/Interpreter-inl.h"
 

js/src/jit/OptimizationTracking.h

@@ -9,11 +9,11 @@
 
 #include "mozilla/Maybe.h"
 
-#include "jsinfer.h"
 #include "jit/CompactBuffer.h"
 #include "jit/CompileInfo.h"
 #include "jit/JitAllocPolicy.h"
 #include "js/TrackedOptimizationInfo.h"
+#include "vm/TypeInference.h"
 
 namespace js {
 

js/src/jit/VMFunctions.cpp

@@ -18,14 +18,13 @@
 #include "vm/Interpreter.h"
 #include "vm/TraceLogging.h"
 
-#include "jsinferinlines.h"
-
 #include "jit/BaselineFrame-inl.h"
 #include "jit/JitFrames-inl.h"
 #include "vm/Debugger-inl.h"
 #include "vm/Interpreter-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/StringObject-inl.h"
+#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jsapi.cpp

@@ -88,7 +88,6 @@
 
 #include "jsatominlines.h"
 #include "jsfuninlines.h"
-#include "jsinferinlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/Interpreter-inl.h"

js/src/jscompartment.cpp

@@ -28,7 +28,6 @@
 #include "jsatominlines.h"
 #include "jsfuninlines.h"
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;

js/src/jsiter.cpp

@@ -33,8 +33,6 @@
 #include "vm/StopIterationObject.h"
 #include "vm/TypedArrayCommon.h"
 
-#include "jsinferinlines.h"
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/NativeObject-inl.h"

js/src/jsobjinlines.h

@@ -22,7 +22,8 @@
 #include "jsatominlines.h"
 #include "jscompartmentinlines.h"
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
+
+#include "vm/TypeInference-inl.h"
 
 inline void
 JSObject::finalize(js::FreeOp *fop)

js/src/jsopcode.cpp

@@ -39,7 +39,6 @@
 
 #include "jscntxtinlines.h"
 #include "jscompartmentinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 

js/src/jsscript.cpp

@@ -47,7 +47,6 @@
 #include "vm/Xdr.h"
 
 #include "jsfuninlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/ScopeObject-inl.h"

js/src/jsstr.cpp

@@ -44,11 +44,10 @@
 #include "vm/ScopeObject.h"
 #include "vm/StringBuffer.h"
 
-#include "jsinferinlines.h"
-
 #include "vm/Interpreter-inl.h"
 #include "vm/String-inl.h"
 #include "vm/StringObject-inl.h"
+#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/moz.build

@@ -209,7 +209,6 @@ UNIFIED_SOURCES += [
     'jsfriendapi.cpp',
     'jsfun.cpp',
     'jsgc.cpp',
-    'jsinfer.cpp',
     'jsiter.cpp',
     'jsnativestack.cpp',
     'jsnum.cpp',
@@ -273,6 +272,7 @@ UNIFIED_SOURCES += [
     'vm/StructuredClone.cpp',
     'vm/Symbol.cpp',
     'vm/TypedArrayObject.cpp',
+    'vm/TypeInference.cpp',
     'vm/UbiNode.cpp',
     'vm/UnboxedObject.cpp',
     'vm/Unicode.cpp',

js/src/proxy/Proxy.cpp

@@ -20,7 +20,6 @@
 #include "vm/WrapperObject.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/NativeObject-inl.h"

js/src/vm/ArgumentsObject.cpp

@@ -6,8 +6,6 @@
 
 #include "vm/ArgumentsObject-inl.h"
 
-#include "jsinfer.h"
-
 #include "jit/JitFrames.h"
 #include "vm/GlobalObject.h"
 #include "vm/Stack.h"

js/src/vm/ArrayBufferObject.cpp

@@ -45,8 +45,6 @@
 #include "vm/WrapperObject.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
-#include "jsobjinlines.h"
 
 #include "vm/NativeObject-inl.h"
 #include "vm/Shape-inl.h"

js/src/vm/ArrayObject-inl.h

@@ -11,7 +11,7 @@
 
 #include "vm/String.h"
 
-#include "jsinferinlines.h"
+#include "vm/TypeInference-inl.h"
 
 namespace js {
 

js/src/vm/Debugger.cpp

@@ -11,7 +11,6 @@
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jshashutil.h"
-#include "jsinfer.h"
 #include "jsnum.h"
 #include "jsobj.h"
 #include "jswrapper.h"
@@ -30,7 +29,6 @@
 #include "vm/WrapperObject.h"
 
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 #include "jsscriptinlines.h"

js/src/vm/Interpreter-inl.h

@@ -10,7 +10,6 @@
 #include "vm/Interpreter.h"
 
 #include "jscompartment.h"
-#include "jsinfer.h"
 #include "jsnum.h"
 #include "jsstr.h"
 
@@ -18,7 +17,6 @@
 #include "vm/ArgumentsObject.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/ScopeObject-inl.h"

js/src/vm/Interpreter.cpp

@@ -43,7 +43,6 @@
 #include "jsatominlines.h"
 #include "jsboolinlines.h"
 #include "jsfuninlines.h"
-#include "jsinferinlines.h"
 #include "jsscriptinlines.h"
 
 #include "jit/JitFrames-inl.h"

js/src/vm/NativeObject.h

@@ -13,7 +13,6 @@
 #include <stdint.h>
 
 #include "jsfriendapi.h"
-#include "jsinfer.h"
 #include "jsobj.h"
 #include "NamespaceImports.h"
 
@@ -23,6 +22,7 @@
 #include "js/Value.h"
 #include "vm/Shape.h"
 #include "vm/String.h"
+#include "vm/TypeInference.h"
 
 namespace js {
 

js/src/vm/ObjectGroup.cpp

@@ -15,7 +15,6 @@
 #include "vm/UnboxedObject.h"
 
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;

js/src/vm/ObjectGroup.h

@@ -9,10 +9,10 @@
 
 #include "jsbytecode.h"
 #include "jsfriendapi.h"
-#include "jsinfer.h"
 
 #include "ds/IdValuePair.h"
 #include "gc/Barrier.h"
+#include "vm/TypeInference.h"
 
 namespace js {
 

js/src/vm/ProxyObject.cpp

@@ -8,7 +8,6 @@
 
 #include "jscompartment.h"
 #include "jsgcinlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;

js/src/vm/ScopeObject-inl.h

@@ -9,7 +9,7 @@
 
 #include "vm/ScopeObject.h"
 
-#include "jsinferinlines.h"
+#include "vm/TypeInference-inl.h"
 
 namespace js {
 

js/src/vm/SharedTypedArrayObject.cpp

@@ -40,7 +40,6 @@
 #include "vm/WrapperObject.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/Shape-inl.h"

js/src/vm/TypeInference-inl.h

@@ -6,10 +6,10 @@
 
 /* Inline members for javascript type inference. */
 
-#ifndef jsinferinlines_h
-#define jsinferinlines_h
+#ifndef vm_TypeInference_inl_h
+#define vm_TypeInference_inl_h
 
-#include "jsinfer.h"
+#include "vm/TypeInference.h"
 
 #include "mozilla/PodOperations.h"
 
@@ -1142,4 +1142,4 @@ JSScript::ensureHasTypes(JSContext *cx)
     return types() || makeTypes(cx);
 }
 
-#endif /* jsinferinlines_h */
+#endif /* vm_TypeInference_inl_h */

js/src/vm/TypeInference.cpp

@@ -4,7 +4,7 @@
  * 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 "jsinferinlines.h"
+#include "vm/TypeInference-inl.h"
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryReporting.h"
@@ -34,7 +34,6 @@
 
 #include "jsatominlines.h"
 #include "jsgcinlines.h"
-#include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
 #include "vm/NativeObject-inl.h"

js/src/vm/TypeInference.h

@@ -6,8 +6,8 @@
 
 /* Definitions related to javascript type inference. */
 
-#ifndef jsinfer_h
-#define jsinfer_h
+#ifndef vm_TypeInference_h
+#define vm_TypeInference_h
 
 #include "mozilla/MemoryReporting.h"
 
@@ -421,8 +421,8 @@ class TypeSet
 
     /*
      * Iterate through the objects in this set. getObjectCount overapproximates
-     * in the hash case (see SET_ARRAY_SIZE in jsinferinlines.h), and getObject
-     * may return nullptr.
+     * in the hash case (see SET_ARRAY_SIZE in TypeInference-inl.h), and
+     * getObject may return nullptr.
      */
     inline unsigned getObjectCount() const;
     inline ObjectKey *getObject(unsigned i) const;
@@ -1232,4 +1232,4 @@ template<> struct Concrete<js::ObjectGroup> : TracerConcrete<js::ObjectGroup> {
 }
 }
 
-#endif /* jsinfer_h */
+#endif /* vm_TypeInference_h */

js/src/vm/TypedArrayObject.cpp

@@ -39,8 +39,6 @@
 #include "vm/WrapperObject.h"
 
 #include "jsatominlines.h"
-#include "jsinferinlines.h"
-#include "jsobjinlines.h"
 
 #include "vm/NativeObject-inl.h"
 #include "vm/Shape-inl.h"

js/src/vm/UbiNode.cpp

@@ -12,7 +12,6 @@
 #include "mozilla/UniquePtr.h"
 
 #include "jscntxt.h"
-#include "jsinfer.h"
 #include "jsobj.h"
 #include "jsscript.h"
 #include "jsstr.h"

js/src/vm/UnboxedObject.cpp

@@ -6,7 +6,6 @@
 
 #include "vm/UnboxedObject.h"
 
-#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 
 #include "vm/Shape-inl.h"

js/src/vm/UnboxedObject.h

@@ -8,9 +8,10 @@
 #define vm_UnboxedObject_h
 
 #include "jsgc.h"
-#include "jsinfer.h"
 #include "jsobj.h"
 
+#include "vm/TypeInference.h"
+
 namespace js {
 
 // Memory required for an unboxed value of a given type. Returns zero for types