From 5fad6a80757e26ad11615d46df5d85388c720e86 Mon Sep 17 00:00:00 2001 From: ishell Date: Tue, 6 Dec 2016 03:08:24 -0800 Subject: [PATCH] Move code-stub-assembler.h includes from builtins-utils.h to respective .cc files. BUG= Review-Url: https://codereview.chromium.org/2558443002 Cr-Commit-Position: refs/heads/master@{#41511} --- src/builtins/builtins-array.cc | 1 + src/builtins/builtins-boolean.cc | 3 ++- src/builtins/builtins-conversion.cc | 3 ++- src/builtins/builtins-date.cc | 4 ++-- src/builtins/builtins-function.cc | 4 ++-- src/builtins/builtins-generator.cc | 4 ++-- src/builtins/builtins-global.cc | 4 ++-- src/builtins/builtins-handler.cc | 1 + src/builtins/builtins-internal.cc | 3 ++- src/builtins/builtins-iterator.cc | 1 + src/builtins/builtins-math.cc | 4 ++-- src/builtins/builtins-object.cc | 4 ++-- src/builtins/builtins-promise.cc | 2 +- src/builtins/builtins-regexp.cc | 2 +- src/builtins/builtins-sharedarraybuffer.cc | 4 ++-- src/builtins/builtins-string.cc | 4 ++-- src/builtins/builtins-symbol.cc | 3 ++- src/builtins/builtins-typedarray.cc | 3 ++- src/builtins/builtins-utils.h | 5 ++++- src/compiler/linkage.cc | 1 - 20 files changed, 35 insertions(+), 25 deletions(-) diff --git a/src/builtins/builtins-array.cc b/src/builtins/builtins-array.cc index 71aa5995ff..bb9fc3db5e 100644 --- a/src/builtins/builtins-array.cc +++ b/src/builtins/builtins-array.cc @@ -6,6 +6,7 @@ #include "src/builtins/builtins-utils.h" #include "src/code-factory.h" +#include "src/code-stub-assembler.h" #include "src/contexts.h" #include "src/elements.h" diff --git a/src/builtins/builtins-boolean.cc b/src/builtins/builtins-boolean.cc index 71259aa772..81232230ff 100644 --- a/src/builtins/builtins-boolean.cc +++ b/src/builtins/builtins-boolean.cc @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" +#include "src/builtins/builtins.h" +#include "src/code-stub-assembler.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-conversion.cc b/src/builtins/builtins-conversion.cc index 3a24c98d32..b32f5660d9 100644 --- a/src/builtins/builtins-conversion.cc +++ b/src/builtins/builtins-conversion.cc @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" +#include "src/builtins/builtins.h" #include "src/code-factory.h" +#include "src/code-stub-assembler.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-date.cc b/src/builtins/builtins-date.cc index 86cee0e6b5..08db0bb86b 100644 --- a/src/builtins/builtins-date.cc +++ b/src/builtins/builtins-date.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" - +#include "src/builtins/builtins.h" +#include "src/code-stub-assembler.h" #include "src/dateparser-inl.h" namespace v8 { diff --git a/src/builtins/builtins-function.cc b/src/builtins/builtins-function.cc index 517ce4a969..cab0f3261b 100644 --- a/src/builtins/builtins-function.cc +++ b/src/builtins/builtins-function.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" - +#include "src/builtins/builtins.h" #include "src/code-factory.h" +#include "src/code-stub-assembler.h" #include "src/compiler.h" #include "src/string-builder.h" diff --git a/src/builtins/builtins-generator.cc b/src/builtins/builtins-generator.cc index d70e3bfa4b..5c53ec9dd6 100644 --- a/src/builtins/builtins-generator.cc +++ b/src/builtins/builtins-generator.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" - +#include "src/builtins/builtins.h" #include "src/code-factory.h" +#include "src/code-stub-assembler.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-global.cc b/src/builtins/builtins-global.cc index 27d2d3b8b3..6c97a0bbad 100644 --- a/src/builtins/builtins-global.cc +++ b/src/builtins/builtins-global.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" - +#include "src/builtins/builtins.h" #include "src/code-factory.h" +#include "src/code-stub-assembler.h" #include "src/compiler.h" #include "src/uri.h" diff --git a/src/builtins/builtins-handler.cc b/src/builtins/builtins-handler.cc index 2555380edb..c4b61850a7 100644 --- a/src/builtins/builtins-handler.cc +++ b/src/builtins/builtins-handler.cc @@ -4,6 +4,7 @@ #include "src/builtins/builtins-utils.h" #include "src/builtins/builtins.h" +#include "src/code-stub-assembler.h" #include "src/ic/accessor-assembler.h" #include "src/ic/handler-compiler.h" #include "src/ic/ic.h" diff --git a/src/builtins/builtins-internal.cc b/src/builtins/builtins-internal.cc index 560180c7f3..a8c98bf0c1 100644 --- a/src/builtins/builtins-internal.cc +++ b/src/builtins/builtins-internal.cc @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" +#include "src/builtins/builtins.h" +#include "src/code-stub-assembler.h" #include "src/interface-descriptors.h" #include "src/macro-assembler.h" diff --git a/src/builtins/builtins-iterator.cc b/src/builtins/builtins-iterator.cc index b2a23e2134..b24073ac78 100644 --- a/src/builtins/builtins-iterator.cc +++ b/src/builtins/builtins-iterator.cc @@ -4,6 +4,7 @@ #include "src/builtins/builtins-utils.h" #include "src/builtins/builtins.h" +#include "src/code-stub-assembler.h" #include "src/frames-inl.h" namespace v8 { diff --git a/src/builtins/builtins-math.cc b/src/builtins/builtins-math.cc index 82c4894768..f8bc3e194d 100644 --- a/src/builtins/builtins-math.cc +++ b/src/builtins/builtins-math.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" - +#include "src/builtins/builtins.h" #include "src/code-factory.h" +#include "src/code-stub-assembler.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-object.cc b/src/builtins/builtins-object.cc index 93c43ab5db..85254d5dcd 100644 --- a/src/builtins/builtins-object.cc +++ b/src/builtins/builtins-object.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" - +#include "src/builtins/builtins.h" #include "src/code-factory.h" +#include "src/code-stub-assembler.h" #include "src/property-descriptor.h" namespace v8 { diff --git a/src/builtins/builtins-promise.cc b/src/builtins/builtins-promise.cc index e3c4418f75..b1cfa91c44 100644 --- a/src/builtins/builtins-promise.cc +++ b/src/builtins/builtins-promise.cc @@ -4,8 +4,8 @@ #include "src/builtins/builtins-utils.h" #include "src/builtins/builtins.h" - #include "src/code-factory.h" +#include "src/code-stub-assembler.h" #include "src/promise-utils.h" namespace v8 { diff --git a/src/builtins/builtins-regexp.cc b/src/builtins/builtins-regexp.cc index 2ad9c4f188..a08823553f 100644 --- a/src/builtins/builtins-regexp.cc +++ b/src/builtins/builtins-regexp.cc @@ -4,8 +4,8 @@ #include "src/builtins/builtins-utils.h" #include "src/builtins/builtins.h" - #include "src/code-factory.h" +#include "src/code-stub-assembler.h" #include "src/regexp/jsregexp.h" #include "src/regexp/regexp-utils.h" #include "src/string-builder.h" diff --git a/src/builtins/builtins-sharedarraybuffer.cc b/src/builtins/builtins-sharedarraybuffer.cc index 7e0a1c3895..4ffff7a292 100644 --- a/src/builtins/builtins-sharedarraybuffer.cc +++ b/src/builtins/builtins-sharedarraybuffer.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" - +#include "src/builtins/builtins.h" #include "src/code-factory.h" +#include "src/code-stub-assembler.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-string.cc b/src/builtins/builtins-string.cc index 6515f28434..8a94c20a30 100644 --- a/src/builtins/builtins-string.cc +++ b/src/builtins/builtins-string.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" - +#include "src/builtins/builtins.h" #include "src/code-factory.h" +#include "src/code-stub-assembler.h" #include "src/regexp/regexp-utils.h" namespace v8 { diff --git a/src/builtins/builtins-symbol.cc b/src/builtins/builtins-symbol.cc index 209bd58f6f..a51c22cd41 100644 --- a/src/builtins/builtins-symbol.cc +++ b/src/builtins/builtins-symbol.cc @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" +#include "src/builtins/builtins.h" +#include "src/code-stub-assembler.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-typedarray.cc b/src/builtins/builtins-typedarray.cc index 7efb5469b4..8dc4517e5c 100644 --- a/src/builtins/builtins-typedarray.cc +++ b/src/builtins/builtins-typedarray.cc @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/builtins/builtins.h" #include "src/builtins/builtins-utils.h" +#include "src/builtins/builtins.h" +#include "src/code-stub-assembler.h" namespace v8 { namespace internal { diff --git a/src/builtins/builtins-utils.h b/src/builtins/builtins-utils.h index 80e0d29f17..0fab531f3c 100644 --- a/src/builtins/builtins-utils.h +++ b/src/builtins/builtins-utils.h @@ -8,11 +8,14 @@ #include "src/arguments.h" #include "src/base/logging.h" #include "src/builtins/builtins.h" -#include "src/code-stub-assembler.h" namespace v8 { namespace internal { +namespace compiler { +class CodeAssemblerState; +} + // Arguments object passed to C++ builtins. class BuiltinArguments : public Arguments { public: diff --git a/src/compiler/linkage.cc b/src/compiler/linkage.cc index 971ea7212d..643277b1d1 100644 --- a/src/compiler/linkage.cc +++ b/src/compiler/linkage.cc @@ -5,7 +5,6 @@ #include "src/compiler/linkage.h" #include "src/ast/scopes.h" -#include "src/builtins/builtins-utils.h" #include "src/code-stubs.h" #include "src/compilation-info.h" #include "src/compiler/common-operator.h"