Remove unneeded LazyInstance

We don't need that complexity for initializing a static array.

R=cbruni@chromium.org

Bug: v8:8562, v8:8600
Change-Id: I35ba00dc7a11eeff6c6eadbcb8899a697ccfb415
Reviewed-on: https://chromium-review.googlesource.com/c/1380113Reviewed-by: Camillo Bruni <cbruni@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58310}

src/elements-kind.cc

@@ -68,48 +68,32 @@ const char* ElementsKindToString(ElementsKind kind) {
   return accessor->name();
 }
 
-
-struct InitializeFastElementsKindSequence {
-  static void Construct(void* fast_elements_kind_sequence_ptr_arg) {
-    auto fast_elements_kind_sequence_ptr =
-        reinterpret_cast<ElementsKind**>(fast_elements_kind_sequence_ptr_arg);
-    ElementsKind* fast_elements_kind_sequence =
-        new ElementsKind[kFastElementsKindCount];
-    *fast_elements_kind_sequence_ptr = fast_elements_kind_sequence;
-    STATIC_ASSERT(PACKED_SMI_ELEMENTS == FIRST_FAST_ELEMENTS_KIND);
-    fast_elements_kind_sequence[0] = PACKED_SMI_ELEMENTS;
-    fast_elements_kind_sequence[1] = HOLEY_SMI_ELEMENTS;
-    fast_elements_kind_sequence[2] = PACKED_DOUBLE_ELEMENTS;
-    fast_elements_kind_sequence[3] = HOLEY_DOUBLE_ELEMENTS;
-    fast_elements_kind_sequence[4] = PACKED_ELEMENTS;
-    fast_elements_kind_sequence[5] = HOLEY_ELEMENTS;
-
-    // Verify that kFastElementsKindPackedToHoley is correct.
-    STATIC_ASSERT(PACKED_SMI_ELEMENTS + kFastElementsKindPackedToHoley ==
+ElementsKind kFastElementsKindSequence[kFastElementsKindCount] = {
+    PACKED_SMI_ELEMENTS,     // 0
+    HOLEY_SMI_ELEMENTS,      // 1
+    PACKED_DOUBLE_ELEMENTS,  // 2
+    HOLEY_DOUBLE_ELEMENTS,   // 3
+    PACKED_ELEMENTS,         // 4
+    HOLEY_ELEMENTS           // 5
+};
+STATIC_ASSERT(PACKED_SMI_ELEMENTS == FIRST_FAST_ELEMENTS_KIND);
+// Verify that kFastElementsKindPackedToHoley is correct.
+STATIC_ASSERT(PACKED_SMI_ELEMENTS + kFastElementsKindPackedToHoley ==
               HOLEY_SMI_ELEMENTS);
-    STATIC_ASSERT(PACKED_DOUBLE_ELEMENTS + kFastElementsKindPackedToHoley ==
+STATIC_ASSERT(PACKED_DOUBLE_ELEMENTS + kFastElementsKindPackedToHoley ==
               HOLEY_DOUBLE_ELEMENTS);
-    STATIC_ASSERT(PACKED_ELEMENTS + kFastElementsKindPackedToHoley ==
+STATIC_ASSERT(PACKED_ELEMENTS + kFastElementsKindPackedToHoley ==
               HOLEY_ELEMENTS);
-  }
-};
-
-
-static base::LazyInstance<ElementsKind*,
-                          InitializeFastElementsKindSequence>::type
-    fast_elements_kind_sequence = LAZY_INSTANCE_INITIALIZER;
-
 
 ElementsKind GetFastElementsKindFromSequenceIndex(int sequence_number) {
   DCHECK(sequence_number >= 0 &&
          sequence_number < kFastElementsKindCount);
-  return fast_elements_kind_sequence.Get()[sequence_number];
+  return kFastElementsKindSequence[sequence_number];
 }
 
-
 int GetSequenceIndexFromFastElementsKind(ElementsKind elements_kind) {
   for (int i = 0; i < kFastElementsKindCount; ++i) {
-    if (fast_elements_kind_sequence.Get()[i] == elements_kind) {
+    if (kFastElementsKindSequence[i] == elements_kind) {
       return i;
     }
   }