From 558cfa099e4872a2f8ff7ddb1edff07cce69439a Mon Sep 17 00:00:00 2001 From: Peter Marshall Date: Fri, 27 Jul 2018 10:32:05 +0200 Subject: [PATCH] [cleanup] Fix more header includes to allow individual compilation Fixes: src/objects/intl-objects-inl.h src/objects/js-collection.h src/objects/js-collection-inl.h src/objects/js-regexp-string-iterator-inl.h src/objects/microtask-inl.h src/objects/module-inl.h src/objects/ordered-hash-table-inl.h src/objects/promise-inl.h Bug: v8:7754,v8:7490 Cq-Include-Trybots: luci.v8.try:v8_linux_noi18n_rel_ng Change-Id: Id5a5017713fa9920add2b38dbc56ab74abd4addd Reviewed-on: https://chromium-review.googlesource.com/1152732 Reviewed-by: Michael Starzinger Commit-Queue: Peter Marshall Cr-Commit-Position: refs/heads/master@{#54748} --- src/objects/intl-objects-inl.h | 2 ++ src/objects/js-collection-inl.h | 2 ++ src/objects/js-collection.h | 1 + src/objects/js-regexp-string-iterator-inl.h | 2 ++ src/objects/microtask-inl.h | 2 ++ src/objects/module-inl.h | 2 ++ src/objects/ordered-hash-table-inl.h | 4 +++- tools/generate-header-include-checks.py | 8 -------- 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/objects/intl-objects-inl.h b/src/objects/intl-objects-inl.h index 1fa2d66f94..62b059ea3c 100644 --- a/src/objects/intl-objects-inl.h +++ b/src/objects/intl-objects-inl.h @@ -7,6 +7,8 @@ #include "src/objects/intl-objects.h" +#include "src/objects-inl.h" + namespace v8 { namespace internal { diff --git a/src/objects/js-collection-inl.h b/src/objects/js-collection-inl.h index 12bba94eaa..c50e803429 100644 --- a/src/objects/js-collection-inl.h +++ b/src/objects/js-collection-inl.h @@ -7,6 +7,8 @@ #include "src/objects/js-collection.h" +#include "src/objects-inl.h" // Needed for write barriers + // Has to be the last include (doesn't have include guards): #include "src/objects/object-macros.h" diff --git a/src/objects/js-collection.h b/src/objects/js-collection.h index 5b9fcf1c29..47bb7a9c2a 100644 --- a/src/objects/js-collection.h +++ b/src/objects/js-collection.h @@ -6,6 +6,7 @@ #define V8_OBJECTS_JS_COLLECTION_H_ #include "src/objects.h" +#include "src/objects/ordered-hash-table.h" // Has to be the last include (doesn't have include guards): #include "src/objects/object-macros.h" diff --git a/src/objects/js-regexp-string-iterator-inl.h b/src/objects/js-regexp-string-iterator-inl.h index ca099d48e5..4fc8f88841 100644 --- a/src/objects/js-regexp-string-iterator-inl.h +++ b/src/objects/js-regexp-string-iterator-inl.h @@ -7,6 +7,8 @@ #include "src/objects/js-regexp-string-iterator.h" +#include "src/objects-inl.h" // Needed for write barriers + // Has to be the last include (doesn't have include guards): #include "src/objects/object-macros.h" diff --git a/src/objects/microtask-inl.h b/src/objects/microtask-inl.h index 71a9ea20ec..180f55be17 100644 --- a/src/objects/microtask-inl.h +++ b/src/objects/microtask-inl.h @@ -7,6 +7,8 @@ #include "src/objects/microtask.h" +#include "src/objects-inl.h" // Needed for write barriers + // Has to be the last include (doesn't have include guards): #include "src/objects/object-macros.h" diff --git a/src/objects/module-inl.h b/src/objects/module-inl.h index 1fffd01005..1a4f2b3efa 100644 --- a/src/objects/module-inl.h +++ b/src/objects/module-inl.h @@ -6,6 +6,8 @@ #define V8_OBJECTS_MODULE_INL_H_ #include "src/objects/module.h" + +#include "src/objects-inl.h" // Needed for write barriers #include "src/objects/scope-info.h" // Has to be the last include (doesn't have include guards): diff --git a/src/objects/ordered-hash-table-inl.h b/src/objects/ordered-hash-table-inl.h index 25d5dc938a..76b0692c46 100644 --- a/src/objects/ordered-hash-table-inl.h +++ b/src/objects/ordered-hash-table-inl.h @@ -5,9 +5,11 @@ #ifndef V8_OBJECTS_ORDERED_HASH_TABLE_INL_H_ #define V8_OBJECTS_ORDERED_HASH_TABLE_INL_H_ -#include "src/heap/heap.h" #include "src/objects/ordered-hash-table.h" +#include "src/heap/heap.h" +#include "src/objects/fixed-array-inl.h" + namespace v8 { namespace internal { diff --git a/tools/generate-header-include-checks.py b/tools/generate-header-include-checks.py index dfae102d04..11709a4606 100755 --- a/tools/generate-header-include-checks.py +++ b/tools/generate-header-include-checks.py @@ -61,14 +61,6 @@ AUTO_EXCLUDE = [ 'src/lookup.h', 'src/lookup-inl.h', 'src/map-updater.h', - 'src/objects/intl-objects-inl.h', - 'src/objects/js-collection.h', - 'src/objects/js-collection-inl.h', - 'src/objects/js-regexp-string-iterator-inl.h', - 'src/objects/microtask-inl.h', - 'src/objects/module-inl.h', - 'src/objects/ordered-hash-table-inl.h', - 'src/objects/promise-inl.h', 'src/objects/property-descriptor-object.h', 'src/objects/prototype-info-inl.h', 'src/objects/regexp-match-info.h',