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 866943b98a9dc74a0774effcb9d0ea6edd8be1eb..fb0c577817c037e0823aba8d30c7cf32dddcdf51 100644 (file)
--- 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 e7924533ac25bd2a27de3b96116f9a7d2ca7361d..c95f2ce2553210a33374c1fee23282096b05b862 100644 (file)
--- 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 0cc48e7509782ae2533bcbdcf01f8cb52e921289..fb6227beff84050d57d5b74444101be00774c5ba 100644 (file)
--- 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 8f93bd9d73d5ff2eddd9c67a8e3b1a0ba791ee82..12108a00404f5764727e272e69daa3d3adf10de3 100644 (file)
--- 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 c2240ce803d142a10521e72a3b97b01ed5116ae0..60c6b51580ba88faa702a0aa1d249f7fcc02fc47 100644 (file)
--- 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 5df2e5a46d50f4d901e61921605475fcd88b600c..07e237e0b498906361f9103c19990dee78ff4dc7 100644 (file)
--- 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 e5924cdf75df81c057cfb109ba695cc706ee7469..1464074b894640d8d19e9104b96849e9526581f8 100644 (file)
--- 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 e3ac31025cd878f524011571a93234c471f1cc8f..3b91cf4389777a1377546b0a327c9f4e3d7239e6 100644 (file)
--- 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 7b8084eb87bdd4523c230025f2b1969abfe7ddf4..e11aff607f78a3f9e406dfedcce0a37ac7583f98 100644 (file)
--- 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 ea5660d1e34e1224cee370833ecd2d2669ac6392..524eca8d87938f2e31b9df7036af988d64d2c764 100644 (file)
--- 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 25407a746fc5a61b6e58e7e2fd1367427bb160f3..49700ee57f9550dba0ac85600ed9da470696b301 100644 (file)
--- 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 ad7d7f6020b7b36865fa5ee584c59981622dc862..97c660e10fbb80339c45e29b4a23ae60554b5f14 100644 (file)
--- 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 106f3d75d3d27775ba2d13f6e27989f4521a3903..eda7cdda84e18fc2d18fa1479cbdc986c68217bc 100644 (file)
--- 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 50a328a714411a43f110b48f369deb9d11d71d0f..428def407da6cacb55127aacaa764ec84d7467d3 100644 (file)
--- 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 66255f28eaf1d5406b57aa22a11472e7434227f6..822077dd1708bc1b30ffbc9e07c150408e579443 100644 (file)
--- 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 f3322b64558dc67e0abbd4a7fbe2afb31ca54397..97d604a7c248ee317dfc0b9635eedeaa01cf68fa 100644 (file)
--- 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 b3f36f5bd6f70eb27b2da2085dcfdc4cee81b99e..e2dda91189109a1d2a1c11a7bedd21a653d0b353 100644 (file)
--- 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 9c024841c9c4e462b75cf947471ec507dd00fdcb..4d599eef8d4186fbb1dfb7a780445ad8f8008a1b 100644 (file)
--- 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 (file)
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 34b96730103894efcf4e026ae5e682ea0d9df764..8ffa7c8a1371c27cf1b36983e9873fafd3cbea80 100644 (file)
--- 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 a434edd440c68c4b9d48d93c07a2a16aa9ec344d..ab2efd78f1768fec872aac41193c955e76b7d0a0 100644 (file)
--- 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 156e87eb1948b1e894ca3359af7a41f9ebb56e9b..c479208f01175205e9f053e2b62ac0f55c554e43 100644 (file)
--- 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 eb009da740a30b68cda213d327c11f3af1de061c..030a634ce93b614ada27cc52764ae3581199f5d6 100644 (file)
--- 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 0379a0eb0c80cb4b642d30f0831907b624acba5a..2f59f363878695234705b9d983f767cdd302eb18 100644 (file)
--- 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 03f85350cb5a8fa23486af5d4fdc08aed05c012c..0e7955de00d4be4d9b81802bc2ba5e8f6ab80f8b 100644 (file)
--- 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 74886c93f3b305524dc8eb4273dd6861536a4199..f1742f32f68aefac24f671c37867765e18a006b4 100644 (file)
--- 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 c02d0948d3b0a44b60418c2870cffa39119b5635..17b7bf31fa088718be5007950eaf910a0fe74d5c 100644 (file)
--- 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 5231f4ae4be4e7050c5bed137ec464be6b96e774..e075c170145d40c92ff99b1d765986e926294b5f 100644 (file)
--- 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 d78c3ed8dcef6af98a1989279f5f831773ecc5ab..ce3b2e0d0790d460a8d5a04751db5347849937be 100644 (file)
--- 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 (file)
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 e71419ac8c44a352ada1994964705c45979c423c..517e7a9641fb7615f59beb6242868a9df4aa38da 100644 (file)
--- 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 109c1a52a98cc805705ecfaeefe50aa83460c7d3..5e5b57ced238e88a5f0da1dbf3e7e1c60f63034b 100644 (file)
--- 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 62eee669112c1c43d49508ad44216465a894f36d..167abcc310642710c6bbe9fe57735e38c277189b 100644 (file)
--- 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 72489f5d1b299c14e24cd580d175d4b3d6e680f2..3b37bda125005d7f4e162533423f57b3085428d6 100644 (file)
--- 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 736d33dadce30cdfcc9571eb4b50dc13d6ad3c73..94ac074de3ec0b44d0a3efc4cd76710d7d718702 100644 (file)
--- 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 (file)
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 5790d878b9a4b87d24f74466c831d35241d1d935..070ae7cabebaec1aaa2b456d6773115361651716 100644 (file)
--- 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 90d309504218bffd333366d1a2c03752c71bfb58..2ad757f843c5e47feb0583f7d3e8ef95ff7247de 100644 (file)
--- 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 f9b3f39ac90e024e799a70f7863e7d79f4ef4adc..0e70826df2297d003f28c3de27577394fd9b57a2 100644 (file)
--- 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 ccbd2238153835484a0961bb5aa0bc5fcf40b6a5..709e567a5b6dc378d4165fc4890f0af1a0e69c18 100644 (file)
--- 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 d5d2064b9609f62e8ecd8753cff2d80b1119dfd4..487790d9b6ac4e9546fb64f38a1a80e4ff05135b 100644 (file)
--- 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 08877c8268bc8641a8020b706de25d5f1c4aea53..634552c6b26a9f769ce5cfcf534c24eeee908ff5 100644 (file)
--- 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 9c143caa7df556633763680e0d28a8b24202a1b2..147bc85418f409fc3b6a04ae1cf46b9089520919 100644 (file)
--- 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 3a6ebc803d4068e097d01e484aa33d3453c32e85..00c262ad9c34b220414fc2bd1be1be32822f7bdf 100644 (file)
--- 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 250206b899f58471b0b1716c593e0df2bb022708..cb8957799155128143d4548066ebef1037f66715 100644 (file)
--- 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 e54c4894b75c20e118372edf0bfc79deefa29acd..0500bb3c1a0f6965908d953a0fb9663d08b848de 100644 (file)
--- 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 aa6cba581375235a20182078aef7a7ab666f3ef4..e62cc210eb04bfbe1449ed53826d7917e32449a4 100644 (file)
--- 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 5ad9706e33ef73df4cf682528f1b343dd4374b87..9671ca143eda3068e299cdb73fdf5ac498068456 100644 (file)
--- 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 308cd4d5151be6964e26c8fc54cbb5a6ddf998ee..269cc051a625145223b6e96adb0ea9e4befc6ff0 100644 (file)
--- 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 f62b86db416de562e7e70f4d3725259a25b87e00..c067ac46f2c8de63cd582cbc3a1425eab773d7cb 100644 (file)
--- 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 f83bbbd0d8e42422a99a948cc31e77361eff2d55..d6a0d2d461caf4b39cd55019f1886e1d4818afe3 100644 (file)
--- 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 54052ef560eb44b19fdaec6a8ca4c529f13d7a66..f461eff949c0337b8cbcc26f8fae6003a090d652 100644 (file)
--- 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 04b58820a208d71c62e49302a5f15d2168504e83..cc9493041c438bd518f5ee889f15625b243dae0e 100644 (file)
--- 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 023d775d5186f3a22b1b4b598e75b5030909e48b..295cef6d36993292d78b5408ed615505fb477f54 100644 (file)
--- 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 46adc0b23d8d5e51d30cb50981e95acab93dbc20..5045b7e591ae1bd54203051066423d8339fa2291 100644 (file)
--- 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 c49aac5216f27fbdd2f4fc93c920b62e29706082..aa37b2f30d8c0c5af24b6215d15d2f609727c586 100644 (file)
--- 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 7587afb34382e95bee86769b82240fd024976c74..e1bee3e1df4e04a45fc745fdf055dc4db86b07ff 100644 (file)
--- 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',