Bug 1439026 - Part 1: Rename jsstr* -> builtin/String*. r=jandem.

Also:
vm/StringBuffer.h -> util/
vm/Unicode* -> util/
vm/make_unicode.py -> util/
vm/String* -> vm/StringType*

--HG--
rename : js/src/jsstr.cpp => js/src/builtin/String.cpp
rename : js/src/jsstr.h => js/src/builtin/String.h
rename : js/src/builtin/SymbolObject.cpp => js/src/builtin/Symbol.cpp
rename : js/src/builtin/SymbolObject.h => js/src/builtin/Symbol.h
rename : js/src/vm/StringBuffer.cpp => js/src/util/StringBuffer.cpp
rename : js/src/vm/StringBuffer.h => js/src/util/StringBuffer.h
rename : js/src/vm/Unicode.cpp => js/src/util/Unicode.cpp
rename : js/src/vm/Unicode.h => js/src/util/Unicode.h
rename : js/src/vm/UnicodeData.txt => js/src/util/UnicodeData.txt
rename : js/src/vm/UnicodeNonBMP.h => js/src/util/UnicodeNonBMP.h
rename : js/src/vm/make_unicode.py => js/src/util/make_unicode.py
rename : js/src/vm/String-inl.h => js/src/vm/StringType-inl.h
rename : js/src/vm/String.cpp => js/src/vm/StringType.cpp
rename : js/src/vm/String.h => js/src/vm/StringType.h
rename : js/src/vm/Symbol.cpp => js/src/vm/SymbolType.cpp
rename : js/src/vm/Symbol.h => js/src/vm/SymbolType.h
extra : rebase_source : c539127127bf2ff0cc310d41108ef7d96cd5f133

js/src/builtin/JSON.cpp

@@ -12,16 +12,16 @@
 
 #include "jsarray.h"
 #include "jsnum.h"
-#include "jsstr.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
+#include "builtin/String.h"
+#include "util/StringBuffer.h"
 #include "vm/Interpreter.h"
 #include "vm/JSAtom.h"
 #include "vm/JSContext.h"
 #include "vm/JSObject.h"
 #include "vm/JSONParser.h"
-#include "vm/StringBuffer.h"
 
 #include "jsarrayinlines.h"
 #include "jsboolinlines.h"

js/src/builtin/MapObject.cpp

@@ -15,7 +15,7 @@
 #include "vm/JSContext.h"
 #include "vm/JSObject.h"
 #include "vm/SelfHosting.h"
-#include "vm/Symbol.h"
+#include "vm/SymbolType.h"
 
 #include "gc/Marking-inl.h"
 #include "vm/Interpreter-inl.h"

js/src/builtin/Object.cpp

@@ -8,17 +8,16 @@
 
 #include "mozilla/MaybeOneOf.h"
 
-#include "jsstr.h"
-
 #include "builtin/Eval.h"
 #include "builtin/SelfHostingDefines.h"
+#include "builtin/String.h"
 #include "frontend/BytecodeCompiler.h"
 #include "jit/InlinableNatives.h"
 #include "js/UniquePtr.h"
+#include "util/StringBuffer.h"
 #include "vm/AsyncFunction.h"
 #include "vm/JSContext.h"
 #include "vm/RegExpObject.h"
-#include "vm/StringBuffer.h"
 
 #include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"

js/src/builtin/RegExp.cpp

@@ -12,11 +12,11 @@
 #include "frontend/TokenStream.h"
 #include "irregexp/RegExpParser.h"
 #include "jit/InlinableNatives.h"
+#include "util/StringBuffer.h"
+#include "util/Unicode.h"
 #include "vm/JSContext.h"
 #include "vm/RegExpStatics.h"
 #include "vm/SelfHosting.h"
-#include "vm/StringBuffer.h"
-#include "vm/Unicode.h"
 
 #include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"

js/src/builtin/String.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 "jsstr.h"
+#include "builtin/String.h"
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
@@ -36,6 +36,8 @@
 # include "unicode/uchar.h"
 # include "unicode/unorm2.h"
 #endif
+#include "util/StringBuffer.h"
+#include "util/Unicode.h"
 #include "vm/BytecodeUtil.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
@@ -47,12 +49,10 @@
 #include "vm/RegExpObject.h"
 #include "vm/RegExpStatics.h"
 #include "vm/SelfHosting.h"
-#include "vm/StringBuffer.h"
-#include "vm/Unicode.h"
 
 #include "vm/Interpreter-inl.h"
-#include "vm/String-inl.h"
 #include "vm/StringObject-inl.h"
+#include "vm/StringType-inl.h"
 #include "vm/TypeInference-inl.h"
 
 using namespace js;

js/src/builtin/String.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 jsstr_h
-#define jsstr_h
+#ifndef builtin_String_h
+#define builtin_String_h
 
 #include "mozilla/HashFunctions.h"
 #include "mozilla/PodOperations.h"
@@ -19,8 +19,8 @@
 #include "gc/Rooting.h"
 #include "js/RootingAPI.h"
 #include "js/UniquePtr.h"
+#include "util/Unicode.h"
 #include "vm/Printer.h"
-#include "vm/Unicode.h"
 
 class JSAutoByteString;
 class JSLinearString;
@@ -527,4 +527,4 @@ FlatStringSearch(JSContext* cx, unsigned argc, Value* vp);
 
 } /* namespace js */
 
-#endif /* jsstr_h */
+#endif /* builtin_String_h */

js/src/builtin/Symbol.cpp

@@ -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/. */
 
-#include "builtin/SymbolObject.h"
+#include "builtin/Symbol.h"
 
-#include "vm/StringBuffer.h"
-#include "vm/Symbol.h"
+#include "util/StringBuffer.h"
+#include "vm/SymbolType.h"
 
 #include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"

js/src/builtin/Symbol.h

@@ -4,11 +4,11 @@
  * 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 builtin_SymbolObject_h
-#define builtin_SymbolObject_h
+#ifndef builtin_Symbol_h
+#define builtin_Symbol_h
 
 #include "vm/NativeObject.h"
-#include "vm/Symbol.h"
+#include "vm/SymbolType.h"
 
 namespace js {
 
@@ -65,4 +65,4 @@ InitBareSymbolCtor(JSContext* cx, HandleObject obj);
 
 } /* namespace js */
 
-#endif /* builtin_SymbolObject_h */
+#endif /* builtin_Symbol_h */

js/src/builtin/TestingFunctions.cpp

@@ -38,6 +38,7 @@
 #include "js/UniquePtr.h"
 #include "js/Vector.h"
 #include "js/Wrapper.h"
+#include "util/StringBuffer.h"
 #include "vm/AsyncFunction.h"
 #include "vm/AsyncIteration.h"
 #include "vm/Debugger.h"
@@ -49,7 +50,6 @@
 #include "vm/ProxyObject.h"
 #include "vm/SavedStacks.h"
 #include "vm/Stack.h"
-#include "vm/StringBuffer.h"
 #include "vm/TraceLogging.h"
 #include "wasm/AsmJS.h"
 #include "wasm/WasmBinaryToText.h"

js/src/builtin/TypedObject.cpp

@@ -14,11 +14,11 @@
 #include "builtin/SIMD.h"
 #include "gc/Marking.h"
 #include "js/Vector.h"
+#include "util/StringBuffer.h"
 #include "vm/GlobalObject.h"
 #include "vm/JSCompartment.h"
 #include "vm/JSFunction.h"
-#include "vm/String.h"
-#include "vm/StringBuffer.h"
+#include "vm/StringType.h"
 #include "vm/TypedArrayObject.h"
 
 #include "gc/Nursery-inl.h"

js/src/builtin/intl/Collator.cpp

@@ -21,7 +21,7 @@
 #include "vm/GlobalObject.h"
 #include "vm/JSContext.h"
 #include "vm/Runtime.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 #include "vm/JSObject-inl.h"
 

js/src/builtin/intl/CommonFunctions.h

@@ -17,7 +17,7 @@
 #include "builtin/intl/ICUStubs.h"
 #include "js/RootingAPI.h"
 #include "js/Vector.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 namespace js {
 

js/src/builtin/intl/IntlObject.cpp

@@ -25,7 +25,7 @@
 #include "vm/GlobalObject.h"
 #include "vm/JSContext.h"
 #include "vm/JSObject.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 #include "vm/JSObject-inl.h"
 

js/src/builtin/intl/PluralRules.cpp

@@ -17,7 +17,7 @@
 #include "gc/FreeOp.h"
 #include "vm/GlobalObject.h"
 #include "vm/JSContext.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 #include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"

js/src/builtin/intl/SharedIntlData.cpp

@@ -13,12 +13,11 @@
 
 #include <stdint.h>
 
-#include "jsstr.h"
-
 #include "builtin/intl/CommonFunctions.h"
 #include "builtin/intl/ICUStubs.h"
 #include "builtin/intl/ScopedICUObject.h"
 #include "builtin/intl/TimeZoneDataGenerated.h"
+#include "builtin/String.h"
 #include "js/Utility.h"
 #include "vm/JSAtom.h"
 

js/src/builtin/intl/SharedIntlData.h

@@ -17,7 +17,7 @@
 #include "js/GCHashTable.h"
 #include "js/RootingAPI.h"
 #include "js/Utility.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 namespace js {
 

js/src/ctypes/CTypes.h

@@ -17,7 +17,7 @@
 #include "js/GCHashTable.h"
 #include "js/UniquePtr.h"
 #include "js/Vector.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 namespace js {
 namespace ctypes {

js/src/frontend/BytecodeCompiler.h

@@ -12,7 +12,7 @@
 #include "NamespaceImports.h"
 
 #include "vm/Scope.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 #include "vm/TraceLogging.h"
 
 class JSLinearString;

js/src/frontend/NameFunctions.cpp

@@ -12,8 +12,8 @@
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/ParseNode.h"
 #include "frontend/SharedContext.h"
+#include "util/StringBuffer.h"
 #include "vm/JSFunction.h"
-#include "vm/StringBuffer.h"
 
 using namespace js;
 using namespace js::frontend;

js/src/frontend/TokenStream.cpp

@@ -26,12 +26,12 @@
 #include "frontend/ReservedWords.h"
 #include "js/CharacterEncoding.h"
 #include "js/UniquePtr.h"
+#include "util/StringBuffer.h"
+#include "util/Unicode.h"
 #include "vm/HelperThreads.h"
 #include "vm/JSAtom.h"
 #include "vm/JSCompartment.h"
 #include "vm/JSContext.h"
-#include "vm/StringBuffer.h"
-#include "vm/Unicode.h"
 
 using mozilla::ArrayLength;
 using mozilla::MakeScopeExit;

js/src/frontend/TokenStream.h

@@ -178,11 +178,11 @@
 #include "frontend/TokenKind.h"
 #include "js/UniquePtr.h"
 #include "js/Vector.h"
+#include "util/Unicode.h"
 #include "vm/ErrorReporting.h"
 #include "vm/JSContext.h"
 #include "vm/RegExpShared.h"
-#include "vm/String.h"
-#include "vm/Unicode.h"
+#include "vm/StringType.h"
 
 struct KeywordInfo;
 

js/src/gc/Allocator.cpp

@@ -13,7 +13,7 @@
 #include "threading/CpuCount.h"
 #include "vm/JSContext.h"
 #include "vm/Runtime.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 #include "gc/ArenaList-inl.h"
 #include "gc/Heap-inl.h"

js/src/gc/AtomMarking.h

@@ -10,7 +10,7 @@
 #include "NamespaceImports.h"
 #include "ds/Bitmap.h"
 #include "threading/ProtectedData.h"
-#include "vm/Symbol.h"
+#include "vm/SymbolType.h"
 
 namespace js {
 namespace gc {

js/src/gc/Barrier.cpp

@@ -15,7 +15,7 @@
 #include "vm/JSCompartment.h"
 #include "vm/JSObject.h"
 #include "vm/SharedArrayObject.h"
-#include "vm/Symbol.h"
+#include "vm/SymbolType.h"
 #include "wasm/WasmJS.h"
 
 namespace js {

js/src/gc/GC.cpp

@@ -233,8 +233,8 @@
 #include "vm/Printer.h"
 #include "vm/ProxyObject.h"
 #include "vm/Shape.h"
-#include "vm/String.h"
-#include "vm/Symbol.h"
+#include "vm/StringType.h"
+#include "vm/SymbolType.h"
 #include "vm/Time.h"
 #include "vm/TraceLogging.h"
 #include "vm/WrapperObject.h"
@@ -247,7 +247,7 @@
 #include "vm/JSObject-inl.h"
 #include "vm/JSScript-inl.h"
 #include "vm/Stack-inl.h"
-#include "vm/String-inl.h"
+#include "vm/StringType-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/gc/Marking.cpp

@@ -27,7 +27,7 @@
 #include "vm/RegExpShared.h"
 #include "vm/Scope.h"
 #include "vm/Shape.h"
-#include "vm/Symbol.h"
+#include "vm/SymbolType.h"
 #include "vm/TypedArrayObject.h"
 #include "vm/UnboxedObject.h"
 #include "wasm/WasmJS.h"
@@ -37,7 +37,7 @@
 #include "gc/PrivateIterators-inl.h"
 #include "vm/JSCompartment-inl.h"
 #include "vm/NativeObject-inl.h"
-#include "vm/String-inl.h"
+#include "vm/StringType-inl.h"
 #include "vm/UnboxedObject-inl.h"
 
 using namespace js;

js/src/gc/Tracer.cpp

@@ -18,7 +18,7 @@
 #include "vm/JSFunction.h"
 #include "vm/JSScript.h"
 #include "vm/Shape.h"
-#include "vm/Symbol.h"
+#include "vm/SymbolType.h"
 
 #include "gc/GC-inl.h"
 #include "vm/JSCompartment-inl.h"

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

@@ -3,7 +3,7 @@
 #include "vm/JSContext.h"
 // When JSGC_ANALYSIS is #defined, Rooted<JSFlatString*> needs the definition
 // of JSFlatString in order to figure out its ThingRootKind
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 FRAGMENT(JSString, simple) {
   AutoSuppressHazardsForTest noanalysis;

js/src/irregexp/RegExpParser.cpp

@@ -36,8 +36,8 @@
 #include "frontend/TokenStream.h"
 #include "gc/GC.h"
 #include "irregexp/RegExpCharacters.h"
+#include "util/StringBuffer.h"
 #include "vm/ErrorReporting.h"
-#include "vm/StringBuffer.h"
 
 using namespace js;
 using namespace js::irregexp;

js/src/jit/CodeGenerator.cpp

@@ -21,11 +21,11 @@
 #include "jslibmath.h"
 #include "jsmath.h"
 #include "jsnum.h"
-#include "jsstr.h"
 
 #include "builtin/Eval.h"
 #include "builtin/RegExp.h"
 #include "builtin/SelfHostingDefines.h"
+#include "builtin/String.h"
 #include "builtin/TypedObject.h"
 #include "gc/Nursery.h"
 #include "irregexp/NativeRegExpMacroAssembler.h"
@@ -43,6 +43,7 @@
 #include "jit/RangeAnalysis.h"
 #include "jit/SharedICHelpers.h"
 #include "jit/StackSlotAllocator.h"
+#include "util/Unicode.h"
 #include "vm/AsyncFunction.h"
 #include "vm/AsyncIteration.h"
 #include "vm/MatchPairs.h"
@@ -50,7 +51,6 @@
 #include "vm/RegExpStatics.h"
 #include "vm/TraceLogging.h"
 #include "vm/TypedArrayObject.h"
-#include "vm/Unicode.h"
 #include "vtune/VTuneWrapper.h"
 
 #include "jsboolinlines.h"

js/src/jit/IonTypes.h

@@ -15,7 +15,7 @@
 #include "jstypes.h"
 
 #include "js/Value.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 namespace js {
 namespace jit {

js/src/jit/MCallOptimize.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/Casting.h"
 
 #include "jsmath.h"
-#include "jsstr.h"
 
 #include "builtin/AtomicsObject.h"
 #include "builtin/intl/Collator.h"
@@ -17,6 +16,7 @@
 #include "builtin/intl/RelativeTimeFormat.h"
 #include "builtin/MapObject.h"
 #include "builtin/SIMD.h"
+#include "builtin/String.h"
 #include "builtin/TestingFunctions.h"
 #include "builtin/TypedObject.h"
 #include "jit/BaselineInspector.h"

js/src/jit/MIR.cpp

@@ -15,9 +15,9 @@
 #include <ctype.h>
 
 #include "jslibmath.h"
-#include "jsstr.h"
 
 #include "builtin/RegExp.h"
+#include "builtin/String.h"
 #include "jit/AtomicOperations.h"
 #include "jit/BaselineInspector.h"
 #include "jit/IonBuilder.h"

js/src/jit/Recover.cpp

@@ -8,10 +8,10 @@
 
 #include "jsapi.h"
 #include "jsmath.h"
-#include "jsstr.h"
 
 #include "builtin/RegExp.h"
 #include "builtin/SIMD.h"
+#include "builtin/String.h"
 #include "builtin/TypedObject.h"
 #include "gc/Heap.h"
 #include "jit/JitSpewer.h"
@@ -23,7 +23,7 @@
 #include "vm/Iteration.h"
 #include "vm/JSContext.h"
 #include "vm/JSObject.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 #include "vm/Interpreter-inl.h"
 #include "vm/NativeObject-inl.h"

js/src/jit/shared/Lowering-shared.cpp

@@ -9,7 +9,7 @@
 #include "jit/LIR.h"
 #include "jit/MIR.h"
 
-#include "vm/Symbol.h"
+#include "vm/SymbolType.h"
 
 using namespace js;
 using namespace jit;

js/src/jsapi-tests/testErrorInterceptor.cpp

@@ -2,7 +2,7 @@
 
 #include "jsapi-tests/tests.h"
 
-#include "vm/StringBuffer.h"
+#include "util/StringBuffer.h"
 
 // Tests for JS_GetErrorInterceptorCallback and JS_SetErrorInterceptorCallback.
 

js/src/jsapi-tests/testIndexToString.cpp

@@ -6,13 +6,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jsnum.h"
-#include "jsstr.h"
 
+#include "builtin/String.h"
 #include "jsapi-tests/tests.h"
 #include "vm/JSCompartment.h"
 #include "vm/JSContext.h"
 
-#include "vm/String-inl.h"
+#include "vm/StringType-inl.h"
 
 using mozilla::ArrayLength;
 

js/src/jsapi-tests/testIntern.cpp

@@ -6,7 +6,7 @@
 #include "gc/Marking.h"
 #include "jsapi-tests/tests.h"
 #include "vm/JSAtom.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 using mozilla::ArrayLength;
 

js/src/jsapi-tests/testParseJSON.cpp

@@ -8,7 +8,7 @@
 #include <limits>
 #include <string.h>
 
-#include "jsstr.h"
+#include "builtin/String.h"
 
 #include "js/Printf.h"
 #include "jsapi-tests/tests.h"

js/src/jsapi-tests/testSavedStacks.cpp

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jsfriendapi.h"
-#include "jsstr.h"
+#include "builtin/String.h"
 
 #include "builtin/TestingFunctions.h"
 #include "jsapi-tests/tests.h"

js/src/jsapi-tests/testStringBuffer.cpp

@@ -6,8 +6,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jsapi-tests/tests.h"
+#include "util/StringBuffer.h"
 #include "vm/JSAtom.h"
-#include "vm/StringBuffer.h"
 
 BEGIN_TEST(testStringBuffer_finishString)
 {

js/src/jsapi-tests/testUTF8.cpp

@@ -8,7 +8,7 @@
 #include "mozilla/Range.h"
 
 #include "jsapi.h"
-#include "jsstr.h"
+#include "builtin/String.h"
 
 #include "js/CharacterEncoding.h"
 #include "jsapi-tests/tests.h"

js/src/jsapi-tests/testXDR.cpp

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jsfriendapi.h"
-#include "jsstr.h"
+#include "builtin/String.h"
 
 #include "jsapi-tests/tests.h"
 #include "vm/JSScript.h"

js/src/jsapi.cpp

@@ -30,7 +30,6 @@
 #include "jsfriendapi.h"
 #include "jsmath.h"
 #include "jsnum.h"
-#include "jsstr.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
@@ -41,7 +40,8 @@
 #include "builtin/Promise.h"
 #include "builtin/RegExp.h"
 #include "builtin/Stream.h"
-#include "builtin/SymbolObject.h"
+#include "builtin/String.h"
+#include "builtin/Symbol.h"
 #ifdef ENABLE_SIMD
 # include "builtin/SIMD.h"
 #endif
@@ -66,6 +66,7 @@
 #include "js/StructuredClone.h"
 #include "js/Utility.h"
 #include "js/Wrapper.h"
+#include "util/StringBuffer.h"
 #include "vm/AsyncFunction.h"
 #include "vm/AsyncIteration.h"
 #include "vm/DateObject.h"
@@ -85,9 +86,8 @@
 #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/StringType.h"
+#include "vm/SymbolType.h"
 #include "vm/WrapperObject.h"
 #include "vm/Xdr.h"
 #include "wasm/AsmJS.h"
@@ -99,7 +99,7 @@
 #include "vm/JSScript-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/SavedStacks-inl.h"
-#include "vm/String-inl.h"
+#include "vm/StringType-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/jsarray.cpp

@@ -24,6 +24,7 @@
 #include "jit/InlinableNatives.h"
 #include "js/Class.h"
 #include "js/Conversions.h"
+#include "util/StringBuffer.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/Interpreter.h"
 #include "vm/Iteration.h"
@@ -33,7 +34,6 @@
 #include "vm/JSObject.h"
 #include "vm/SelfHosting.h"
 #include "vm/Shape.h"
-#include "vm/StringBuffer.h"
 #include "vm/TypedArrayObject.h"
 #include "vm/WrapperObject.h"
 

js/src/jsbool.cpp

@@ -14,12 +14,12 @@
 #include "jstypes.h"
 
 #include "jit/InlinableNatives.h"
+#include "util/StringBuffer.h"
 #include "vm/GlobalObject.h"
 #include "vm/JSAtom.h"
 #include "vm/JSContext.h"
 #include "vm/JSObject.h"
 #include "vm/ProxyObject.h"
-#include "vm/StringBuffer.h"
 
 #include "vm/BooleanObject-inl.h"
 

js/src/jsdate.cpp

@@ -28,20 +28,20 @@
 
 #include "jsapi.h"
 #include "jsnum.h"
-#include "jsstr.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
+#include "builtin/String.h"
 #include "js/Conversions.h"
 #include "js/Date.h"
 #include "js/Wrapper.h"
+#include "util/StringBuffer.h"
 #include "vm/DateTime.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
 #include "vm/JSContext.h"
 #include "vm/JSObject.h"
-#include "vm/String.h"
-#include "vm/StringBuffer.h"
+#include "vm/StringType.h"
 #include "vm/Time.h"
 
 #include "vm/JSObject-inl.h"

js/src/jsexn.cpp

@@ -23,6 +23,7 @@
 #include "gc/Marking.h"
 #include "js/CharacterEncoding.h"
 #include "js/Wrapper.h"
+#include "util/StringBuffer.h"
 #include "vm/ErrorObject.h"
 #include "vm/GlobalObject.h"
 #include "vm/JSContext.h"
@@ -31,7 +32,6 @@
 #include "vm/JSScript.h"
 #include "vm/SavedStacks.h"
 #include "vm/SelfHosting.h"
-#include "vm/StringBuffer.h"
 
 #include "vm/ErrorObject-inl.h"
 #include "vm/JSObject-inl.h"

js/src/jsnum.cpp

@@ -20,21 +20,21 @@
 #include <math.h>
 #include <string.h>
 
-#include "jsstr.h"
 #include "jstypes.h"
 
+#include "builtin/String.h"
 #include "double-conversion/double-conversion.h"
 #include "js/Conversions.h"
 #include "util/DoubleToString.h"
+#include "util/StringBuffer.h"
 #include "vm/GlobalObject.h"
 #include "vm/JSAtom.h"
 #include "vm/JSContext.h"
 #include "vm/JSObject.h"
-#include "vm/StringBuffer.h"
 
 #include "vm/NativeObject-inl.h"
 #include "vm/NumberObject-inl.h"
-#include "vm/String-inl.h"
+#include "vm/StringType-inl.h"
 
 using namespace js;
 

js/src/jsnum.h

@@ -14,7 +14,7 @@
 
 #include "js/Conversions.h"
 
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 
 // This macro is should be `one' if current compiler supports builtin functions

js/src/moz.build

@@ -32,7 +32,7 @@ for gcfile in ['devtools/rootAnalysis', 'devtools/gc-ubench', 'devtools/gctrace'
     with Files(gcfile):
         BUG_COMPONENT = component_gc
 
-for stlfile in ['jsarray.*', 'jsbool*', 'jsdate.*', 'jsnum.*', 'jsstr.*']:
+for stlfile in ['jsarray.*', 'jsbool*', 'jsdate.*', 'jsnum.*']:
     with Files(stlfile):
         BUG_COMPONENT = component_stl
 
@@ -168,7 +168,8 @@ UNIFIED_SOURCES += [
     'builtin/ReflectParse.cpp',
     'builtin/SIMD.cpp',
     'builtin/Stream.cpp',
-    'builtin/SymbolObject.cpp',
+    'builtin/String.cpp',
+    'builtin/Symbol.cpp',
     'builtin/TestingFunctions.cpp',
     'builtin/TypedObject.cpp',
     'builtin/WeakMapObject.cpp',
@@ -291,7 +292,6 @@ UNIFIED_SOURCES += [
     'jsexn.cpp',
     'jsfriendapi.cpp',
     'jsnum.cpp',
-    'jsstr.cpp',
     'perf/jsperf.cpp',
     'proxy/BaseProxyHandler.cpp',
     'proxy/CrossCompartmentWrapper.cpp',
@@ -306,6 +306,8 @@ UNIFIED_SOURCES += [
     'util/AllocPolicy.cpp',
     'util/NativeStack.cpp',
     'util/Printf.cpp',
+    'util/StringBuffer.cpp',
+    'util/Unicode.cpp',
     'vm/ArgumentsObject.cpp',
     'vm/ArrayBufferObject.cpp',
     'vm/AsyncFunction.cpp',
@@ -357,10 +359,9 @@ UNIFIED_SOURCES += [
     'vm/SharedImmutableStringsCache.cpp',
     'vm/Stack.cpp',
     'vm/Stopwatch.cpp',
-    'vm/String.cpp',
-    'vm/StringBuffer.cpp',
+    'vm/StringType.cpp',
     'vm/StructuredClone.cpp',
-    'vm/Symbol.cpp',
+    'vm/SymbolType.cpp',
     'vm/TaggedProto.cpp',
     'vm/Time.cpp',
     'vm/TypedArrayObject.cpp',
@@ -369,7 +370,6 @@ UNIFIED_SOURCES += [
     'vm/UbiNodeCensus.cpp',
     'vm/UbiNodeShortestPaths.cpp',
     'vm/UnboxedObject.cpp',
-    'vm/Unicode.cpp',
     'vm/Value.cpp',
     'vm/Xdr.cpp',
     'wasm/AsmJS.cpp',

js/src/proxy/SecurityWrapper.cpp

@@ -9,7 +9,7 @@
 #include "NamespaceImports.h"
 
 #include "js/Wrapper.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 using namespace js;
 

js/src/shell/OSObject.cpp

@@ -22,15 +22,15 @@
 #include "jsapi.h"
 // For JSFunctionSpecWithHelp
 #include "jsfriendapi.h"
-#include "jsstr.h"
 
+#include "builtin/String.h"
 #include "gc/FreeOp.h"
 #include "js/Conversions.h"
 #include "js/Wrapper.h"
 #include "shell/jsshell.h"
+#include "util/StringBuffer.h"
 #include "util/Windows.h"
 #include "vm/JSObject.h"
-#include "vm/StringBuffer.h"
 #include "vm/TypedArrayObject.h"
 
 #include "vm/JSObject-inl.h"

js/src/shell/js.cpp

@@ -90,6 +90,7 @@
 #include "threading/ExclusiveData.h"
 #include "threading/LockGuard.h"
 #include "threading/Thread.h"
+#include "util/StringBuffer.h"
 #include "util/Windows.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/Compression.h"
@@ -105,7 +106,6 @@
 #include "vm/Printer.h"
 #include "vm/Shape.h"
 #include "vm/SharedArrayObject.h"
-#include "vm/StringBuffer.h"
 #include "vm/Time.h"
 #include "vm/TypedArrayObject.h"
 #include "vm/WrapperObject.h"

js/src/shell/jsshell.cpp

@@ -13,7 +13,7 @@
 #include "jsapi.h"
 #include "jsfriendapi.h"
 
-#include "vm/StringBuffer.h"
+#include "util/StringBuffer.h"
 
 using namespace JS;
 

js/src/util/StringBuffer.cpp

@@ -4,12 +4,12 @@
  * 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/StringBuffer.h"
+#include "util/StringBuffer.h"
 
 #include "mozilla/Range.h"
 
 #include "vm/JSObject-inl.h"
-#include "vm/String-inl.h"
+#include "vm/StringType-inl.h"
 
 using namespace js;
 

js/src/util/StringBuffer.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 vm_StringBuffer_h
-#define vm_StringBuffer_h
+#ifndef util_StringBuffer_h
+#define util_StringBuffer_h
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MaybeOneOf.h"
@@ -346,4 +346,4 @@ BooleanToStringBuffer(bool b, StringBuffer& sb)
 
 }  /* namespace js */
 
-#endif /* vm_StringBuffer_h */
+#endif /* util_StringBuffer_h */

js/src/util/Unicode.cpp

@@ -5,7 +5,7 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
-#include "vm/Unicode.h"
+#include "util/Unicode.h"
 
 using namespace js;
 using namespace js::unicode;

js/src/util/Unicode.h

@@ -4,11 +4,12 @@
  * 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 vm_Unicode_h
-#define vm_Unicode_h
+#ifndef util_Unicode_h
+#define util_Unicode_h
 
 #include "jspubtd.h"
-#include "vm/UnicodeNonBMP.h"
+
+#include "util/UnicodeNonBMP.h"
 
 namespace js {
 namespace unicode {
@@ -601,4 +602,4 @@ UTF16Decode(char16_t lead, char16_t trail)
 } /* namespace unicode */
 } /* namespace js */
 
-#endif /* vm_Unicode_h */
+#endif /* util_Unicode_h */

js/src/util/UnicodeNonBMP.h

@@ -7,8 +7,8 @@
 /* Generated by make_unicode.py DO NOT MODIFY */
 /* Unicode version: 10.0.0 */
 
-#ifndef vm_UnicodeNonBMP_h
-#define vm_UnicodeNonBMP_h
+#ifndef util_UnicodeNonBMP_h
+#define util_UnicodeNonBMP_h
 
 // |macro| receives the following arguments
 //   macro(FROM, TO, LEAD, TRAIL_FROM, TRAIL_TO, DIFF)
@@ -68,4 +68,4 @@
     macro(0x118c0, 0x118df, 0xd806, 0xdcc0, 0xdcdf, -32) \
     macro(0x1e922, 0x1e943, 0xd83a, 0xdd22, 0xdd43, -34)
 
-#endif /* vm_UnicodeNonBMP_h */
+#endif /* util_UnicodeNonBMP_h */

js/src/vm/ArrayObject-inl.h

@@ -10,7 +10,7 @@
 #include "vm/ArrayObject.h"
 
 #include "gc/GCTrace.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 #include "vm/JSObject-inl.h"
 #include "vm/TypeInference-inl.h"

js/src/vm/BytecodeUtil.cpp

@@ -25,16 +25,17 @@
 
 #include "jsapi.h"
 #include "jsnum.h"
-#include "jsstr.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
+#include "builtin/String.h"
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/SourceNotes.h"
 #include "gc/FreeOp.h"
 #include "gc/GCInternals.h"
 #include "js/CharacterEncoding.h"
 #include "js/Printf.h"
+#include "util/StringBuffer.h"
 #include "vm/CodeCoverage.h"
 #include "vm/EnvironmentObject.h"
 #include "vm/JSAtom.h"
@@ -45,7 +46,6 @@
 #include "vm/JSScript.h"
 #include "vm/Opcodes.h"
 #include "vm/Shape.h"
-#include "vm/StringBuffer.h"
 
 #include "gc/PrivateIterators-inl.h"
 #include "vm/JSCompartment-inl.h"

js/src/vm/ErrorObject.cpp

@@ -14,7 +14,7 @@
 #include "js/CallArgs.h"
 #include "js/CharacterEncoding.h"
 #include "vm/GlobalObject.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 #include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"

js/src/vm/GeckoProfiler.cpp

@@ -16,8 +16,8 @@
 #include "jit/JitcodeMap.h"
 #include "jit/JitFrames.h"
 #include "jit/JSJitFrameIter.h"
+#include "util/StringBuffer.h"
 #include "vm/JSScript.h"
-#include "vm/StringBuffer.h"
 
 #include "gc/Marking-inl.h"
 

js/src/vm/GlobalObject.cpp

@@ -22,7 +22,7 @@
 #include "builtin/RegExp.h"
 #include "builtin/SelfHostingDefines.h"
 #include "builtin/Stream.h"
-#include "builtin/SymbolObject.h"
+#include "builtin/Symbol.h"
 #include "builtin/TypedObject.h"
 #include "builtin/WeakMapObject.h"
 #include "builtin/WeakSetObject.h"

js/src/vm/Interpreter-inl.h

@@ -10,8 +10,8 @@
 #include "vm/Interpreter.h"
 
 #include "jsnum.h"
-#include "jsstr.h"
 
+#include "builtin/String.h"
 #include "jit/Ion.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/JSCompartment.h"
@@ -20,7 +20,7 @@
 #include "vm/JSAtom-inl.h"
 #include "vm/JSObject-inl.h"
 #include "vm/Stack-inl.h"
-#include "vm/String-inl.h"
+#include "vm/StringType-inl.h"
 #include "vm/UnboxedObject-inl.h"
 
 namespace js {

js/src/vm/Interpreter.cpp

@@ -20,14 +20,15 @@
 #include "jsarray.h"
 #include "jslibmath.h"
 #include "jsnum.h"
-#include "jsstr.h"
 
 #include "builtin/Eval.h"
+#include "builtin/String.h"
 #include "jit/AtomicOperations.h"
 #include "jit/BaselineJIT.h"
 #include "jit/Ion.h"
 #include "jit/IonAnalysis.h"
 #include "jit/Jit.h"
+#include "util/StringBuffer.h"
 #include "vm/AsyncFunction.h"
 #include "vm/AsyncIteration.h"
 #include "vm/BytecodeUtil.h"
@@ -43,7 +44,6 @@
 #include "vm/Scope.h"
 #include "vm/Shape.h"
 #include "vm/Stopwatch.h"
-#include "vm/StringBuffer.h"
 #include "vm/TraceLogging.h"
 
 #include "jsboolinlines.h"

js/src/vm/Iteration.cpp

@@ -37,7 +37,7 @@
 #include "vm/NativeObject-inl.h"
 #include "vm/ReceiverGuard-inl.h"
 #include "vm/Stack-inl.h"
-#include "vm/String-inl.h"
+#include "vm/StringType-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/vm/JSAtom-inl.h

@@ -14,7 +14,7 @@
 #include "jsnum.h"
 
 #include "vm/Runtime.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 namespace js {
 

js/src/vm/JSAtom.cpp

@@ -17,19 +17,19 @@
 
 #include <string.h>
 
-#include "jsstr.h"
 #include "jstypes.h"
 
+#include "builtin/String.h"
 #include "gc/Marking.h"
 #include "vm/JSContext.h"
-#include "vm/Symbol.h"
+#include "vm/SymbolType.h"
 #include "vm/Xdr.h"
 
 #include "gc/AtomMarking-inl.h"
 #include "vm/JSCompartment-inl.h"
 #include "vm/JSContext-inl.h"
 #include "vm/JSObject-inl.h"
-#include "vm/String-inl.h"
+#include "vm/StringType-inl.h"
 
 using namespace js;
 using namespace js::gc;

js/src/vm/JSContext-inl.h

@@ -16,7 +16,7 @@
 #include "vm/Interpreter.h"
 #include "vm/Iteration.h"
 #include "vm/JSCompartment.h"
-#include "vm/Symbol.h"
+#include "vm/SymbolType.h"
 
 namespace js {
 

js/src/vm/JSContext.cpp

@@ -30,9 +30,9 @@
 
 #include "jsexn.h"
 #include "jspubtd.h"
-#include "jsstr.h"
 #include "jstypes.h"
 
+#include "builtin/String.h"
 #include "gc/FreeOp.h"
 #include "gc/Marking.h"
 #include "jit/Ion.h"

js/src/vm/JSFunction.cpp

@@ -19,12 +19,12 @@
 
 #include "jsapi.h"
 #include "jsarray.h"
-#include "jsstr.h"
 #include "jstypes.h"
 
 #include "builtin/Eval.h"
 #include "builtin/Object.h"
 #include "builtin/SelfHostingDefines.h"
+#include "builtin/String.h"
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/TokenStream.h"
 #include "gc/Marking.h"
@@ -34,6 +34,7 @@
 #include "js/CallNonGenericMethod.h"
 #include "js/Proxy.h"
 #include "js/Wrapper.h"
+#include "util/StringBuffer.h"
 #include "vm/AsyncFunction.h"
 #include "vm/AsyncIteration.h"
 #include "vm/Debugger.h"
@@ -46,7 +47,6 @@
 #include "vm/SelfHosting.h"
 #include "vm/Shape.h"
 #include "vm/SharedImmutableStringsCache.h"
-#include "vm/StringBuffer.h"
 #include "vm/WrapperObject.h"
 #include "vm/Xdr.h"
 #include "wasm/AsmJS.h"

js/src/vm/JSONParser.cpp

@@ -15,8 +15,8 @@
 #include "jsarray.h"
 #include "jsnum.h"
 
+#include "util/StringBuffer.h"
 #include "vm/JSCompartment.h"
-#include "vm/StringBuffer.h"
 
 #include "vm/NativeObject-inl.h"
 

js/src/vm/JSONParser.h

@@ -13,7 +13,7 @@
 #include "jspubtd.h"
 
 #include "ds/IdValuePair.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 namespace js {
 

js/src/vm/JSObject.cpp

@@ -22,13 +22,13 @@
 #include "jsexn.h"
 #include "jsfriendapi.h"
 #include "jsnum.h"
-#include "jsstr.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
 #include "builtin/Eval.h"
 #include "builtin/Object.h"
-#include "builtin/SymbolObject.h"
+#include "builtin/String.h"
+#include "builtin/Symbol.h"
 #include "frontend/BytecodeCompiler.h"
 #include "gc/Policy.h"
 #include "jit/BaselineJIT.h"

js/src/vm/JSObject.h

@@ -15,7 +15,7 @@
 #include "js/HeapAPI.h"
 #include "vm/Printer.h"
 #include "vm/Shape.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 #include "vm/Xdr.h"
 
 namespace JS {

js/src/vm/JSScript.cpp

@@ -36,6 +36,7 @@
 #include "js/Printf.h"
 #include "js/Utility.h"
 #include "js/Wrapper.h"
+#include "util/StringBuffer.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/BytecodeUtil.h"
 #include "vm/Compression.h"
@@ -48,7 +49,6 @@
 #include "vm/SelfHosting.h"
 #include "vm/Shape.h"
 #include "vm/SharedImmutableStringsCache.h"
-#include "vm/StringBuffer.h"
 #include "vm/Xdr.h"
 #include "vtune/VTuneWrapper.h"
 

js/src/vm/MemoryMetrics.cpp

@@ -18,8 +18,8 @@
 #include "vm/JSScript.h"
 #include "vm/Runtime.h"
 #include "vm/Shape.h"
-#include "vm/String.h"
-#include "vm/Symbol.h"
+#include "vm/StringType.h"
+#include "vm/SymbolType.h"
 #include "vm/WrapperObject.h"
 #include "wasm/WasmInstance.h"
 #include "wasm/WasmJS.h"

js/src/vm/NativeObject.h

@@ -22,7 +22,7 @@
 #include "vm/JSObject.h"
 #include "vm/Shape.h"
 #include "vm/ShapedObject.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 #include "vm/TypeInference.h"
 
 namespace js {

js/src/vm/RegExpObject.cpp

@@ -9,7 +9,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PodOperations.h"
 
-#include "jsstr.h"
+#include "builtin/String.h"
 #ifdef DEBUG
 #include "jsutil.h"
 #endif
@@ -21,12 +21,12 @@
 #include "irregexp/RegExpBytecode.h"
 #endif
 #include "irregexp/RegExpParser.h"
+#include "util/StringBuffer.h"
 #include "vm/MatchPairs.h"
 #include "vm/RegExpStatics.h"
-#include "vm/StringBuffer.h"
 #include "vm/TraceLogging.h"
 #ifdef DEBUG
-#include "vm/Unicode.h"
+#include "util/Unicode.h"
 #endif
 #include "vm/Xdr.h"
 

js/src/vm/Runtime.h

@@ -49,7 +49,7 @@
 #include "vm/SharedImmutableStringsCache.h"
 #include "vm/Stack.h"
 #include "vm/Stopwatch.h"
-#include "vm/Symbol.h"
+#include "vm/SymbolType.h"
 #include "wasm/WasmSignalHandlers.h"
 
 #ifdef _MSC_VER

js/src/vm/SavedStacks.cpp

@@ -26,12 +26,12 @@
 #include "gc/Rooting.h"
 #include "js/CharacterEncoding.h"
 #include "js/Vector.h"
+#include "util/StringBuffer.h"
 #include "vm/Debugger.h"
 #include "vm/GeckoProfiler.h"
 #include "vm/JSCompartment.h"
 #include "vm/JSScript.h"
 #include "vm/SavedFrame.h"
-#include "vm/StringBuffer.h"
 #include "vm/Time.h"
 #include "vm/WrapperObject.h"
 

js/src/vm/Scope.cpp

@@ -9,9 +9,9 @@
 #include "builtin/ModuleObject.h"
 #include "gc/Allocator.h"
 #include "gc/FreeOp.h"
+#include "util/StringBuffer.h"
 #include "vm/EnvironmentObject.h"
 #include "vm/JSScript.h"
-#include "vm/StringBuffer.h"
 #include "wasm/WasmInstance.h"
 
 #include "gc/ObjectKind-inl.h"

js/src/vm/SelfHosting.cpp

@@ -14,7 +14,6 @@
 #include "jsarray.h"
 #include "jsdate.h"
 #include "jsfriendapi.h"
-#include "jsstr.h"
 #include "selfhosted.out.h"
 
 #include "builtin/intl/Collator.h"
@@ -32,6 +31,7 @@
 #include "builtin/SelfHostingDefines.h"
 #include "builtin/SIMD.h"
 #include "builtin/Stream.h"
+#include "builtin/String.h"
 #include "builtin/TypedObject.h"
 #include "builtin/WeakMapObject.h"
 #include "gc/HashUtil.h"
@@ -42,6 +42,7 @@
 #include "js/CharacterEncoding.h"
 #include "js/Date.h"
 #include "js/Wrapper.h"
+#include "util/StringBuffer.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/Compression.h"
 #include "vm/GeneratorObject.h"
@@ -52,8 +53,7 @@
 #include "vm/JSFunction.h"
 #include "vm/Printer.h"
 #include "vm/RegExpObject.h"
-#include "vm/String.h"
-#include "vm/StringBuffer.h"
+#include "vm/StringType.h"
 #include "vm/TypedArrayObject.h"
 #include "vm/WrapperObject.h"
 

js/src/vm/Shape.h

@@ -30,8 +30,8 @@
 #include "vm/JSAtom.h"
 #include "vm/ObjectGroup.h"
 #include "vm/Printer.h"
-#include "vm/String.h"
-#include "vm/Symbol.h"
+#include "vm/StringType.h"
+#include "vm/SymbolType.h"
 
 #ifdef _MSC_VER
 #pragma warning(push)

js/src/vm/SharedImmutableStringsCache.cpp

@@ -6,7 +6,7 @@
 
 #include "vm/SharedImmutableStringsCache-inl.h"
 
-#include "jsstr.h"
+#include "builtin/String.h"
 
 namespace js {
 

js/src/vm/SharedImmutableStringsCache.h

@@ -13,7 +13,7 @@
 #include <cstring>
 #include <new> // for placement new
 
-#include "jsstr.h"
+#include "builtin/String.h"
 
 #include "js/HashTable.h"
 #include "js/Utility.h"

js/src/vm/StringObject.h

@@ -7,7 +7,7 @@
 #ifndef vm_StringObject_h
 #define vm_StringObject_h
 
-#include "jsstr.h"
+#include "builtin/String.h"
 
 #include "vm/JSObject.h"
 #include "vm/Shape.h"

js/src/vm/StringType-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 vm_String_inl_h
-#define vm_String_inl_h
+#ifndef vm_StringType_inl_h
+#define vm_StringType_inl_h
 
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 #include "mozilla/PodOperations.h"
 #include "mozilla/Range.h"
@@ -428,4 +428,4 @@ JSExternalString::finalize(js::FreeOp* fop)
     fin->finalize(fin, const_cast<char16_t*>(rawTwoByteChars()));
 }
 
-#endif /* vm_String_inl_h */
+#endif /* vm_StringType_inl_h */

js/src/vm/StringType.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 "vm/String-inl.h"
+#include "vm/StringType-inl.h"
 
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MemoryReporting.h"

js/src/vm/StringType.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 vm_String_h
-#define vm_String_h
+#ifndef vm_StringType_h
+#define vm_StringType_h
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PodOperations.h"
@@ -13,8 +13,8 @@
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
-#include "jsstr.h"
 
+#include "builtin/String.h"
 #include "gc/Barrier.h"
 #include "gc/Cell.h"
 #include "gc/Heap.h"
@@ -1711,4 +1711,4 @@ TenuredCell::as<JSString>() {
 }
 }
 
-#endif /* vm_String_h */
+#endif /* vm_StringType_h */

js/src/vm/SymbolType.cpp

@@ -4,14 +4,14 @@
  * 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/Symbol.h"
+#include "vm/SymbolType.h"
 
-#include "builtin/SymbolObject.h"
+#include "builtin/Symbol.h"
 #include "gc/Allocator.h"
 #include "gc/Rooting.h"
+#include "util/StringBuffer.h"
 #include "vm/JSCompartment.h"
 #include "vm/JSContext.h"
-#include "vm/StringBuffer.h"
 
 #include "vm/JSCompartment-inl.h"
 

js/src/vm/SymbolType.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 vm_Symbol_h
-#define vm_Symbol_h
+#ifndef vm_SymbolType_h
+#define vm_SymbolType_h
 
 #include "mozilla/Attributes.h"
 
@@ -21,7 +21,7 @@
 #include "js/TypeDecls.h"
 #include "js/Utility.h"
 #include "vm/Printer.h"
-#include "vm/String.h"
+#include "vm/StringType.h"
 
 namespace js {
 class AutoLockForExclusiveAccess;
@@ -147,4 +147,4 @@ SymbolDescriptiveString(JSContext* cx, JS::Symbol* sym, JS::MutableHandleValue r
 
 } /* namespace js */
 
-#endif /* vm_Symbol_h */
+#endif /* vm_SymbolType_h */

js/src/vm/TraceLoggingGraph.cpp

@@ -17,7 +17,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/ScopeExit.h"
 
-#include "jsstr.h"
+#include "builtin/String.h"
 
 #include "js/UniquePtr.h"
 #include "threading/LockGuard.h"

js/src/vm/TraceLoggingTypes.h

@@ -7,7 +7,7 @@
 #ifndef TraceLoggingTypes_h
 #define TraceLoggingTypes_h
 
-#include "jsstr.h"
+#include "builtin/String.h"
 
 #include "js/AllocPolicy.h"
 

js/src/vm/TypeInference-inl.h

@@ -15,7 +15,7 @@
 #include "mozilla/Casting.h"
 #include "mozilla/PodOperations.h"
 
-#include "builtin/SymbolObject.h"
+#include "builtin/Symbol.h"
 #include "gc/GC.h"
 #include "jit/BaselineJIT.h"
 #include "vm/ArrayObject.h"

js/src/vm/TypeInference.cpp

@@ -13,7 +13,7 @@
 #include "mozilla/Sprintf.h"
 
 #include "jsapi.h"
-#include "jsstr.h"
+#include "builtin/String.h"
 
 #include "gc/HashUtil.h"
 #include "jit/BaselineJIT.h"