From: svenpanne <svenpanne@chromium.org>
Date: Tue, 21 Apr 2015 10:21:50 +0000 (-0700)
Subject: Removed src/{isolate,property-details,utils}-inl.h
X-Git-Tag: upstream/4.7.83~3082
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d3044e161b0a04aa19079cb8580d7e0e9b9413c;p=platform%2Fupstream%2Fv8.git

Removed src/{isolate,property-details,utils}-inl.h

Baby steps towards saner #includes...

Review URL: https://codereview.chromium.org/1051393003

Cr-Commit-Position: refs/heads/master@{#27958}
---

diff --git a/BUILD.gn b/BUILD.gn
index 866943b..fb0c577 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1017,7 +1017,6 @@ source_set("v8_base") {
     "src/unicode-decoder.cc",
     "src/unicode-decoder.h",
     "src/unique.h",
-    "src/utils-inl.h",
     "src/utils.cc",
     "src/utils.h",
     "src/v8.cc",
diff --git a/src/api-natives.cc b/src/api-natives.cc
index e792453..c95f2ce 100644
--- a/src/api-natives.cc
+++ b/src/api-natives.cc
@@ -3,11 +3,15 @@
 // found in the LICENSE file.
 
 #include "src/api-natives.h"
-#include "src/isolate-inl.h"
+
+#include "src/api.h"
+#include "src/isolate.h"
+#include "src/lookup.h"
 
 namespace v8 {
 namespace internal {
 
+
 namespace {
 
 MaybeHandle<JSObject> InstantiateObject(Isolate* isolate,
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
index 0cc48e7..fb6227b 100644
--- a/src/arm/full-codegen-arm.cc
+++ b/src/arm/full-codegen-arm.cc
@@ -13,7 +13,6 @@
 #include "src/debug.h"
 #include "src/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/isolate-inl.h"
 #include "src/parser.h"
 #include "src/scopes.h"
 
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
index 8f93bd9..12108a0 100644
--- a/src/arm/macro-assembler-arm.cc
+++ b/src/arm/macro-assembler-arm.cc
@@ -14,7 +14,6 @@
 #include "src/codegen.h"
 #include "src/cpu-profiler.h"
 #include "src/debug.h"
-#include "src/isolate-inl.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {
diff --git a/src/arm64/full-codegen-arm64.cc b/src/arm64/full-codegen-arm64.cc
index c2240ce..60c6b51 100644
--- a/src/arm64/full-codegen-arm64.cc
+++ b/src/arm64/full-codegen-arm64.cc
@@ -13,7 +13,6 @@
 #include "src/debug.h"
 #include "src/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/isolate-inl.h"
 #include "src/parser.h"
 #include "src/scopes.h"
 
diff --git a/src/arm64/macro-assembler-arm64.cc b/src/arm64/macro-assembler-arm64.cc
index 5df2e5a..07e237e 100644
--- a/src/arm64/macro-assembler-arm64.cc
+++ b/src/arm64/macro-assembler-arm64.cc
@@ -12,7 +12,6 @@
 #include "src/codegen.h"
 #include "src/cpu-profiler.h"
 #include "src/debug.h"
-#include "src/isolate-inl.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {
diff --git a/src/assembler.cc b/src/assembler.cc
index e5924cd..1464074 100644
--- a/src/assembler.cc
+++ b/src/assembler.cc
@@ -40,6 +40,7 @@
 #include "src/base/functional.h"
 #include "src/base/lazy-instance.h"
 #include "src/base/platform/platform.h"
+#include "src/base/utils/random-number-generator.h"
 #include "src/builtins.h"
 #include "src/codegen.h"
 #include "src/counters.h"
@@ -49,7 +50,6 @@
 #include "src/execution.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
-#include "src/isolate-inl.h"
 #include "src/jsregexp.h"
 #include "src/regexp-macro-assembler.h"
 #include "src/regexp-stack.h"
diff --git a/src/assert-scope.cc b/src/assert-scope.cc
index e3ac310..3b91cf4 100644
--- a/src/assert-scope.cc
+++ b/src/assert-scope.cc
@@ -6,7 +6,8 @@
 
 #include "src/base/lazy-instance.h"
 #include "src/base/platform/platform.h"
-#include "src/isolate-inl.h"
+#include "src/debug.h"
+#include "src/isolate.h"
 #include "src/utils.h"
 
 namespace v8 {
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index 7b8084e..e11aff6 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -6,13 +6,13 @@
 
 #include "src/accessors.h"
 #include "src/api-natives.h"
+#include "src/base/utils/random-number-generator.h"
 #include "src/code-stubs.h"
 #include "src/extensions/externalize-string-extension.h"
 #include "src/extensions/free-buffer-extension.h"
 #include "src/extensions/gc-extension.h"
 #include "src/extensions/statistics-extension.h"
 #include "src/extensions/trigger-failure-extension.h"
-#include "src/isolate-inl.h"
 #include "src/snapshot/natives.h"
 #include "src/snapshot/snapshot.h"
 #include "third_party/fdlibm/fdlibm.h"
diff --git a/src/compiler.cc b/src/compiler.cc
index ea5660d..524eca8 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -17,7 +17,6 @@
 #include "src/full-codegen.h"
 #include "src/gdb-jit.h"
 #include "src/hydrogen.h"
-#include "src/isolate-inl.h"
 #include "src/lithium.h"
 #include "src/liveedit.h"
 #include "src/messages.h"
diff --git a/src/debug.cc b/src/debug.cc
index 25407a7..49700ee 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -16,7 +16,6 @@
 #include "src/execution.h"
 #include "src/full-codegen.h"
 #include "src/global-handles.h"
-#include "src/isolate-inl.h"
 #include "src/list.h"
 #include "src/log.h"
 #include "src/messages.h"
diff --git a/src/execution.cc b/src/execution.cc
index ad7d7f6..97c660e 100644
--- a/src/execution.cc
+++ b/src/execution.cc
@@ -7,7 +7,6 @@
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
-#include "src/isolate-inl.h"
 #include "src/messages.h"
 #include "src/vm-state-inl.h"
 
diff --git a/src/factory.cc b/src/factory.cc
index 106f3d7..eda7cdd 100644
--- a/src/factory.cc
+++ b/src/factory.cc
@@ -8,7 +8,6 @@
 #include "src/base/bits.h"
 #include "src/bootstrapper.h"
 #include "src/conversions.h"
-#include "src/isolate-inl.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 50a328a..428def4 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -24,7 +24,6 @@
 #include "src/heap/objects-visiting.h"
 #include "src/heap/store-buffer.h"
 #include "src/heap-profiler.h"
-#include "src/isolate-inl.h"
 #include "src/runtime-profiler.h"
 #include "src/scopeinfo.h"
 #include "src/snapshot/natives.h"
diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc
index 66255f2..822077d 100644
--- a/src/hydrogen-instructions.cc
+++ b/src/hydrogen-instructions.cc
@@ -8,7 +8,6 @@
 #include "src/double.h"
 #include "src/factory.h"
 #include "src/hydrogen-infer-representation.h"
-#include "src/property-details-inl.h"
 
 #if V8_TARGET_ARCH_IA32
 #include "src/ia32/lithium-ia32.h"  // NOLINT
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index f3322b6..97d604a 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -10080,11 +10080,21 @@ void HOptimizedGraphBuilder::VisitNot(UnaryOperation* expr) {
 }
 
 
+static Representation RepresentationFor(Type* type) {
+  DisallowHeapAllocation no_allocation;
+  if (type->Is(Type::None())) return Representation::None();
+  if (type->Is(Type::SignedSmall())) return Representation::Smi();
+  if (type->Is(Type::Signed32())) return Representation::Integer32();
+  if (type->Is(Type::Number())) return Representation::Double();
+  return Representation::Tagged();
+}
+
+
 HInstruction* HOptimizedGraphBuilder::BuildIncrement(
     bool returns_original_input,
     CountOperation* expr) {
   // The input to the count operation is on top of the expression stack.
-  Representation rep = Representation::FromType(expr->type());
+  Representation rep = RepresentationFor(expr->type());
   if (rep.IsNone() || rep.IsTagged()) {
     rep = Representation::Smi();
   }
@@ -10428,9 +10438,8 @@ HValue* HGraphBuilder::BuildBinaryOperation(
     Type* result_type,
     Maybe<int> fixed_right_arg,
     HAllocationMode allocation_mode) {
-
-  Representation left_rep = Representation::FromType(left_type);
-  Representation right_rep = Representation::FromType(right_type);
+  Representation left_rep = RepresentationFor(left_type);
+  Representation right_rep = RepresentationFor(right_type);
 
   bool maybe_string_add = op == Token::ADD &&
                           (left_type->Maybe(Type::String()) ||
@@ -10443,7 +10452,7 @@ HValue* HGraphBuilder::BuildBinaryOperation(
         Deoptimizer::kInsufficientTypeFeedbackForLHSOfBinaryOperation,
         Deoptimizer::SOFT);
     left_type = Type::Any(zone());
-    left_rep = Representation::FromType(left_type);
+    left_rep = RepresentationFor(left_type);
     maybe_string_add = op == Token::ADD;
   }
 
@@ -10452,7 +10461,7 @@ HValue* HGraphBuilder::BuildBinaryOperation(
         Deoptimizer::kInsufficientTypeFeedbackForRHSOfBinaryOperation,
         Deoptimizer::SOFT);
     right_type = Type::Any(zone());
-    right_rep = Representation::FromType(right_type);
+    right_rep = RepresentationFor(right_type);
     maybe_string_add = op == Token::ADD;
   }
 
@@ -10547,7 +10556,7 @@ HValue* HGraphBuilder::BuildBinaryOperation(
     right = EnforceNumberType(right, right_type);
   }
 
-  Representation result_rep = Representation::FromType(result_type);
+  Representation result_rep = RepresentationFor(result_type);
 
   bool is_non_primitive = (left_rep.IsTagged() && !left_rep.IsSmi()) ||
                           (right_rep.IsTagged() && !right_rep.IsSmi());
@@ -10929,9 +10938,9 @@ HControlInstruction* HOptimizedGraphBuilder::BuildCompareInstruction(
     combined_type = left_type = right_type = Type::Any(zone());
   }
 
-  Representation left_rep = Representation::FromType(left_type);
-  Representation right_rep = Representation::FromType(right_type);
-  Representation combined_rep = Representation::FromType(combined_type);
+  Representation left_rep = RepresentationFor(left_type);
+  Representation right_rep = RepresentationFor(right_type);
+  Representation combined_rep = RepresentationFor(combined_type);
 
   if (combined_type->Is(Type::Receiver())) {
     if (Token::IsEqualityOp(op)) {
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
index b3f36f5..e2dda91 100644
--- a/src/ia32/full-codegen-ia32.cc
+++ b/src/ia32/full-codegen-ia32.cc
@@ -13,7 +13,6 @@
 #include "src/debug.h"
 #include "src/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/isolate-inl.h"
 #include "src/parser.h"
 #include "src/scopes.h"
 
diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
index 9c02484..4d599ee 100644
--- a/src/ia32/macro-assembler-ia32.cc
+++ b/src/ia32/macro-assembler-ia32.cc
@@ -12,7 +12,6 @@
 #include "src/codegen.h"
 #include "src/cpu-profiler.h"
 #include "src/debug.h"
-#include "src/isolate-inl.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {
diff --git a/src/isolate-inl.h b/src/isolate-inl.h
deleted file mode 100644
index d234279..0000000
--- a/src/isolate-inl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2011 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef V8_ISOLATE_INL_H_
-#define V8_ISOLATE_INL_H_
-
-#include "src/base/utils/random-number-generator.h"
-#include "src/debug.h"
-#include "src/isolate.h"
-
-namespace v8 {
-namespace internal {
-
-
-SaveContext::SaveContext(Isolate* isolate)
-  : isolate_(isolate),
-    prev_(isolate->save_context()) {
-  if (isolate->context() != NULL) {
-    context_ = Handle<Context>(isolate->context());
-  }
-  isolate->set_save_context(this);
-
-  c_entry_fp_ = isolate->c_entry_fp(isolate->thread_local_top());
-}
-
-
-base::RandomNumberGenerator* Isolate::random_number_generator() {
-  if (random_number_generator_ == NULL) {
-    if (FLAG_random_seed != 0) {
-      random_number_generator_ =
-          new base::RandomNumberGenerator(FLAG_random_seed);
-    } else {
-      random_number_generator_ = new base::RandomNumberGenerator();
-    }
-  }
-  return random_number_generator_;
-}
-
-} }  // namespace v8::internal
-
-#endif  // V8_ISOLATE_INL_H_
diff --git a/src/isolate.cc b/src/isolate.cc
index 34b9673..8ffa7c8 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -25,7 +25,6 @@
 #include "src/heap-profiler.h"
 #include "src/hydrogen.h"
 #include "src/ic/stub-cache.h"
-#include "src/isolate-inl.h"
 #include "src/lithium-allocator.h"
 #include "src/log.h"
 #include "src/messages.h"
@@ -2407,6 +2406,19 @@ CallInterfaceDescriptorData* Isolate::call_descriptor_data(int index) {
 }
 
 
+base::RandomNumberGenerator* Isolate::random_number_generator() {
+  if (random_number_generator_ == NULL) {
+    if (FLAG_random_seed != 0) {
+      random_number_generator_ =
+          new base::RandomNumberGenerator(FLAG_random_seed);
+    } else {
+      random_number_generator_ = new base::RandomNumberGenerator();
+    }
+  }
+  return random_number_generator_;
+}
+
+
 Object* Isolate::FindCodeObject(Address a) {
   return inner_pointer_to_code_cache()->GcSafeFindCodeForInnerPointer(a);
 }
@@ -2661,6 +2673,17 @@ bool StackLimitCheck::JsHasOverflowed() const {
 }
 
 
+SaveContext::SaveContext(Isolate* isolate)
+    : isolate_(isolate), prev_(isolate->save_context()) {
+  if (isolate->context() != NULL) {
+    context_ = Handle<Context>(isolate->context());
+  }
+  isolate->set_save_context(this);
+
+  c_entry_fp_ = isolate->c_entry_fp(isolate->thread_local_top());
+}
+
+
 bool PostponeInterruptsScope::Intercept(StackGuard::InterruptFlag flag) {
   // First check whether the previous scope intercepts.
   if (prev_ && prev_->Intercept(flag)) return true;
diff --git a/src/isolate.h b/src/isolate.h
index a434edd..ab2efd7 100644
--- a/src/isolate.h
+++ b/src/isolate.h
@@ -1060,7 +1060,7 @@ class Isolate {
 
   void* stress_deopt_count_address() { return &stress_deopt_count_; }
 
-  inline base::RandomNumberGenerator* random_number_generator();
+  base::RandomNumberGenerator* random_number_generator();
 
   // Given an address occupied by a live code object, return that object.
   Object* FindCodeObject(Address a);
@@ -1392,7 +1392,7 @@ class PromiseOnStack {
 // versions of GCC. See V8 issue 122 for details.
 class SaveContext BASE_EMBEDDED {
  public:
-  inline explicit SaveContext(Isolate* isolate);
+  explicit SaveContext(Isolate* isolate);
 
   ~SaveContext() {
     isolate_->set_context(context_.is_null() ? NULL : *context_);
diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc
index 156e87e..c479208 100644
--- a/src/mips/full-codegen-mips.cc
+++ b/src/mips/full-codegen-mips.cc
@@ -21,7 +21,6 @@
 #include "src/debug.h"
 #include "src/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/isolate-inl.h"
 #include "src/parser.h"
 #include "src/scopes.h"
 
diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc
index eb009da..030a634 100644
--- a/src/mips/macro-assembler-mips.cc
+++ b/src/mips/macro-assembler-mips.cc
@@ -14,7 +14,6 @@
 #include "src/codegen.h"
 #include "src/cpu-profiler.h"
 #include "src/debug.h"
-#include "src/isolate-inl.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {
diff --git a/src/mips64/full-codegen-mips64.cc b/src/mips64/full-codegen-mips64.cc
index 0379a0e..2f59f36 100644
--- a/src/mips64/full-codegen-mips64.cc
+++ b/src/mips64/full-codegen-mips64.cc
@@ -21,7 +21,6 @@
 #include "src/debug.h"
 #include "src/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/isolate-inl.h"
 #include "src/parser.h"
 #include "src/scopes.h"
 
diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc
index 03f8535..0e7955d 100644
--- a/src/mips64/macro-assembler-mips64.cc
+++ b/src/mips64/macro-assembler-mips64.cc
@@ -13,7 +13,6 @@
 #include "src/codegen.h"
 #include "src/cpu-profiler.h"
 #include "src/debug.h"
-#include "src/isolate-inl.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {
diff --git a/src/objects.cc b/src/objects.cc
index 74886c9..f1742f3 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -12,6 +12,7 @@
 #include "src/api.h"
 #include "src/arguments.h"
 #include "src/base/bits.h"
+#include "src/base/utils/random-number-generator.h"
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
@@ -30,7 +31,6 @@
 #include "src/heap/objects-visiting-inl.h"
 #include "src/hydrogen.h"
 #include "src/ic/ic.h"
-#include "src/isolate-inl.h"
 #include "src/log.h"
 #include "src/lookup.h"
 #include "src/macro-assembler.h"
diff --git a/src/ppc/full-codegen-ppc.cc b/src/ppc/full-codegen-ppc.cc
index c02d094..17b7bf3 100644
--- a/src/ppc/full-codegen-ppc.cc
+++ b/src/ppc/full-codegen-ppc.cc
@@ -13,7 +13,6 @@
 #include "src/debug.h"
 #include "src/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/isolate-inl.h"
 #include "src/parser.h"
 #include "src/scopes.h"
 
diff --git a/src/ppc/macro-assembler-ppc.cc b/src/ppc/macro-assembler-ppc.cc
index 5231f4a..e075c17 100644
--- a/src/ppc/macro-assembler-ppc.cc
+++ b/src/ppc/macro-assembler-ppc.cc
@@ -15,7 +15,6 @@
 #include "src/codegen.h"
 #include "src/cpu-profiler.h"
 #include "src/debug.h"
-#include "src/isolate-inl.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {
diff --git a/src/preparse-data.h b/src/preparse-data.h
index d78c3ed..ce3b2e0 100644
--- a/src/preparse-data.h
+++ b/src/preparse-data.h
@@ -8,7 +8,6 @@
 #include "src/allocation.h"
 #include "src/hashmap.h"
 #include "src/preparse-data-format.h"
-#include "src/utils-inl.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/property-details-inl.h b/src/property-details-inl.h
deleted file mode 100644
index efb27b3..0000000
--- a/src/property-details-inl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef V8_PROPERTY_DETAILS_INL_H_
-#define V8_PROPERTY_DETAILS_INL_H_
-
-#include "src/conversions.h"
-#include "src/objects.h"
-#include "src/property-details.h"
-#include "src/types.h"
-
-namespace v8 {
-namespace internal {
-
-Representation Representation::FromType(Type* type) {
-  DisallowHeapAllocation no_allocation;
-  if (type->Is(Type::None())) return Representation::None();
-  if (type->Is(Type::SignedSmall())) return Representation::Smi();
-  if (type->Is(Type::Signed32())) return Representation::Integer32();
-  if (type->Is(Type::Number())) return Representation::Double();
-  return Representation::Tagged();
-}
-
-} }  // namespace v8::internal
-
-#endif  // V8_PROPERTY_DETAILS_INL_H_
diff --git a/src/property-details.h b/src/property-details.h
index e71419a..517e7a9 100644
--- a/src/property-details.h
+++ b/src/property-details.h
@@ -95,8 +95,6 @@ class Representation {
 
   static Representation FromKind(Kind kind) { return Representation(kind); }
 
-  static Representation FromType(Type* type);
-
   bool Equals(const Representation& other) const {
     return kind_ == other.kind_;
   }
diff --git a/src/runtime-profiler.cc b/src/runtime-profiler.cc
index 109c1a5..5e5b57c 100644
--- a/src/runtime-profiler.cc
+++ b/src/runtime-profiler.cc
@@ -15,7 +15,6 @@
 #include "src/full-codegen.h"
 #include "src/global-handles.h"
 #include "src/heap/mark-compact.h"
-#include "src/isolate-inl.h"
 #include "src/scopeinfo.h"
 
 namespace v8 {
diff --git a/src/runtime/runtime-classes.cc b/src/runtime/runtime-classes.cc
index 62eee66..167abcc 100644
--- a/src/runtime/runtime-classes.cc
+++ b/src/runtime/runtime-classes.cc
@@ -7,7 +7,8 @@
 
 #include "src/v8.h"
 
-#include "src/isolate-inl.h"
+#include "src/arguments.h"
+#include "src/debug.h"
 #include "src/runtime/runtime.h"
 #include "src/runtime/runtime-utils.h"
 
diff --git a/src/runtime/runtime-compiler.cc b/src/runtime/runtime-compiler.cc
index 72489f5..3b37bda 100644
--- a/src/runtime/runtime-compiler.cc
+++ b/src/runtime/runtime-compiler.cc
@@ -9,7 +9,6 @@
 #include "src/deoptimizer.h"
 #include "src/frames.h"
 #include "src/full-codegen.h"
-#include "src/isolate-inl.h"
 #include "src/messages.h"
 #include "src/runtime/runtime-utils.h"
 #include "src/v8threads.h"
diff --git a/src/runtime/runtime-debug.cc b/src/runtime/runtime-debug.cc
index 736d33d..94ac074 100644
--- a/src/runtime/runtime-debug.cc
+++ b/src/runtime/runtime-debug.cc
@@ -9,7 +9,6 @@
 #include "src/compiler.h"
 #include "src/debug.h"
 #include "src/deoptimizer.h"
-#include "src/isolate-inl.h"
 #include "src/parser.h"
 #include "src/runtime/runtime.h"
 #include "src/runtime/runtime-utils.h"
diff --git a/src/utils-inl.h b/src/utils-inl.h
deleted file mode 100644
index d0c0e3c..0000000
--- a/src/utils-inl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2011 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef V8_UTILS_INL_H_
-#define V8_UTILS_INL_H_
-
-#include "src/list-inl.h"
-
-namespace v8 {
-namespace internal {
-
-template<typename T, int growth_factor, int max_growth>
-void Collector<T, growth_factor, max_growth>::Reset() {
-  for (int i = chunks_.length() - 1; i >= 0; i--) {
-    chunks_.at(i).Dispose();
-  }
-  chunks_.Rewind(0);
-  index_ = 0;
-  size_ = 0;
-}
-
-} }  // namespace v8::internal
-
-#endif  // V8_UTILS_INL_H_
diff --git a/src/utils.h b/src/utils.h
index 5790d87..070ae7c 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -640,7 +640,14 @@ class Collector {
   }
 
   // Resets the collector to be empty.
-  virtual void Reset();
+  virtual void Reset() {
+    for (int i = chunks_.length() - 1; i >= 0; i--) {
+      chunks_.at(i).Dispose();
+    }
+    chunks_.Rewind(0);
+    index_ = 0;
+    size_ = 0;
+  }
 
   // Total number of elements added to collector so far.
   inline int size() { return size_; }
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc
index 90d3095..2ad757f 100644
--- a/src/x64/full-codegen-x64.cc
+++ b/src/x64/full-codegen-x64.cc
@@ -13,7 +13,6 @@
 #include "src/debug.h"
 #include "src/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/isolate-inl.h"
 #include "src/parser.h"
 #include "src/scopes.h"
 
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index f9b3f39..0e70826 100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -13,7 +13,6 @@
 #include "src/cpu-profiler.h"
 #include "src/debug.h"
 #include "src/heap/heap.h"
-#include "src/isolate-inl.h"
 #include "src/x64/assembler-x64.h"
 #include "src/x64/macro-assembler-x64.h"
 
diff --git a/src/x87/full-codegen-x87.cc b/src/x87/full-codegen-x87.cc
index ccbd223..709e567 100644
--- a/src/x87/full-codegen-x87.cc
+++ b/src/x87/full-codegen-x87.cc
@@ -13,7 +13,6 @@
 #include "src/debug.h"
 #include "src/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/isolate-inl.h"
 #include "src/parser.h"
 #include "src/scopes.h"
 
diff --git a/src/x87/macro-assembler-x87.cc b/src/x87/macro-assembler-x87.cc
index d5d2064..487790d 100644
--- a/src/x87/macro-assembler-x87.cc
+++ b/src/x87/macro-assembler-x87.cc
@@ -12,7 +12,6 @@
 #include "src/codegen.h"
 #include "src/cpu-profiler.h"
 #include "src/debug.h"
-#include "src/isolate-inl.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {
diff --git a/test/cctest/cctest.h b/test/cctest/cctest.h
index 08877c8..634552c 100644
--- a/test/cctest/cctest.h
+++ b/test/cctest/cctest.h
@@ -30,8 +30,6 @@
 
 #include "src/v8.h"
 
-#include "src/isolate-inl.h"
-
 #ifndef TEST
 #define TEST(Name)                                                             \
   static void Test##Name();                                                    \
diff --git a/test/cctest/compiler/test-run-machops.cc b/test/cctest/compiler/test-run-machops.cc
index 9c143ca..147bc85 100644
--- a/test/cctest/compiler/test-run-machops.cc
+++ b/test/cctest/compiler/test-run-machops.cc
@@ -7,6 +7,7 @@
 #include <limits>
 
 #include "src/base/bits.h"
+#include "src/base/utils/random-number-generator.h"
 #include "src/codegen.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/codegen-tester.h"
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index 3a6ebc8..00c262a 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -41,6 +41,7 @@
 #include "src/arguments.h"
 #include "src/base/platform/platform.h"
 #include "src/compilation-cache.h"
+#include "src/debug.h"
 #include "src/execution.h"
 #include "src/objects.h"
 #include "src/parser.h"
diff --git a/test/cctest/test-assembler-arm.cc b/test/cctest/test-assembler-arm.cc
index 250206b..cb89577 100644
--- a/test/cctest/test-assembler-arm.cc
+++ b/test/cctest/test-assembler-arm.cc
@@ -32,6 +32,7 @@
 
 #include "src/arm/assembler-arm-inl.h"
 #include "src/arm/simulator-arm.h"
+#include "src/base/utils/random-number-generator.h"
 #include "src/disassembler.h"
 #include "src/factory.h"
 #include "src/ostreams.h"
diff --git a/test/cctest/test-assembler-arm64.cc b/test/cctest/test-assembler-arm64.cc
index e54c489..0500bb3 100644
--- a/test/cctest/test-assembler-arm64.cc
+++ b/test/cctest/test-assembler-arm64.cc
@@ -37,6 +37,7 @@
 #include "src/arm64/disasm-arm64.h"
 #include "src/arm64/simulator-arm64.h"
 #include "src/arm64/utils-arm64.h"
+#include "src/base/utils/random-number-generator.h"
 #include "src/macro-assembler.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/test-utils-arm64.h"
diff --git a/test/cctest/test-assembler-ia32.cc b/test/cctest/test-assembler-ia32.cc
index aa6cba5..e62cc21 100644
--- a/test/cctest/test-assembler-ia32.cc
+++ b/test/cctest/test-assembler-ia32.cc
@@ -30,6 +30,7 @@
 #include "src/v8.h"
 
 #include "src/base/platform/platform.h"
+#include "src/base/utils/random-number-generator.h"
 #include "src/disassembler.h"
 #include "src/factory.h"
 #include "src/macro-assembler.h"
diff --git a/test/cctest/test-assembler-mips.cc b/test/cctest/test-assembler-mips.cc
index 5ad9706..9671ca1 100644
--- a/test/cctest/test-assembler-mips.cc
+++ b/test/cctest/test-assembler-mips.cc
@@ -29,6 +29,7 @@
 
 #include "src/v8.h"
 
+#include "src/base/utils/random-number-generator.h"
 #include "src/disassembler.h"
 #include "src/factory.h"
 #include "src/macro-assembler.h"
diff --git a/test/cctest/test-assembler-mips64.cc b/test/cctest/test-assembler-mips64.cc
index 308cd4d..269cc05 100644
--- a/test/cctest/test-assembler-mips64.cc
+++ b/test/cctest/test-assembler-mips64.cc
@@ -29,6 +29,7 @@
 
 #include "src/v8.h"
 
+#include "src/base/utils/random-number-generator.h"
 #include "src/disassembler.h"
 #include "src/factory.h"
 #include "src/macro-assembler.h"
diff --git a/test/cctest/test-assembler-x64.cc b/test/cctest/test-assembler-x64.cc
index f62b86d..c067ac4 100644
--- a/test/cctest/test-assembler-x64.cc
+++ b/test/cctest/test-assembler-x64.cc
@@ -31,6 +31,7 @@
 #include "src/v8.h"
 
 #include "src/base/platform/platform.h"
+#include "src/base/utils/random-number-generator.h"
 #include "src/factory.h"
 #include "src/macro-assembler.h"
 #include "src/ostreams.h"
diff --git a/test/cctest/test-assembler-x87.cc b/test/cctest/test-assembler-x87.cc
index f83bbbd..d6a0d2d 100644
--- a/test/cctest/test-assembler-x87.cc
+++ b/test/cctest/test-assembler-x87.cc
@@ -30,6 +30,7 @@
 #include "src/v8.h"
 
 #include "src/base/platform/platform.h"
+#include "src/base/utils/random-number-generator.h"
 #include "src/disassembler.h"
 #include "src/factory.h"
 #include "src/macro-assembler.h"
diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc
index 54052ef..f461eff 100644
--- a/test/cctest/test-heap-profiler.cc
+++ b/test/cctest/test-heap-profiler.cc
@@ -36,7 +36,6 @@
 #include "src/debug.h"
 #include "src/hashmap.h"
 #include "src/heap-profiler.h"
-#include "src/utils-inl.h"
 #include "test/cctest/cctest.h"
 
 using i::AllocationTraceNode;
diff --git a/test/cctest/test-random-number-generator.cc b/test/cctest/test-random-number-generator.cc
index 04b5882..cc94930 100644
--- a/test/cctest/test-random-number-generator.cc
+++ b/test/cctest/test-random-number-generator.cc
@@ -29,7 +29,6 @@
 #include "test/cctest/cctest.h"
 
 #include "src/base/utils/random-number-generator.h"
-#include "src/isolate-inl.h"
 
 using namespace v8::internal;
 
diff --git a/test/cctest/test-types.cc b/test/cctest/test-types.cc
index 023d775..295cef6 100644
--- a/test/cctest/test-types.cc
+++ b/test/cctest/test-types.cc
@@ -5,7 +5,6 @@
 #include <vector>
 
 #include "src/hydrogen-types.h"
-#include "src/isolate-inl.h"
 #include "src/types.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/types-fuzz.h"
diff --git a/test/cctest/test-utils.cc b/test/cctest/test-utils.cc
index 46adc0b..5045b7e 100644
--- a/test/cctest/test-utils.cc
+++ b/test/cctest/test-utils.cc
@@ -32,7 +32,6 @@
 #include "src/v8.h"
 
 #include "src/base/platform/platform.h"
-#include "src/utils-inl.h"
 #include "test/cctest/cctest.h"
 
 using namespace v8::internal;
diff --git a/test/unittests/test-utils.cc b/test/unittests/test-utils.cc
index c49aac5..aa37b2f 100644
--- a/test/unittests/test-utils.cc
+++ b/test/unittests/test-utils.cc
@@ -5,8 +5,9 @@
 #include "test/unittests/test-utils.h"
 
 #include "src/base/platform/time.h"
+#include "src/debug.h"
 #include "src/flags.h"
-#include "src/isolate-inl.h"
+#include "src/isolate.h"
 
 namespace v8 {
 
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 7587afb..e1bee3e 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -904,7 +904,6 @@
         '../../src/unicode-decoder.cc',
         '../../src/unicode-decoder.h',
         '../../src/unique.h',
-        '../../src/utils-inl.h',
         '../../src/utils.cc',
         '../../src/utils.h',
         '../../src/v8.cc',