[turbofan] Remove obsolete unique.h includes in TurboFan.

Now that it is no longer needed, this also removes the invalid inclusion
of "object-inl.h" within the "unique.h" header file.

Note that this change still leaves 2 violations of that rule in the
code, checked with the "tools/check-inline-includes.sh" tool.

R=bmeurer@chromium.org

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

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

diff --git a/src/compiler/common-operator.cc b/src/compiler/common-operator.cc
index 28784562adfe1b95211b54d87530f5c7597a3e03..bacaae980f918eddf24abbca60e2f16657a6a499 100644 (file)
--- a/src/compiler/common-operator.cc
+++ b/src/compiler/common-operator.cc
@@ -9,7 +9,7 @@
 #include "src/compiler/linkage.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator.h"
-#include "src/unique.h"
+#include "src/handles-inl.h"
 #include "src/zone.h"
 
 namespace v8 {

diff --git a/src/compiler/common-operator.h b/src/compiler/common-operator.h
index 2c3d34c3d78a9a10b767401ace6d62df1fc0440b..22490f7fe1ad682b7b67280642d0758d15fd5497 100644 (file)
--- a/src/compiler/common-operator.h
+++ b/src/compiler/common-operator.h
@@ -7,7 +7,7 @@
 
 #include "src/compiler/frame-states.h"
 #include "src/compiler/machine-type.h"
-#include "src/unique.h"
+#include "src/zone-containers.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/compiler/interpreter-assembler.h b/src/compiler/interpreter-assembler.h
index b0ec37d0a664b8121c835f57b39d722172c91925..bb771eb2163f9323826ecc7e930640ba27e391fc 100644 (file)
--- a/src/compiler/interpreter-assembler.h
+++ b/src/compiler/interpreter-assembler.h
@@ -12,7 +12,6 @@
 #include "src/builtins.h"
 #include "src/frames.h"
 #include "src/interpreter/bytecodes.h"
-#include "src/unique.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/compiler/js-builtin-reducer.cc b/src/compiler/js-builtin-reducer.cc
index 97e1de098c614827fe67af1305fc9e813ea381fb..eb24bc2b8aaff5d8c745b1d8d3456a84fde2b409 100644 (file)
--- a/src/compiler/js-builtin-reducer.cc
+++ b/src/compiler/js-builtin-reducer.cc
@@ -7,6 +7,7 @@
 #include "src/compiler/js-graph.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
+#include "src/objects-inl.h"
 #include "src/types.h"
 
 namespace v8 {

diff --git a/src/compiler/js-context-specialization.cc b/src/compiler/js-context-specialization.cc
index 66780c2ac3834a1c829917c100236cf3e065d7c2..496d014546252282f99270137197f377c8cccaaa 100644 (file)
--- a/src/compiler/js-context-specialization.cc
+++ b/src/compiler/js-context-specialization.cc
@@ -10,6 +10,7 @@
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
 #include "src/contexts.h"
+#include "src/objects-inl.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/compiler/js-generic-lowering.cc b/src/compiler/js-generic-lowering.cc
index 47bf0df5a40ab7e8e2a5fa9d3db68d166e242a57..d51ee9d1bdee781d6e43e1ba48cf6cc830f436f9 100644 (file)
--- a/src/compiler/js-generic-lowering.cc
+++ b/src/compiler/js-generic-lowering.cc
@@ -11,7 +11,6 @@
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
 #include "src/compiler/operator-properties.h"
-#include "src/unique.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/compiler/js-graph.h b/src/compiler/js-graph.h
index a22a93f4f703567f6855bffa959e490241cba5fb..4f23773259df561aae3f1e1aec6496b7a4d60dde 100644 (file)
--- a/src/compiler/js-graph.h
+++ b/src/compiler/js-graph.h
@@ -11,6 +11,7 @@
 #include "src/compiler/js-operator.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node-properties.h"
+#include "src/isolate.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/compiler/js-inlining.cc b/src/compiler/js-inlining.cc
index f7457e706d6874c49f3c7520b9bde05a6318402b..03e6384080ccba3dbb4b5b87a2065c78b4b0f036 100644 (file)
--- a/src/compiler/js-inlining.cc
+++ b/src/compiler/js-inlining.cc
@@ -6,6 +6,7 @@
 
 #include "src/ast.h"
 #include "src/ast-numbering.h"
+#include "src/compiler.h"
 #include "src/compiler/all-nodes.h"
 #include "src/compiler/ast-graph-builder.h"
 #include "src/compiler/common-operator.h"

diff --git a/src/compiler/js-inlining.h b/src/compiler/js-inlining.h
index b075024dd372f440cfaf634a902f00613f2f0b41..21057e61e40612154c61f75e6d81614263eb770e 100644 (file)
--- a/src/compiler/js-inlining.h
+++ b/src/compiler/js-inlining.h
@@ -10,8 +10,13 @@
 
 namespace v8 {
 namespace internal {
+
+// Forward declarations.
+class CompilationInfo;
+
 namespace compiler {
 
+// Forward declarations.
 class JSCallFunctionAccessor;
 
 class JSInliner final : public AdvancedReducer {

diff --git a/src/compiler/js-intrinsic-lowering.cc b/src/compiler/js-intrinsic-lowering.cc
index 068dbec23f07c6c948b2d6ae8362bd059ff294bf..2b889b27ee9aa4b9685812e4ea2793528ae0ceeb 100644 (file)
--- a/src/compiler/js-intrinsic-lowering.cc
+++ b/src/compiler/js-intrinsic-lowering.cc
@@ -11,6 +11,8 @@
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
 #include "src/compiler/operator-properties.h"
+#include "src/counters.h"
+#include "src/objects-inl.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/compiler/js-operator.cc b/src/compiler/js-operator.cc
index f551b881fd32b66f08cc7a06b1a4d23625503aa6..d39efce87e11eea63d5bd6405f7088866666e1e7 100644 (file)
--- a/src/compiler/js-operator.cc
+++ b/src/compiler/js-operator.cc
@@ -9,11 +9,21 @@
 #include "src/base/lazy-instance.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator.h"
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
+#include "src/type-feedback-vector-inl.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
+VectorSlotPair::VectorSlotPair() : slot_(FeedbackVectorICSlot::Invalid()) {}
+
+
+int VectorSlotPair::index() const {
+  return vector_.is_null() ? -1 : vector_->GetIndex(slot_);
+}
+
+
 bool operator==(VectorSlotPair const& lhs, VectorSlotPair const& rhs) {
   return lhs.slot() == rhs.slot() &&
          lhs.vector().location() == rhs.vector().location();

diff --git a/src/compiler/js-operator.h b/src/compiler/js-operator.h
index d583f6414e4aa46a91189c811e38ec07c8b4f195..4776a8fe30b88778cc7bde565088919d6ab6a430 100644 (file)
--- a/src/compiler/js-operator.h
+++ b/src/compiler/js-operator.h
@@ -6,7 +6,6 @@
 #define V8_COMPILER_JS_OPERATOR_H_
 
 #include "src/runtime/runtime.h"
-#include "src/unique.h"
 
 namespace v8 {
 namespace internal {
@@ -21,7 +20,7 @@ struct JSOperatorGlobalCache;
 // is used to access the type feedback for a certain {Node}.
 class VectorSlotPair {
  public:
-  VectorSlotPair() : slot_(FeedbackVectorICSlot::Invalid()) {}
+  VectorSlotPair();
   VectorSlotPair(Handle<TypeFeedbackVector> vector, FeedbackVectorICSlot slot)
       : vector_(vector), slot_(slot) {}
 
@@ -30,9 +29,7 @@ class VectorSlotPair {
   Handle<TypeFeedbackVector> vector() const { return vector_; }
   FeedbackVectorICSlot slot() const { return slot_; }
 
-  int index() const {
-    return vector_.is_null() ? -1 : vector_->GetIndex(slot_);
-  }
+  int index() const;
 
  private:
   const Handle<TypeFeedbackVector> vector_;

diff --git a/src/compiler/js-type-feedback-lowering.cc b/src/compiler/js-type-feedback-lowering.cc
index 6f43c4e8f42cbcd6d3a67b7ff393507e1f7bf3d8..17effa4779d68d0ef47aab9e384469e9ffb7d30e 100644 (file)
--- a/src/compiler/js-type-feedback-lowering.cc
+++ b/src/compiler/js-type-feedback-lowering.cc
@@ -7,6 +7,8 @@
 #include "src/compiler/access-builder.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/node-properties.h"
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
+#include "src/type-feedback-vector.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/compiler/node-matchers.h b/src/compiler/node-matchers.h
index 1e9945c9d9b3221b808657e0022559469840b5a1..bafe3daa683b7ef7f937ef5268f5c520b3f56d02 100644 (file)
--- a/src/compiler/node-matchers.h
+++ b/src/compiler/node-matchers.h
@@ -11,7 +11,6 @@
 #include "src/assembler.h"
 #include "src/compiler/node.h"
 #include "src/compiler/operator.h"
-#include "src/unique.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/compiler/raw-machine-assembler.h b/src/compiler/raw-machine-assembler.h
index 994f0d9f09265be59ef49e8b256b89ebeb351dda..6e081ccaacd8f115ed3a7c697771eb25c4251158 100644 (file)
--- a/src/compiler/raw-machine-assembler.h
+++ b/src/compiler/raw-machine-assembler.h
@@ -12,6 +12,7 @@
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
 #include "src/compiler/operator.h"
+#include "src/factory.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/compiler/simplified-operator-reducer.cc b/src/compiler/simplified-operator-reducer.cc
index e8e579202431c05b5c383199e86d0b11b39a3e21..30bf47e29363fb076b6685bc342dc5b7dd0820b0 100644 (file)
--- a/src/compiler/simplified-operator-reducer.cc
+++ b/src/compiler/simplified-operator-reducer.cc
@@ -8,6 +8,7 @@
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/operator-properties.h"
+#include "src/conversions-inl.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/compiler/typer.cc b/src/compiler/typer.cc
index 778d96fb0732867a766c2988482f311e1afb8ded..e0276ab7cd78a84688239970d6498408881fd495 100644 (file)
--- a/src/compiler/typer.cc
+++ b/src/compiler/typer.cc
@@ -13,6 +13,7 @@
 #include "src/compiler/node.h"
 #include "src/compiler/node-properties.h"
 #include "src/compiler/simplified-operator.h"
+#include "src/objects-inl.h"
 #include "src/zone-type-cache.h"
 
 namespace v8 {

diff --git a/src/compiler/verifier.cc b/src/compiler/verifier.cc
index 690fd045779fa7486282d88eed39b2ad21a061fb..10f47556d2252168d5097e1b75dedca88cbc5538 100644 (file)
--- a/src/compiler/verifier.cc
+++ b/src/compiler/verifier.cc
@@ -22,6 +22,7 @@
 #include "src/compiler/schedule.h"
 #include "src/compiler/simplified-operator.h"
 #include "src/ostreams.h"
+#include "src/types-inl.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/frames-inl.h b/src/frames-inl.h
index e69bcd90338dd8f56fe7c87c5c5f0194f499ff38..cccd4d191a9b26d87d28311eef733969af887008 100644 (file)
--- a/src/frames-inl.h
+++ b/src/frames-inl.h
@@ -7,6 +7,7 @@
 
 #include "src/frames.h"
 #include "src/isolate.h"
+#include "src/objects-inl.h"
 #include "src/v8memory.h"
 
 #if V8_TARGET_ARCH_IA32

diff --git a/src/unique.h b/src/unique.h
index 68a45963b860ed8ff0d50e14f679ff2b5698e4a7..8805218b1ff280229ba7c938feeed0179cdb3a52 100644 (file)
--- a/src/unique.h
+++ b/src/unique.h
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_HYDROGEN_UNIQUE_H_
-#define V8_HYDROGEN_UNIQUE_H_
+#ifndef V8_UNIQUE_H_
+#define V8_UNIQUE_H_
 
 #include <ostream>  // NOLINT(readability/streams)
 
 #include "src/base/functional.h"
 #include "src/handles.h"
-#include "src/objects-inl.h"  // TODO(everyone): Fix our inl.h crap
 #include "src/utils.h"
 #include "src/zone.h"
 
@@ -358,4 +357,4 @@ class UniqueSet final : public ZoneObject {
 
 } }  // namespace v8::internal
 
-#endif  // V8_HYDROGEN_UNIQUE_H_
+#endif  // V8_UNIQUE_H_

diff --git a/test/unittests/compiler/graph-unittest.cc b/test/unittests/compiler/graph-unittest.cc
index 2b297100c2cd0cc94fd09687cc1a01c2f2aee129..991ecc2f7c2f5de94b9695e7b9852bef7fbed31d 100644 (file)
--- a/test/unittests/compiler/graph-unittest.cc
+++ b/test/unittests/compiler/graph-unittest.cc
@@ -5,6 +5,8 @@
 #include "test/unittests/compiler/graph-unittest.h"
 
 #include "src/compiler/node-properties.h"
+#include "src/factory.h"
+#include "src/objects-inl.h"  // TODO(everyone): Make typer.h IWYU compliant.
 #include "test/unittests/compiler/node-test-utils.h"
 
 namespace v8 {

diff --git a/test/unittests/compiler/interpreter-assembler-unittest.cc b/test/unittests/compiler/interpreter-assembler-unittest.cc
index b4dfc4a59bad4918effffdd9c40f2c73bde4c6e9..e1d19338e7cbe0e6aecaedeef413a1ea8639952c 100644 (file)
--- a/test/unittests/compiler/interpreter-assembler-unittest.cc
+++ b/test/unittests/compiler/interpreter-assembler-unittest.cc
@@ -6,7 +6,7 @@
 
 #include "src/compiler/graph.h"
 #include "src/compiler/node.h"
-#include "src/unique.h"
+#include "src/isolate.h"
 #include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/compiler/node-test-utils.h"
 

diff --git a/test/unittests/compiler/machine-operator-reducer-unittest.cc b/test/unittests/compiler/machine-operator-reducer-unittest.cc
index b14e9d392d8bb649376f8721de52f497c05568ab..8ca815be851a4485836226166b7839bd582b7194 100644 (file)
--- a/test/unittests/compiler/machine-operator-reducer-unittest.cc
+++ b/test/unittests/compiler/machine-operator-reducer-unittest.cc
@@ -7,6 +7,7 @@
 #include "src/compiler/js-graph.h"
 #include "src/compiler/machine-operator-reducer.h"
 #include "src/compiler/typer.h"
+#include "src/conversions-inl.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
 #include "testing/gmock-support.h"

diff --git a/test/unittests/compiler/node-test-utils.cc b/test/unittests/compiler/node-test-utils.cc
index 7d91588cd2b07808cbcdb0b3fbe3cfae249558b0..d401532e826f22ef8e111c894c559280a89b1bf4 100644 (file)
--- a/test/unittests/compiler/node-test-utils.cc
+++ b/test/unittests/compiler/node-test-utils.cc
@@ -11,7 +11,7 @@
 #include "src/compiler/js-operator.h"
 #include "src/compiler/node-properties.h"
 #include "src/compiler/simplified-operator.h"
-#include "src/unique.h"
+#include "src/handles-inl.h"
 
 using testing::_;
 using testing::MakeMatcher;

diff --git a/test/unittests/compiler/simplified-operator-reducer-unittest.cc b/test/unittests/compiler/simplified-operator-reducer-unittest.cc
index b625d12888e0f0e41daa1d94b53fdbc6efeb94ce..79e530f22830a7291f3e5a9a6b168dd31848d0f3 100644 (file)
--- a/test/unittests/compiler/simplified-operator-reducer-unittest.cc
+++ b/test/unittests/compiler/simplified-operator-reducer-unittest.cc
@@ -7,7 +7,7 @@
 #include "src/compiler/node-properties.h"
 #include "src/compiler/simplified-operator.h"
 #include "src/compiler/simplified-operator-reducer.h"
-#include "src/conversions.h"
+#include "src/conversions-inl.h"
 #include "src/types.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"