[iwyu] Split off arguments-inl.h and builtins-utils-inl.h

arguments.h used methods only defined in objects-inl.h and
handles-inl.h. These uses are now moved to arguments-inl.h. Since
builtins-utils.h used these methods, it also needs to be split to have
an inl header now.

R=titzer@chromium.org

Bug: v8:7754, v8:7965
Cq-Include-Trybots: luci.v8.try:v8_linux_noi18n_rel_ng
Change-Id: I21db7a86f7c15776eccf060f81f2bde000b92a40
Reviewed-on: https://chromium-review.googlesource.com/1160647Reviewed-by: Ben Titzer <titzer@chromium.org>
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54889}

BUILD.gn

@@ -1507,6 +1507,7 @@ v8_source_set("v8_base") {
     "src/api-natives.h",
     "src/api.cc",
     "src/api.h",
+    "src/arguments-inl.h",
     "src/arguments.cc",
     "src/arguments.h",
     "src/asan.h",
@@ -1591,6 +1592,7 @@ v8_source_set("v8_base") {
     "src/builtins/builtins-symbol.cc",
     "src/builtins/builtins-trace.cc",
     "src/builtins/builtins-typed-array.cc",
+    "src/builtins/builtins-utils-inl.h",
     "src/builtins/builtins-utils.h",
     "src/builtins/builtins.cc",
     "src/builtins/builtins.h",

src/arguments-inl.h

+// Copyright 2018 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_ARGUMENTS_INL_H_
+#define V8_ARGUMENTS_INL_H_
+
+#include "src/arguments.h"
+
+#include "src/handles-inl.h"
+#include "src/objects-inl.h"
+
+namespace v8 {
+namespace internal {
+
+template <class S>
+Handle<S> Arguments::at(int index) {
+  return Handle<S>::cast(at<Object>(index));
+}
+
+int Arguments::smi_at(int index) { return Smi::ToInt((*this)[index]); }
+
+double Arguments::number_at(int index) { return (*this)[index]->Number(); }
+
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_ARGUMENTS_INL_H_

src/arguments.h

@@ -42,19 +42,11 @@ class Arguments BASE_EMBEDDED {
   }
 
   template <class S = Object>
-  Handle<S> at(int index) {
-    Object** value = &((*this)[index]);
-    // This cast checks that the object we're accessing does indeed have the
-    // expected type.
-    S::cast(*value);
-    return Handle<S>(reinterpret_cast<S**>(value));
-  }
+  inline Handle<S> at(int index);
 
-  int smi_at(int index) { return Smi::ToInt((*this)[index]); }
+  inline int smi_at(int index);
 
-  double number_at(int index) {
-    return (*this)[index]->Number();
-  }
+  inline double number_at(int index);
 
   // Get the total number of arguments including the receiver.
   int length() const { return static_cast<int>(length_); }
@@ -70,6 +62,12 @@ class Arguments BASE_EMBEDDED {
   Object** arguments_;
 };
 
+template <>
+inline Handle<Object> Arguments::at(int index) {
+  Object** value = &((*this)[index]);
+  return Handle<Object>(value);
+}
+
 double ClobberDoubleRegisters(double x1, double x2, double x3, double x4);
 
 #ifdef DEBUG

src/builtins/builtins-api.cc

@@ -2,11 +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/api-arguments-inl.h"
 #include "src/api-natives.h"
-#include "src/builtins/builtins-utils.h"
+#include "src/builtins/builtins-utils-inl.h"
+#include "src/builtins/builtins.h"
 #include "src/counters.h"
 #include "src/log.h"
 #include "src/objects-inl.h"

src/builtins/builtins-arraybuffer.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/builtins/builtins-utils.h"
+#include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
 #include "src/conversions.h"
 #include "src/counters.h"

src/builtins/builtins-bigint.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/builtins/builtins-utils.h"
+#include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
 #include "src/conversions.h"
 #include "src/counters.h"

src/builtins/builtins-boolean.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/builtins/builtins-utils.h"
+#include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
 #include "src/counters.h"
 #include "src/objects-inl.h"

src/builtins/builtins-console.cc

@@ -2,10 +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-utils.h"
-#include "src/builtins/builtins.h"
-
 #include "src/api-inl.h"
+#include "src/builtins/builtins-utils-inl.h"
+#include "src/builtins/builtins.h"
 #include "src/debug/interface-types.h"
 #include "src/objects-inl.h"
 

src/builtins/builtins-dataview.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/builtins/builtins-utils.h"
+#include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
 #include "src/conversions.h"
 #include "src/counters.h"

src/builtins/builtins-date.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/builtins/builtins-utils.h"
+#include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
 #include "src/code-factory.h"
 #include "src/code-stub-assembler.h"

src/builtins/builtins-error.cc

@@ -2,10 +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/accessors.h"
+#include "src/builtins/builtins-utils-inl.h"
+#include "src/builtins/builtins.h"
 #include "src/counters.h"
 #include "src/messages.h"
 #include "src/objects-inl.h"

src/builtins/builtins-function.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/builtins/builtins-utils.h"
+#include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
 #include "src/code-factory.h"
 #include "src/compiler.h"

src/builtins/builtins-global.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/builtins/builtins-utils.h"
+#include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
 #include "src/code-factory.h"
 #include "src/compiler.h"

src/builtins/builtins-intl.cc

@@ -9,7 +9,7 @@
 #include <cmath>
 
 #include "src/builtins/builtins-intl.h"
-#include "src/builtins/builtins-utils.h"
+#include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
 #include "src/date.h"
 #include "src/intl.h"

src/builtins/builtins-symbol.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/builtins/builtins-utils.h"
+#include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
 #include "src/counters.h"
 #include "src/objects-inl.h"

src/builtins/builtins-utils-inl.h

+// Copyright 2018 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_BUILTINS_BUILTINS_UTILS_INL_H_
+#define V8_BUILTINS_BUILTINS_UTILS_INL_H_
+
+#include "src/builtins/builtins-utils.h"
+
+#include "src/arguments-inl.h"
+
+namespace v8 {
+namespace internal {
+
+Handle<JSFunction> BuiltinArguments::target() {
+  return Arguments::at<JSFunction>(Arguments::length() - 1 - kTargetOffset);
+}
+
+Handle<HeapObject> BuiltinArguments::new_target() {
+  return Arguments::at<HeapObject>(Arguments::length() - 1 - kNewTargetOffset);
+}
+
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_BUILTINS_BUILTINS_UTILS_INL_H_

src/builtins/builtins-utils.h

@@ -51,13 +51,8 @@ class BuiltinArguments : public Arguments {
   static const int kNumExtraArgs = 4;
   static const int kNumExtraArgsWithReceiver = 5;
 
-  Handle<JSFunction> target() {
-    return Arguments::at<JSFunction>(Arguments::length() - 1 - kTargetOffset);
-  }
-  Handle<HeapObject> new_target() {
-    return Arguments::at<HeapObject>(Arguments::length() - 1 -
-                                     kNewTargetOffset);
-  }
+  inline Handle<JSFunction> target();
+  inline Handle<HeapObject> new_target();
 
   // Gets the total number of arguments including the receiver (but
   // excluding extra arguments).

src/ic/ic.cc

@@ -7,7 +7,7 @@
 #include "src/accessors.h"
 #include "src/api-arguments-inl.h"
 #include "src/api.h"
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/ast/ast.h"
 #include "src/base/bits.h"
 #include "src/conversions.h"

src/runtime/runtime-array.cc

@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/code-stubs.h"
 #include "src/conversions-inl.h"
 #include "src/debug/debug.h"
@@ -17,6 +15,7 @@
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/js-array-inl.h"
 #include "src/prototype.h"
+#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-atomics.cc

@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/base/macros.h"
 #include "src/base/platform/mutex.h"
 #include "src/conversions-inl.h"
 #include "src/heap/factory.h"
 #include "src/objects/js-array-inl.h"
+#include "src/runtime/runtime-utils.h"
 
 // Implement Atomic accesses to SharedArrayBuffers as defined in the
 // SharedArrayBuffer draft spec, found here

src/runtime/runtime-bigint.cc

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/counters.h"
 #include "src/objects-inl.h"
 #include "src/objects/bigint.h"
+#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-classes.cc

@@ -8,7 +8,7 @@
 #include <limits>
 
 #include "src/accessors.h"
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/debug/debug.h"
 #include "src/elements.h"
 #include "src/isolate-inl.h"

src/runtime/runtime-collections.cc

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/conversions-inl.h"
 #include "src/heap/factory.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/js-collection-inl.h"
+#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-compiler.cc

@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/asmjs/asm-js.h"
 #include "src/compiler-dispatcher/optimizing-compile-dispatcher.h"
 #include "src/compiler.h"
@@ -13,6 +11,7 @@
 #include "src/isolate-inl.h"
 #include "src/messages.h"
 #include "src/objects/js-array-inl.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/v8threads.h"
 #include "src/vm-state-inl.h"
 

src/runtime/runtime-debug.cc

@@ -2,11 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
 #include <vector>
 
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/compiler.h"
 #include "src/debug/debug-coverage.h"
 #include "src/debug/debug-evaluate.h"
@@ -24,6 +22,7 @@
 #include "src/objects/js-collection-inl.h"
 #include "src/objects/js-generator-inl.h"
 #include "src/objects/js-promise-inl.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/runtime/runtime.h"
 #include "src/snapshot/snapshot.h"
 #include "src/wasm/wasm-objects-inl.h"

src/runtime/runtime-forin.cc

@@ -4,7 +4,7 @@
 
 #include "src/runtime/runtime-utils.h"
 
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/elements.h"
 #include "src/heap/factory.h"
 #include "src/isolate-inl.h"

src/runtime/runtime-function.cc

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
 #include "src/accessors.h"
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/compiler.h"
 #include "src/isolate-inl.h"
 #include "src/messages.h"
+#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-futex.cc

@@ -4,7 +4,7 @@
 
 #include "src/runtime/runtime-utils.h"
 
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/base/platform/time.h"
 #include "src/conversions-inl.h"
 #include "src/futex-emulation.h"
@@ -18,7 +18,6 @@
 namespace v8 {
 namespace internal {
 
-
 RUNTIME_FUNCTION(Runtime_AtomicsNumWaitersForTesting) {
   HandleScope scope(isolate);
   DCHECK_EQ(2, args.length());
@@ -42,5 +41,6 @@ RUNTIME_FUNCTION(Runtime_SetAllowAtomicsWait) {
   isolate->set_allow_atomics_wait(set);
   return ReadOnlyRoots(isolate).undefined_value();
 }
+
 }  // namespace internal
 }  // namespace v8

src/runtime/runtime-generator.cc

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/heap/factory.h"
 #include "src/heap/heap-inl.h"
 #include "src/objects-inl.h"
 #include "src/objects/js-generator-inl.h"
+#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-internal.cc

@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
 #include <memory>
 
 #include "src/api.h"
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/ast/prettyprinter.h"
 #include "src/bootstrapper.h"
 #include "src/builtins/builtins.h"
@@ -19,6 +17,7 @@
 #include "src/objects/js-array-inl.h"
 #include "src/parsing/parse-info.h"
 #include "src/parsing/parsing.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/snapshot/snapshot.h"
 
 namespace v8 {

src/runtime/runtime-interpreter.cc

@@ -2,11 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
 #include <iomanip>
 
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/frames-inl.h"
 #include "src/interpreter/bytecode-array-iterator.h"
 #include "src/interpreter/bytecode-decoder.h"
@@ -16,6 +14,7 @@
 #include "src/interpreter/interpreter.h"
 #include "src/isolate-inl.h"
 #include "src/ostreams.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/snapshot/snapshot.h"
 
 namespace v8 {

src/runtime/runtime-intl.cc

@@ -6,14 +6,12 @@
 #error Internationalization is expected to be enabled.
 #endif  // V8_INTL_SUPPORT
 
-#include "src/runtime/runtime-utils.h"
-
 #include <cmath>
 #include <memory>
 
 #include "src/api-inl.h"
 #include "src/api-natives.h"
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/date.h"
 #include "src/global-handles.h"
 #include "src/heap/factory.h"
@@ -23,6 +21,7 @@
 #include "src/objects/intl-objects-inl.h"
 #include "src/objects/intl-objects.h"
 #include "src/objects/managed.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/utils.h"
 
 #include "unicode/brkiter.h"

src/runtime/runtime-literals.cc

@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
 #include "src/allocation-site-scopes.h"
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/ast/ast.h"
 #include "src/isolate-inl.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/js-regexp-inl.h"
 #include "src/objects/literal-objects-inl.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {

src/runtime/runtime-module.cc

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/counters.h"
 #include "src/objects-inl.h"
 #include "src/objects/js-promise.h"
 #include "src/objects/module.h"
+#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-numbers.cc

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/base/bits.h"
 #include "src/bootstrapper.h"
 #include "src/isolate-inl.h"
+#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-object.cc

@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/bootstrapper.h"
 #include "src/debug/debug.h"
 #include "src/isolate-inl.h"
@@ -13,6 +11,7 @@
 #include "src/objects/js-array-inl.h"
 #include "src/objects/property-descriptor-object.h"
 #include "src/property-descriptor.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {

src/runtime/runtime-promise.cc

@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
 #include "src/api-inl.h"
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/counters.h"
 #include "src/debug/debug.h"
 #include "src/elements.h"
 #include "src/objects-inl.h"
 #include "src/objects/js-promise-inl.h"
+#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-proxy.cc

@@ -4,7 +4,7 @@
 
 #include "src/runtime/runtime-utils.h"
 
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/elements.h"
 #include "src/heap/factory.h"
 #include "src/isolate-inl.h"

src/runtime/runtime-regexp.cc

@@ -2,11 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
 #include <functional>
 
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/conversions-inl.h"
 #include "src/isolate-inl.h"
 #include "src/messages.h"
@@ -14,6 +12,7 @@
 #include "src/regexp/jsregexp-inl.h"
 #include "src/regexp/jsregexp.h"
 #include "src/regexp/regexp-utils.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/string-builder-inl.h"
 #include "src/string-search.h"
 #include "src/zone/zone-chunk-list.h"

src/runtime/runtime-scopes.cc

@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
 #include <memory>
 
 #include "src/accessors.h"
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/ast/scopes.h"
 #include "src/bootstrapper.h"
 #include "src/deoptimizer.h"
@@ -15,6 +13,7 @@
 #include "src/isolate-inl.h"
 #include "src/messages.h"
 #include "src/objects/module-inl.h"
+#include "src/runtime/runtime-utils.h"
 
 namespace v8 {
 namespace internal {

src/runtime/runtime-strings.cc

@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/conversions.h"
 #include "src/counters.h"
 #include "src/objects-inl.h"
 #include "src/objects/js-array-inl.h"
 #include "src/regexp/jsregexp-inl.h"
 #include "src/regexp/regexp-utils.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/string-builder-inl.h"
 #include "src/string-search.h"
 

src/runtime/runtime-symbol.cc

@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/isolate-inl.h"
 #include "src/objects-inl.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/string-builder-inl.h"
 
 namespace v8 {

src/runtime/runtime-test.cc

@@ -8,7 +8,7 @@
 #include <sstream>
 
 #include "src/api-inl.h"
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/assembler-inl.h"
 #include "src/compiler-dispatcher/optimizing-compile-dispatcher.h"
 #include "src/compiler.h"

src/runtime/runtime-typedarray.cc

@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/elements.h"
 #include "src/heap/factory.h"
 #include "src/heap/heap-inl.h"
 #include "src/messages.h"
 #include "src/objects-inl.h"
 #include "src/objects/js-array-inl.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {

src/runtime/runtime-wasm.cc

@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/runtime/runtime-utils.h"
-
-#include "src/arguments.h"
+#include "src/arguments-inl.h"
 #include "src/assembler.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/conversions.h"
@@ -13,6 +11,7 @@
 #include "src/heap/factory.h"
 #include "src/objects-inl.h"
 #include "src/objects/frame-array-inl.h"
+#include "src/runtime/runtime-utils.h"
 #include "src/trap-handler/trap-handler.h"
 #include "src/v8memory.h"
 #include "src/wasm/module-compiler.h"

tools/generate-header-include-checks.py

@@ -30,7 +30,6 @@ AUTO_EXCLUDE = [
   'src/flag-definitions.h',
   # blacklist of headers we need to fix (https://crbug.com/v8/7965).
   'src/allocation-site-scopes.h',
-  'src/arguments.h',
   'src/builtins/builtins-constructor.h',
   'src/builtins/builtins-utils.h',
   'src/compiler/allocation-builder.h',