[cleanup] Start cleaning up utils.h

Remove EmbeddedVector from utils.h

Bug: v8:8834, v8:8912
Change-Id: I04e9f12121757bd0b87c68d7a4a5b213c2d8b686
Reviewed-on: https://chromium-review.googlesource.com/c/1486473Reviewed-by: Yang Guo <yangguo@chromium.org>
Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Commit-Queue: Sigurd Schneider <sigurds@chromium.org>
Cr-Commit-Position: refs/heads/master@{#59854}

src/arm/disasm-arm.cc

@@ -35,6 +35,7 @@
 #include "src/base/bits.h"
 #include "src/base/platform/platform.h"
 #include "src/disasm.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {

src/arm/simulator-arm.cc

@@ -19,6 +19,7 @@
 #include "src/objects-inl.h"
 #include "src/ostreams.h"
 #include "src/runtime/runtime-utils.h"
+#include "src/vector.h"
 
 // Only build the simulator if not compiling for real ARM hardware.
 namespace v8 {

src/asmjs/asm-js.cc

@@ -23,6 +23,7 @@
 #include "src/parsing/scanner-character-streams.h"
 #include "src/parsing/scanner.h"
 #include "src/unoptimized-compilation-info.h"
+#include "src/vector.h"
 
 #include "src/wasm/wasm-engine.h"
 #include "src/wasm/wasm-js.h"

src/ast/prettyprinter.cc

@@ -12,6 +12,7 @@
 #include "src/globals.h"
 #include "src/objects-inl.h"
 #include "src/string-builder-inl.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {

src/code-tracer.h

@@ -9,6 +9,7 @@
 #include "src/flags.h"
 #include "src/globals.h"
 #include "src/utils.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {

src/compiler/backend/register-allocator.cc

@@ -11,6 +11,7 @@
 #include "src/base/small-vector.h"
 #include "src/compiler/linkage.h"
 #include "src/string-stream.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {

src/compiler/graph-visualizer.cc

@@ -26,6 +26,7 @@
 #include "src/optimized-compilation-info.h"
 #include "src/ostreams.h"
 #include "src/source-position.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {

src/compiler/wasm-compiler.cc

@@ -40,6 +40,7 @@
 #include "src/optimized-compilation-info.h"
 #include "src/tracing/trace-event.h"
 #include "src/trap-handler/trap-handler.h"
+#include "src/vector.h"
 #include "src/wasm/function-body-decoder.h"
 #include "src/wasm/function-compiler.h"
 #include "src/wasm/graph-builder-interface.h"

src/conversions.h

@@ -5,10 +5,9 @@
 #ifndef V8_CONVERSIONS_H_
 #define V8_CONVERSIONS_H_
 
-#include <limits>
-
 #include "src/base/logging.h"
-#include "src/utils.h"
+#include "src/globals.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {

src/disasm.h

@@ -5,7 +5,7 @@
 #ifndef V8_DISASM_H_
 #define V8_DISASM_H_
 
-#include "src/utils.h"
+#include "src/vector.h"
 
 namespace disasm {
 

src/disassembler.cc

@@ -21,6 +21,7 @@
 #include "src/snapshot/embedded-data.h"
 #include "src/snapshot/serializer-common.h"
 #include "src/string-stream.h"
+#include "src/vector.h"
 #include "src/wasm/wasm-code-manager.h"
 #include "src/wasm/wasm-engine.h"
 

src/gdb-jit.cc

@@ -18,6 +18,7 @@
 #include "src/ostreams.h"
 #include "src/snapshot/natives.h"
 #include "src/splay-tree-inl.h"
+#include "src/vector.h"
 #include "src/zone/zone-chunk-list.h"
 
 namespace v8 {

src/ia32/disasm-ia32.cc

@@ -11,6 +11,7 @@
 #include "src/base/compiler-specific.h"
 #include "src/disasm.h"
 #include "src/ia32/sse-instr.h"
+#include "src/utils.h"
 
 namespace disasm {
 

src/inspector/DEPS

@@ -5,6 +5,7 @@ include_rules = [
   "+src/base/compiler-specific.h",
   "+src/base/macros.h",
   "+src/base/logging.h",
+  "+src/base/v8-fallthrough.h",
   "+src/base/platform/platform.h",
   "+src/base/platform/mutex.h",
   "+src/conversions.h",

src/inspector/string-16.cc

@@ -12,6 +12,7 @@
 #include <string>
 
 #include "src/base/platform/platform.h"
+#include "src/base/v8-fallthrough.h"
 #include "src/conversions.h"
 
 namespace v8_inspector {

src/mips/simulator-mips.cc

@@ -20,6 +20,7 @@
 #include "src/mips/constants-mips.h"
 #include "src/ostreams.h"
 #include "src/runtime/runtime-utils.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {

src/mips64/simulator-mips64.cc

@@ -19,6 +19,7 @@
 #include "src/mips64/constants-mips64.h"
 #include "src/ostreams.h"
 #include "src/runtime/runtime-utils.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {

src/profiler/heap-snapshot-generator.cc

@@ -33,6 +33,7 @@
 #include "src/profiler/heap-snapshot-generator-inl.h"
 #include "src/prototype.h"
 #include "src/transitions-inl.h"
+#include "src/vector.h"
 #include "src/visitors.h"
 
 namespace v8 {

src/string-stream.cc

@@ -11,6 +11,7 @@
 #include "src/objects-inl.h"
 #include "src/objects/js-array-inl.h"
 #include "src/prototype.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {

src/tracing/traced-value.cc

@@ -6,6 +6,7 @@
 
 #include "src/base/platform/platform.h"
 #include "src/conversions.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace tracing {

src/utils.h

@@ -52,11 +52,6 @@ inline char HexCharOfValue(int value) {
 
 inline int BoolToInt(bool b) { return b ? 1 : 0; }
 
-// Same as strcmp, but can handle NULL arguments.
-inline bool CStringEquals(const char* s1, const char* s2) {
-  return (s1 == s2) || (s1 != nullptr && s2 != nullptr && strcmp(s1, s2) == 0);
-}
-
 // Checks if value is in range [lower_limit, higher_limit] using a single
 // branch.
 template <typename T, typename U>
@@ -577,36 +572,6 @@ class SetOncePointer {
   T* pointer_ = nullptr;
 };
 
-
-template <typename T, int kSize>
-class EmbeddedVector : public Vector<T> {
- public:
-  EmbeddedVector() : Vector<T>(buffer_, kSize) { }
-
-  explicit EmbeddedVector(T initial_value) : Vector<T>(buffer_, kSize) {
-    for (int i = 0; i < kSize; ++i) {
-      buffer_[i] = initial_value;
-    }
-  }
-
-  // When copying, make underlying Vector to reference our buffer.
-  EmbeddedVector(const EmbeddedVector& rhs) V8_NOEXCEPT : Vector<T>(rhs) {
-    MemCopy(buffer_, rhs.buffer_, sizeof(T) * kSize);
-    this->set_start(buffer_);
-  }
-
-  EmbeddedVector& operator=(const EmbeddedVector& rhs) V8_NOEXCEPT {
-    if (this == &rhs) return *this;
-    Vector<T>::operator=(rhs);
-    MemCopy(buffer_, rhs.buffer_, sizeof(T) * kSize);
-    this->set_start(buffer_);
-    return *this;
-  }
-
- private:
-  T buffer_[kSize];
-};
-
 // Compare 8bit/16bit chars to 8bit/16bit chars.
 template <typename lchar, typename rchar>
 inline int CompareCharsUnsigned(const lchar* lhs, const rchar* rhs,

src/vector.h

@@ -313,6 +313,35 @@ inline constexpr auto VectorOf(Container&& c)
   return VectorOf(c.data(), c.size());
 }
 
+template <typename T, int kSize>
+class EmbeddedVector : public Vector<T> {
+ public:
+  EmbeddedVector() : Vector<T>(buffer_, kSize) {}
+
+  explicit EmbeddedVector(T initial_value) : Vector<T>(buffer_, kSize) {
+    for (int i = 0; i < kSize; ++i) {
+      buffer_[i] = initial_value;
+    }
+  }
+
+  // When copying, make underlying Vector to reference our buffer.
+  EmbeddedVector(const EmbeddedVector& rhs) V8_NOEXCEPT : Vector<T>(rhs) {
+    MemCopy(buffer_, rhs.buffer_, sizeof(T) * kSize);
+    this->set_start(buffer_);
+  }
+
+  EmbeddedVector& operator=(const EmbeddedVector& rhs) V8_NOEXCEPT {
+    if (this == &rhs) return *this;
+    Vector<T>::operator=(rhs);
+    MemCopy(buffer_, rhs.buffer_, sizeof(T) * kSize);
+    this->set_start(buffer_);
+    return *this;
+  }
+
+ private:
+  T buffer_[kSize];
+};
+
 }  // namespace internal
 }  // namespace v8
 

src/wasm/decoder.h

@@ -12,6 +12,7 @@
 #include "src/flags.h"
 #include "src/signature.h"
 #include "src/v8memory.h"
+#include "src/vector.h"
 #include "src/wasm/wasm-result.h"
 #include "src/zone/zone-containers.h"
 

src/wasm/memory-tracing.cc

@@ -6,6 +6,7 @@
 
 #include "src/utils.h"
 #include "src/v8memory.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {

src/wasm/wasm-code-manager.cc

@@ -18,6 +18,7 @@
 #include "src/objects-inl.h"
 #include "src/ostreams.h"
 #include "src/snapshot/embedded-data.h"
+#include "src/vector.h"
 #include "src/wasm/compilation-environment.h"
 #include "src/wasm/function-compiler.h"
 #include "src/wasm/jump-table-assembler.h"

src/wasm/wasm-objects.cc

@@ -16,6 +16,7 @@
 #include "src/objects/shared-function-info.h"
 #include "src/objects/struct-inl.h"
 #include "src/trap-handler/trap-handler.h"
+#include "src/vector.h"
 #include "src/wasm/jump-table-assembler.h"
 #include "src/wasm/module-compiler.h"
 #include "src/wasm/module-decoder.h"

src/wasm/wasm-result.h

@@ -9,7 +9,8 @@
 #include <memory>
 
 #include "src/base/compiler-specific.h"
-#include "src/utils.h"
+#include "src/base/macros.h"
+#include "src/base/platform/platform.h"
 
 #include "src/globals.h"
 

src/x64/disasm-x64.cc

@@ -12,6 +12,7 @@
 #include "src/base/lazy-instance.h"
 #include "src/base/v8-fallthrough.h"
 #include "src/disasm.h"
+#include "src/utils.h"
 #include "src/x64/register-x64.h"
 #include "src/x64/sse-instr.h"