Bug 1439026 - Part 10: Rename builtin/BlahObject.* -> builtin/Blah.*. r=jandem.
☠☠ backed out by 77728b046b95 ☠ ☠
authorJason Orendorff <jorendorff@mozilla.com>
Tue, 27 Feb 2018 10:38:34 -0600
changeset 461333 27658d23e3cf92111667948303c47df9e76d98b9
parent 461332 e7894f7f0e5b5941de180aedc611c91e5f36b420
child 461334 bc69a330ff479246ee8ee6b5d268bc9796ab4cf1
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem
bugs1439026
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1439026 - Part 10: Rename builtin/BlahObject.* -> builtin/Blah.*. r=jandem.
js/src/builtin/Atomics.cpp
js/src/builtin/Atomics.h
js/src/builtin/AtomicsObject.cpp
js/src/builtin/AtomicsObject.h
js/src/builtin/DataView.cpp
js/src/builtin/DataView.h
js/src/builtin/DataViewObject.cpp
js/src/builtin/DataViewObject.h
js/src/builtin/Map.cpp
js/src/builtin/Map.h
js/src/builtin/MapObject.cpp
js/src/builtin/MapObject.h
js/src/builtin/WeakMap-inl.h
js/src/builtin/WeakMap.cpp
js/src/builtin/WeakMap.h
js/src/builtin/WeakMapObject-inl.h
js/src/builtin/WeakMapObject.cpp
js/src/builtin/WeakMapObject.h
js/src/builtin/WeakSet.cpp
js/src/builtin/WeakSet.h
js/src/builtin/WeakSetObject.cpp
js/src/builtin/WeakSetObject.h
js/src/builtin/intl/Intl.cpp
js/src/builtin/intl/Intl.h
js/src/builtin/intl/Intl.js
js/src/builtin/intl/IntlObject.cpp
js/src/builtin/intl/IntlObject.h
js/src/builtin/intl/IntlObject.js
js/src/gc/RootMarking.cpp
js/src/jit/MCallOptimize.cpp
js/src/jit/mips-shared/AtomicOperations-mips-shared.h
js/src/jsapi.cpp
js/src/moz.build
js/src/vm/ArrayBufferObject.cpp
js/src/vm/DebuggerMemory.cpp
js/src/vm/GlobalObject.cpp
js/src/vm/GlobalObject.h
js/src/vm/Initialization.cpp
js/src/vm/JSObject-inl.h
js/src/vm/ObjectGroup.cpp
js/src/vm/Runtime.h
js/src/vm/SelfHosting.cpp
js/src/vm/StructuredClone.cpp
js/src/vm/TypedArrayObject.cpp
rename from js/src/builtin/AtomicsObject.cpp
rename to js/src/builtin/Atomics.cpp
--- a/js/src/builtin/AtomicsObject.cpp
+++ b/js/src/builtin/Atomics.cpp
@@ -40,17 +40,17 @@
  * gcc/Clang intrinsics with simple code below using the VC++
  * intrinsics, like the VC++2012 solution this is a stopgap since
  * we're about to start using VC++2013 anyway.
  *
  * If none of those options are available then the build must disable
  * shared memory, or compilation will fail with a predictable error.
  */
 
-#include "builtin/AtomicsObject.h"
+#include "builtin/Atomics.h"
 
 #include "mozilla/Atomics.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Unused.h"
 
rename from js/src/builtin/AtomicsObject.h
rename to js/src/builtin/Atomics.h
--- a/js/src/builtin/AtomicsObject.h
+++ b/js/src/builtin/Atomics.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 builtin_AtomicsObject_h
-#define builtin_AtomicsObject_h
+#ifndef builtin_Atomics_h
+#define builtin_Atomics_h
 
 #include "mozilla/Maybe.h"
 #include "mozilla/TimeStamp.h"
 
 #include "threading/ConditionVariable.h"
 #include "vm/JSObject.h"
 #include "vm/MutexIDs.h"
 #include "vm/NativeObject.h"
@@ -157,9 +157,9 @@ atomics_wait_impl(JSContext* cx, SharedA
 // all.  The return value is nonnegative and is the number of waiters woken.  If
 // the number of waiters woken exceeds INT64_MAX then this never returns.  If
 // `count` is nonnegative then the return value is never greater than `count`.
 MOZ_MUST_USE int64_t
 atomics_wake_impl(SharedArrayRawBuffer* sarb, uint32_t byteOffset, int64_t count);
 
 }  /* namespace js */
 
-#endif /* builtin_AtomicsObject_h */
+#endif /* builtin_Atomics_h */
rename from js/src/builtin/DataViewObject.cpp
rename to js/src/builtin/DataView.cpp
--- a/js/src/builtin/DataViewObject.cpp
+++ b/js/src/builtin/DataView.cpp
@@ -1,15 +1,15 @@
 /* -*- 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 "builtin/DataViewObject.h"
+#include "builtin/DataView.h"
 
 #include "mozilla/Alignment.h"
 #include "mozilla/Casting.h"
 #include "mozilla/EndianUtils.h"
 
 #include <string.h>
 
 #include "jsapi.h"
rename from js/src/builtin/DataViewObject.h
rename to js/src/builtin/DataView.h
rename from js/src/builtin/MapObject.cpp
rename to js/src/builtin/Map.cpp
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/Map.cpp
@@ -1,15 +1,15 @@
 /* -*- 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 "builtin/MapObject.h"
+#include "builtin/Map.h"
 
 #include "ds/OrderedHashTable.h"
 #include "gc/FreeOp.h"
 #include "js/Utility.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
 #include "vm/Iteration.h"
 #include "vm/JSContext.h"
rename from js/src/builtin/MapObject.h
rename to js/src/builtin/Map.h
--- a/js/src/builtin/MapObject.h
+++ b/js/src/builtin/Map.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 builtin_MapObject_h
-#define builtin_MapObject_h
+#ifndef builtin_Map_h
+#define builtin_Map_h
 
 #include "builtin/SelfHostingDefines.h"
 #include "vm/GlobalObject.h"
 #include "vm/JSObject.h"
 #include "vm/NativeObject.h"
 #include "vm/PIC.h"
 #include "vm/Runtime.h"
 
@@ -342,9 +342,9 @@ IsOptimizableInitForSet(JSContext* cx, H
     if (!stubChain)
         return false;
 
     return stubChain->tryOptimizeArray(cx, array.as<ArrayObject>(), optimized);
 }
 
 } /* namespace js */
 
-#endif /* builtin_MapObject_h */
+#endif /* builtin_Map_h */
rename from js/src/builtin/WeakMapObject-inl.h
rename to js/src/builtin/WeakMap-inl.h
--- a/js/src/builtin/WeakMapObject-inl.h
+++ b/js/src/builtin/WeakMap-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 builtin_WeakMapObject_inl_h
-#define builtin_WeakMapObject_inl_h
+#ifndef builtin_WeakMap_inl_h
+#define builtin_WeakMap_inl_h
 
-#include "builtin/WeakMapObject.h"
+#include "builtin/WeakMap.h"
 
 #include "vm/ProxyObject.h"
 
 namespace js {
 
 static bool
 TryPreserveReflector(JSContext* cx, HandleObject obj)
 {
@@ -63,9 +63,9 @@ WeakCollectionPutEntryInternal(JSContext
         JS_ReportOutOfMemory(cx);
         return false;
     }
     return true;
 }
 
 } // namespace js
 
-#endif /* builtin_WeakMapObject_inl_h */
+#endif /* builtin_WeakMap_inl_h */
rename from js/src/builtin/WeakMapObject.cpp
rename to js/src/builtin/WeakMap.cpp
--- a/js/src/builtin/WeakMapObject.cpp
+++ b/js/src/builtin/WeakMap.cpp
@@ -1,19 +1,19 @@
 /* -*- 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 "builtin/WeakMapObject-inl.h"
+#include "builtin/WeakMap-inl.h"
 
 #include "jsapi.h"
 
-#include "builtin/WeakSetObject.h"
+#include "builtin/WeakSet.h"
 #include "gc/FreeOp.h"
 #include "vm/JSContext.h"
 #include "vm/SelfHosting.h"
 
 #include "vm/Interpreter-inl.h"
 
 using namespace js;
 using namespace js::gc;
rename from js/src/builtin/WeakMapObject.h
rename to js/src/builtin/WeakMap.h
--- a/js/src/builtin/WeakMapObject.h
+++ b/js/src/builtin/WeakMap.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 builtin_WeakMapObject_h
-#define builtin_WeakMapObject_h
+#ifndef builtin_WeakMap_h
+#define builtin_WeakMap_h
 
 #include "gc/WeakMap.h"
 #include "vm/JSObject.h"
 
 namespace js {
 
 // Abstract base class for WeakMapObject and WeakSetObject.
 class WeakCollectionObject : public NativeObject
@@ -32,9 +32,9 @@ class WeakMapObject : public WeakCollect
     static const Class class_;
 };
 
 extern JSObject*
 InitWeakMapClass(JSContext* cx, HandleObject obj);
 
 } // namespace js
 
-#endif /* builtin_WeakMapObject_h */
+#endif /* builtin_WeakMap_h */
rename from js/src/builtin/WeakSetObject.cpp
rename to js/src/builtin/WeakSet.cpp
--- a/js/src/builtin/WeakSetObject.cpp
+++ b/js/src/builtin/WeakSet.cpp
@@ -1,25 +1,25 @@
 /* -*- 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 "builtin/WeakSetObject.h"
+#include "builtin/WeakSet.h"
 
 #include "jsapi.h"
 
-#include "builtin/MapObject.h"
+#include "builtin/Map.h"
 #include "vm/GlobalObject.h"
 #include "vm/Iteration.h"
 #include "vm/JSContext.h"
 #include "vm/SelfHosting.h"
 
-#include "builtin/WeakMapObject-inl.h"
+#include "builtin/WeakMap-inl.h"
 #include "vm/Interpreter-inl.h"
 #include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;
 
 MOZ_ALWAYS_INLINE bool
 IsWeakSet(HandleValue v)
rename from js/src/builtin/WeakSetObject.h
rename to js/src/builtin/WeakSet.h
--- a/js/src/builtin/WeakSetObject.h
+++ b/js/src/builtin/WeakSet.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 builtin_WeakSetObject_h
-#define builtin_WeakSetObject_h
+#ifndef builtin_WeakSet_h
+#define builtin_WeakSet_h
 
-#include "builtin/WeakMapObject.h"
+#include "builtin/WeakMap.h"
 
 namespace js {
 
 class WeakSetObject : public WeakCollectionObject
 {
   public:
     static JSObject* initClass(JSContext* cx, HandleObject obj);
     static const Class class_;
@@ -34,9 +34,9 @@ InitWeakSetClass(JSContext* cx, HandleOb
 
 template<>
 inline bool
 JSObject::is<js::WeakCollectionObject>() const
 {
     return is<js::WeakMapObject>() || is<js::WeakSetObject>();
 }
 
-#endif /* builtin_WeakSetObject_h */
+#endif /* builtin_WeakSet_h */
rename from js/src/builtin/intl/IntlObject.cpp
rename to js/src/builtin/intl/Intl.cpp
--- a/js/src/builtin/intl/IntlObject.cpp
+++ b/js/src/builtin/intl/Intl.cpp
@@ -1,17 +1,17 @@
 /* -*- 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/. */
 
 /* Implementation of the Intl object and its non-constructor properties. */
 
-#include "builtin/intl/IntlObject.h"
+#include "builtin/intl/Intl.h"
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Likely.h"
 #include "mozilla/Range.h"
 
 #include "jsapi.h"
 
 #include "builtin/intl/Collator.h"
rename from js/src/builtin/intl/IntlObject.h
rename to js/src/builtin/intl/Intl.h
--- a/js/src/builtin/intl/IntlObject.h
+++ b/js/src/builtin/intl/Intl.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 builtin_intl_IntlObject_h
-#define builtin_intl_IntlObject_h
+#ifndef builtin_intl_Intl_h
+#define builtin_intl_Intl_h
 
 #include "mozilla/Attributes.h"
 
 #include "js/RootingAPI.h"
 #include "js/TypeDecls.h"
 
 namespace js {
 
@@ -100,9 +100,9 @@ intl_GetLocaleInfo(JSContext* cx, unsign
  *   'AM'
  * ]
  */
 extern MOZ_MUST_USE bool
 intl_ComputeDisplayNames(JSContext* cx, unsigned argc, JS::Value* vp);
 
 } // namespace js
 
-#endif /* builtin_intl_IntlObject_h */
+#endif /* builtin_intl_Intl_h */
rename from js/src/builtin/intl/IntlObject.js
rename to js/src/builtin/intl/Intl.js
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -5,17 +5,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifdef MOZ_VALGRIND
 # include <valgrind/memcheck.h>
 #endif
 
 #include "jstypes.h"
 
-#include "builtin/MapObject.h"
+#include "builtin/Map.h"
 #include "frontend/BytecodeCompiler.h"
 #include "gc/GCInternals.h"
 #include "gc/Marking.h"
 #include "jit/MacroAssembler.h"
 #include "js/HashTable.h"
 #include "vm/Debugger.h"
 #include "vm/JSContext.h"
 #include "vm/JSONParser.h"
--- a/js/src/jit/MCallOptimize.cpp
+++ b/js/src/jit/MCallOptimize.cpp
@@ -1,23 +1,23 @@
 /* -*- 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 "mozilla/Casting.h"
 
-#include "builtin/AtomicsObject.h"
+#include "builtin/Atomics.h"
 #include "builtin/intl/Collator.h"
 #include "builtin/intl/DateTimeFormat.h"
 #include "builtin/intl/NumberFormat.h"
 #include "builtin/intl/PluralRules.h"
 #include "builtin/intl/RelativeTimeFormat.h"
-#include "builtin/MapObject.h"
+#include "builtin/Map.h"
 #include "builtin/Math.h"
 #include "builtin/SIMD.h"
 #include "builtin/String.h"
 #include "builtin/TestingFunctions.h"
 #include "builtin/TypedObject.h"
 #include "jit/BaselineInspector.h"
 #include "jit/InlinableNatives.h"
 #include "jit/IonBuilder.h"
--- a/js/src/jit/mips-shared/AtomicOperations-mips-shared.h
+++ b/js/src/jit/mips-shared/AtomicOperations-mips-shared.h
@@ -14,17 +14,17 @@
 // whose instance is shared between jit and AtomicOperations.
 
 #ifndef jit_mips_shared_AtomicOperations_mips_shared_h
 #define jit_mips_shared_AtomicOperations_mips_shared_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Types.h"
 
-#include "builtin/AtomicsObject.h"
+#include "builtin/Atomics.h"
 #include "vm/ArrayBufferObject.h"
 
 #if !defined(__clang__) && !defined(__GNUC__)
 # error "This file only for gcc-compatible compilers"
 #endif
 
 #if defined(JS_SIMULATOR_MIPS32) && !defined(__i386__)
 # error "The MIPS32 simulator atomics assume x86"
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -24,22 +24,22 @@
 #include <sys/stat.h>
 
 #include "jsexn.h"
 #include "jsfriendapi.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
 #include "builtin/Array.h"
-#include "builtin/AtomicsObject.h"
+#include "builtin/Atomics.h"
 #include "builtin/Boolean.h"
 #include "builtin/Date.h"
 #include "builtin/Eval.h"
 #include "builtin/JSON.h"
-#include "builtin/MapObject.h"
+#include "builtin/Map.h"
 #include "builtin/Math.h"
 #include "builtin/Number.h"
 #include "builtin/Promise.h"
 #include "builtin/RegExp.h"
 #include "builtin/Stream.h"
 #include "builtin/String.h"
 #include "builtin/Symbol.h"
 #ifdef ENABLE_SIMD
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -138,46 +138,46 @@ EXPORTS.js += [
     '../public/Utility.h',
     '../public/Value.h',
     '../public/Vector.h',
     '../public/WeakMapPtr.h',
     '../public/Wrapper.h',
 ]
 
 UNIFIED_SOURCES += [
-    'builtin/AtomicsObject.cpp',
+    'builtin/Atomics.cpp',
     'builtin/Boolean.cpp',
-    'builtin/DataViewObject.cpp',
+    'builtin/DataView.cpp',
     'builtin/Date.cpp',
     'builtin/Eval.cpp',
     'builtin/intl/Collator.cpp',
     'builtin/intl/CommonFunctions.cpp',
     'builtin/intl/DateTimeFormat.cpp',
-    'builtin/intl/IntlObject.cpp',
+    'builtin/intl/Intl.cpp',
     'builtin/intl/NumberFormat.cpp',
     'builtin/intl/PluralRules.cpp',
     'builtin/intl/RelativeTimeFormat.cpp',
     'builtin/intl/SharedIntlData.cpp',
     'builtin/JSON.cpp',
-    'builtin/MapObject.cpp',
+    'builtin/Map.cpp',
     'builtin/ModuleObject.cpp',
     'builtin/Number.cpp',
     'builtin/Object.cpp',
     'builtin/Profilers.cpp',
     'builtin/Promise.cpp',
     'builtin/Reflect.cpp',
     'builtin/ReflectParse.cpp',
     'builtin/SIMD.cpp',
     'builtin/Stream.cpp',
     'builtin/String.cpp',
     'builtin/Symbol.cpp',
     'builtin/TestingFunctions.cpp',
     'builtin/TypedObject.cpp',
-    'builtin/WeakMapObject.cpp',
-    'builtin/WeakSetObject.cpp',
+    'builtin/WeakMap.cpp',
+    'builtin/WeakSet.cpp',
     'devtools/sharkctl.cpp',
     'ds/Bitmap.cpp',
     'ds/LifoAlloc.cpp',
     'ds/MemoryProtectionExceptionHandler.cpp',
     'frontend/BytecodeCompiler.cpp',
     'frontend/BytecodeEmitter.cpp',
     'frontend/FoldConstants.cpp',
     'frontend/NameFunctions.cpp',
@@ -742,17 +742,17 @@ selfhosted.inputs = [
     'builtin/Date.js',
     'builtin/Error.js',
     'builtin/Function.js',
     'builtin/Generator.js',
     'builtin/intl/Collator.js',
     'builtin/intl/CommonFunctions.js',
     'builtin/intl/CurrencyDataGenerated.js',
     'builtin/intl/DateTimeFormat.js',
-    'builtin/intl/IntlObject.js',
+    'builtin/intl/Intl.js',
     'builtin/intl/LangTagMappingsGenerated.js',
     'builtin/intl/NumberFormat.js',
     'builtin/intl/PluralRules.js',
     'builtin/intl/RelativeTimeFormat.js',
     'builtin/Iterator.js',
     'builtin/Map.js',
     'builtin/Module.js',
     'builtin/Number.js',
--- a/js/src/vm/ArrayBufferObject.cpp
+++ b/js/src/vm/ArrayBufferObject.cpp
@@ -23,17 +23,17 @@
 #endif
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
 #include "builtin/Array.h"
-#include "builtin/DataViewObject.h"
+#include "builtin/DataView.h"
 #include "builtin/Number.h"
 #include "gc/Barrier.h"
 #include "gc/FreeOp.h"
 #include "gc/Memory.h"
 #include "js/Conversions.h"
 #include "js/MemoryMetrics.h"
 #include "js/Wrapper.h"
 #include "util/Windows.h"
--- a/js/src/vm/DebuggerMemory.cpp
+++ b/js/src/vm/DebuggerMemory.cpp
@@ -7,17 +7,17 @@
 #include "vm/DebuggerMemory.h"
 
 #include "mozilla/Maybe.h"
 #include "mozilla/Move.h"
 #include "mozilla/Vector.h"
 
 #include <stdlib.h>
 
-#include "builtin/MapObject.h"
+#include "builtin/Map.h"
 #include "gc/Marking.h"
 #include "js/AllocPolicy.h"
 #include "js/Debug.h"
 #include "js/TracingAPI.h"
 #include "js/UbiNode.h"
 #include "js/UbiNodeCensus.h"
 #include "js/Utility.h"
 #include "vm/Debugger.h"
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -4,33 +4,33 @@
  * 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/GlobalObject.h"
 
 #include "jsexn.h"
 #include "jsfriendapi.h"
 
-#include "builtin/AtomicsObject.h"
-#include "builtin/DataViewObject.h"
+#include "builtin/Atomics.h"
+#include "builtin/DataView.h"
 #include "builtin/Date.h"
 #include "builtin/Eval.h"
 #include "builtin/JSON.h"
-#include "builtin/MapObject.h"
+#include "builtin/Map.h"
 #include "builtin/Math.h"
 #include "builtin/ModuleObject.h"
 #include "builtin/Object.h"
 #include "builtin/Promise.h"
 #include "builtin/RegExp.h"
 #include "builtin/SelfHostingDefines.h"
 #include "builtin/Stream.h"
 #include "builtin/Symbol.h"
 #include "builtin/TypedObject.h"
-#include "builtin/WeakMapObject.h"
-#include "builtin/WeakSetObject.h"
+#include "builtin/WeakMap.h"
+#include "builtin/WeakSet.h"
 #include "gc/FreeOp.h"
 #include "js/ProtoKey.h"
 #include "vm/Debugger.h"
 #include "vm/EnvironmentObject.h"
 #include "vm/HelperThreads.h"
 #include "vm/JSContext.h"
 #include "vm/PIC.h"
 #include "vm/RegExpStatics.h"
--- a/js/src/vm/GlobalObject.h
+++ b/js/src/vm/GlobalObject.h
@@ -771,21 +771,21 @@ class GlobalObject : public NativeObject
 
     // Implemented in vm/GeneratorObject.cpp.
     static bool initGenerators(JSContext* cx, Handle<GlobalObject*> global);
 
     static bool initAsyncFunction(JSContext* cx, Handle<GlobalObject*> global);
 
     static bool initAsyncGenerators(JSContext* cx, Handle<GlobalObject*> global);
 
-    // Implemented in builtin/MapObject.cpp.
+    // Implemented in builtin/Map.cpp.
     static bool initMapIteratorProto(JSContext* cx, Handle<GlobalObject*> global);
     static bool initSetIteratorProto(JSContext* cx, Handle<GlobalObject*> global);
 
-    // Implemented in builtin/intl/IntlObject.cpp.
+    // Implemented in builtin/intl/Intl.cpp.
     static bool initIntlObject(JSContext* cx, Handle<GlobalObject*> global);
 
     // Implemented in builtin/intl/RelativeTimeFormat.cpp.
     static bool addRelativeTimeFormatConstructor(JSContext* cx, HandleObject intl);
 
     // Implemented in builtin/ModuleObject.cpp
     static bool initModuleProto(JSContext* cx, Handle<GlobalObject*> global);
     static bool initImportEntryProto(JSContext* cx, Handle<GlobalObject*> global);
--- a/js/src/vm/Initialization.cpp
+++ b/js/src/vm/Initialization.cpp
@@ -9,17 +9,17 @@
 #include "js/Initialization.h"
 
 #include "mozilla/Assertions.h"
 
 #include <ctype.h>
 
 #include "jstypes.h"
 
-#include "builtin/AtomicsObject.h"
+#include "builtin/Atomics.h"
 #include "ds/MemoryProtectionExceptionHandler.h"
 #include "gc/Statistics.h"
 #include "jit/ExecutableAllocator.h"
 #include "jit/Ion.h"
 #include "jit/JitCommon.h"
 #include "js/Utility.h"
 #if ENABLE_INTL_API
 #include "unicode/uclean.h"
--- a/js/src/vm/JSObject-inl.h
+++ b/js/src/vm/JSObject-inl.h
@@ -8,17 +8,17 @@
 #define vm_JSObject_inl_h
 
 #include "vm/JSObject.h"
 
 #include "mozilla/DebugOnly.h"
 
 #include "jsfriendapi.h"
 
-#include "builtin/MapObject.h"
+#include "builtin/Map.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"
--- a/js/src/vm/ObjectGroup.cpp
+++ b/js/src/vm/ObjectGroup.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/. */
 
 #include "vm/ObjectGroup.h"
 
 #include "jsexn.h"
 
-#include "builtin/DataViewObject.h"
+#include "builtin/DataView.h"
 #include "gc/FreeOp.h"
 #include "gc/HashUtil.h"
 #include "gc/Policy.h"
 #include "gc/StoreBuffer.h"
 #include "gc/Zone.h"
 #include "js/CharacterEncoding.h"
 #include "vm/ArrayObject.h"
 #include "vm/JSObject.h"
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -16,17 +16,17 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/Scoped.h"
 #include "mozilla/ThreadLocal.h"
 #include "mozilla/Vector.h"
 
 #include <setjmp.h>
 
-#include "builtin/AtomicsObject.h"
+#include "builtin/Atomics.h"
 #include "builtin/intl/SharedIntlData.h"
 #include "builtin/Promise.h"
 #include "frontend/NameCollections.h"
 #include "gc/GCRuntime.h"
 #include "gc/Tracer.h"
 #include "gc/ZoneGroup.h"
 #include "irregexp/RegExpStack.h"
 #include "js/Debug.h"
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -13,32 +13,32 @@
 
 #include "jsfriendapi.h"
 #include "selfhosted.out.h"
 
 #include "builtin/Array.h"
 #include "builtin/Date.h"
 #include "builtin/intl/Collator.h"
 #include "builtin/intl/DateTimeFormat.h"
-#include "builtin/intl/IntlObject.h"
+#include "builtin/intl/Intl.h"
 #include "builtin/intl/NumberFormat.h"
 #include "builtin/intl/PluralRules.h"
 #include "builtin/intl/RelativeTimeFormat.h"
-#include "builtin/MapObject.h"
+#include "builtin/Map.h"
 #include "builtin/ModuleObject.h"
 #include "builtin/Object.h"
 #include "builtin/Promise.h"
 #include "builtin/Reflect.h"
 #include "builtin/RegExp.h"
 #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 "builtin/WeakMap.h"
 #include "gc/HashUtil.h"
 #include "gc/Marking.h"
 #include "gc/Policy.h"
 #include "jit/AtomicOperations.h"
 #include "jit/InlinableNatives.h"
 #include "js/CharacterEncoding.h"
 #include "js/Date.h"
 #include "js/Wrapper.h"
--- a/js/src/vm/StructuredClone.cpp
+++ b/js/src/vm/StructuredClone.cpp
@@ -31,19 +31,19 @@
 #include "mozilla/CheckedInt.h"
 #include "mozilla/EndianUtils.h"
 #include "mozilla/FloatingPoint.h"
 
 #include <algorithm>
 
 #include "jsapi.h"
 
-#include "builtin/DataViewObject.h"
+#include "builtin/DataView.h"
 #include "builtin/Date.h"
-#include "builtin/MapObject.h"
+#include "builtin/Map.h"
 #include "js/Date.h"
 #include "js/GCHashTable.h"
 #include "js/Wrapper.h"
 #include "vm/JSContext.h"
 #include "vm/RegExpObject.h"
 #include "vm/SavedFrame.h"
 #include "vm/SharedArrayObject.h"
 #include "vm/TypedArrayObject.h"
--- a/js/src/vm/TypedArrayObject.cpp
+++ b/js/src/vm/TypedArrayObject.cpp
@@ -17,17 +17,17 @@
 # include <sys/mman.h>
 #endif
 
 #include "jsapi.h"
 #include "jstypes.h"
 #include "jsutil.h"
 
 #include "builtin/Array.h"
-#include "builtin/DataViewObject.h"
+#include "builtin/DataView.h"
 #include "builtin/Number.h"
 #include "builtin/TypedObjectConstants.h"
 #include "gc/Barrier.h"
 #include "gc/Marking.h"
 #include "jit/InlinableNatives.h"
 #include "js/Conversions.h"
 #include "js/Wrapper.h"
 #include "util/Windows.h"