Remove all unnecessary includes

All includes from .cc to .h are preserved, even when transitively included.

It's clear that there are far too many includes in header files, and we should be more aggressive with forward declarations. tint:532 will continue to track this work.

There are, however, plenty of includes that have accumulated over time which are no longer required directly or transitively, so this change starts with a clean slate of *required* includes.

Bug: tint:532
Change-Id: Ie1718dad565f8309fa180ef91bcf3920e76dba18
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/44042
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>

src/type/access_control_type.cc

@@ -14,9 +14,6 @@
 
 #include "src/type/access_control_type.h"
 
-#include <assert.h>
-
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::AccessControl);

src/type/access_control_type_test.cc

@@ -14,25 +14,8 @@
 
 #include "src/type/access_control_type.h"
 
-#include <memory>
-#include <utility>
-
-#include "src/ast/storage_class.h"
-#include "src/ast/stride_decoration.h"
-#include "src/ast/struct_member.h"
-#include "src/ast/struct_member_decoration.h"
-#include "src/ast/struct_member_offset_decoration.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/alias_type.cc

@@ -14,9 +14,6 @@
 
 #include "src/type/alias_type.h"
 
-#include <assert.h>
-
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::Alias);

src/type/alias_type.h

@@ -17,7 +17,6 @@
 
 #include <string>
 
-#include "src/symbol.h"
 #include "src/type/type.h"
 
 namespace tint {

src/type/alias_type_test.cc

@@ -12,27 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/alias_type.h"
-
-#include <memory>
-#include <utility>
-
-#include "src/ast/storage_class.h"
-#include "src/ast/stride_decoration.h"
-#include "src/ast/struct_member.h"
-#include "src/ast/struct_member_decoration.h"
-#include "src/ast/struct_member_offset_decoration.h"
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/array_type.cc

@@ -15,12 +15,8 @@
 #include "src/type/array_type.h"
 
 #include <cmath>
-#include <memory>
 
-#include "src/ast/stride_decoration.h"
-#include "src/clone_context.h"
 #include "src/program_builder.h"
-#include "src/type/vector_type.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::Array);
 

src/type/array_type.h

@@ -15,10 +15,7 @@
 #ifndef SRC_TYPE_ARRAY_TYPE_H_
 #define SRC_TYPE_ARRAY_TYPE_H_
 
-#include <assert.h>
-
 #include <string>
-#include <utility>
 
 #include "src/ast/array_decoration.h"
 #include "src/type/type.h"

src/type/array_type_test.cc

@@ -12,23 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/array_type.h"
-
-#include <memory>
-#include <utility>
-
-#include "src/ast/stride_decoration.h"
 #include "src/type/access_control_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/bool_type.cc

@@ -14,7 +14,6 @@
 
 #include "src/type/bool_type.h"
 
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::Bool);

src/type/bool_type_test.cc

@@ -12,19 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/bool_type.h"
-
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/depth_texture_type.cc

@@ -14,10 +14,6 @@
 
 #include "src/type/depth_texture_type.h"
 
-#include <cassert>
-#include <sstream>
-
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::DepthTexture);

src/type/depth_texture_type_test.cc

@@ -17,17 +17,8 @@
 #include "src/type/test_helper.h"
 
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
 #include "src/type/sampled_texture_type.h"
 #include "src/type/storage_texture_type.h"
-#include "src/type/struct_type.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/f32_type.cc

@@ -14,7 +14,6 @@
 
 #include "src/type/f32_type.h"
 
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::F32);

src/type/f32_type_test.cc

@@ -12,19 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/f32_type.h"
-
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/i32_type.cc

@@ -14,7 +14,6 @@
 
 #include "src/type/i32_type.h"
 
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::I32);

src/type/i32_type_test.cc

@@ -12,19 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/i32_type.h"
-
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/matrix_type.cc

@@ -14,12 +14,7 @@
 
 #include "src/type/matrix_type.h"
 
-#include <assert.h>
-
-#include "src/clone_context.h"
 #include "src/program_builder.h"
-#include "src/type/array_type.h"
-#include "src/type/vector_type.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::Matrix);
 

src/type/matrix_type_test.cc

@@ -12,19 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/matrix_type.h"
-
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/pointer_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/multisampled_texture_type.cc

@@ -14,10 +14,6 @@
 
 #include "src/type/multisampled_texture_type.h"
 
-#include <cassert>
-#include <sstream>
-
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::MultisampledTexture);

src/type/multisampled_texture_type_test.cc

@@ -15,19 +15,10 @@
 #include "src/type/multisampled_texture_type.h"
 
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
 #include "src/type/depth_texture_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
 #include "src/type/sampled_texture_type.h"
 #include "src/type/storage_texture_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/pointer_type.cc

@@ -14,7 +14,6 @@
 
 #include "src/type/pointer_type.h"
 
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::Pointer);

src/type/pointer_type.h

@@ -15,7 +15,6 @@
 #ifndef SRC_TYPE_POINTER_TYPE_H_
 #define SRC_TYPE_POINTER_TYPE_H_
 
-#include <sstream>
 #include <string>
 
 #include "src/ast/storage_class.h"

src/type/pointer_type_test.cc

@@ -12,19 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/pointer_type.h"
-
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/sampled_texture_type.cc

@@ -14,10 +14,6 @@
 
 #include "src/type/sampled_texture_type.h"
 
-#include <cassert>
-#include <sstream>
-
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::SampledTexture);

src/type/sampled_texture_type_test.cc

@@ -15,18 +15,9 @@
 #include "src/type/sampled_texture_type.h"
 
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
 #include "src/type/depth_texture_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
 #include "src/type/storage_texture_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/sampler_type.cc

@@ -14,7 +14,6 @@
 
 #include "src/type/sampler_type.h"
 
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::Sampler);

src/type/sampler_type.h

@@ -15,7 +15,6 @@
 #ifndef SRC_TYPE_SAMPLER_TYPE_H_
 #define SRC_TYPE_SAMPLER_TYPE_H_
 
-#include <ostream>
 #include <string>
 
 #include "src/type/type.h"

src/type/sampler_type_test.cc

@@ -12,20 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/sampler_type.h"
-
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/storage_texture_type.cc

@@ -14,10 +14,6 @@
 
 #include "src/type/storage_texture_type.h"
 
-#include <cassert>
-#include <sstream>
-
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::StorageTexture);

src/type/storage_texture_type_test.cc

@@ -14,22 +14,10 @@
 
 #include "src/type/storage_texture_type.h"
 
-#include <memory>
-
-#include "src/ast/identifier_expression.h"
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
 #include "src/type/depth_texture_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
 #include "src/type/sampled_texture_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/struct_type.cc

@@ -15,14 +15,8 @@
 #include "src/type/struct_type.h"
 
 #include <cmath>
-#include <utility>
 
-#include "src/clone_context.h"
 #include "src/program_builder.h"
-#include "src/type/alias_type.h"
-#include "src/type/array_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/vector_type.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::Struct);
 

src/type/struct_type.h

@@ -15,11 +15,9 @@
 #ifndef SRC_TYPE_STRUCT_TYPE_H_
 #define SRC_TYPE_STRUCT_TYPE_H_
 
-#include <memory>
 #include <string>
 
 #include "src/ast/struct.h"
-#include "src/symbol.h"
 #include "src/type/type.h"
 
 namespace tint {

src/type/struct_type_test.cc

@@ -12,25 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/struct_type.h"
-
-#include <utility>
-
-#include "src/ast/stride_decoration.h"
-#include "src/ast/struct_member.h"
-#include "src/ast/struct_member_decoration.h"
-#include "src/ast/struct_member_offset_decoration.h"
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/u32_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/test_helper.h

@@ -15,8 +15,6 @@
 #ifndef SRC_TYPE_TEST_HELPER_H_
 #define SRC_TYPE_TEST_HELPER_H_
 
-#include <memory>
-#include <string>
 #include <utility>
 
 #include "gtest/gtest.h"

src/type/texture_type.cc

@@ -14,12 +14,6 @@
 
 #include "src/type/texture_type.h"
 
-#include <cassert>
-#include <ostream>
-
-#include "src/type/multisampled_texture_type.h"
-#include "src/type/sampled_texture_type.h"
-
 TINT_INSTANTIATE_TYPEINFO(tint::type::Texture);
 
 namespace tint {

src/type/type.cc

@@ -14,22 +14,17 @@
 
 #include "src/type/type.h"
 
-#include <assert.h>
-
 #include "src/type/access_control_type.h"
 #include "src/type/alias_type.h"
-#include "src/type/array_type.h"
 #include "src/type/bool_type.h"
 #include "src/type/f32_type.h"
 #include "src/type/i32_type.h"
 #include "src/type/matrix_type.h"
 #include "src/type/pointer_type.h"
 #include "src/type/sampler_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/texture_type.h"
 #include "src/type/u32_type.h"
 #include "src/type/vector_type.h"
-#include "src/type/void_type.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::Type);
 
@@ -61,9 +56,9 @@ Type* Type::UnwrapIfNeeded() {
   auto* where = this;
   while (true) {
     if (auto* alias = where->As<type::Alias>()) {
-      where = alias->type();
+          where = alias->type();
     } else if (auto* access = where->As<type::AccessControl>()) {
-      where = access->type();
+          where = access->type();
     } else {
       break;
     }

src/type/type_manager.cc

@@ -14,8 +14,6 @@
 
 #include "src/type/type_manager.h"
 
-#include <utility>
-
 namespace tint {
 namespace type {
 

src/type/u32_type.cc

@@ -14,7 +14,6 @@
 
 #include "src/type/u32_type.h"
 
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::U32);

src/type/u32_type_test.cc

@@ -12,20 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/u32_type.h"
-
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
-#include "src/type/sampler_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/vector_type.h"
 
 namespace tint {
 namespace type {

src/type/vector_type.cc

@@ -14,10 +14,6 @@
 
 #include "src/type/vector_type.h"
 
-#include <assert.h>
-#include <cmath>
-
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::Vector);

src/type/vector_type_test.cc

@@ -12,19 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/type/vector_type.h"
-
 #include "src/type/access_control_type.h"
-#include "src/type/array_type.h"
-#include "src/type/bool_type.h"
-#include "src/type/f32_type.h"
-#include "src/type/i32_type.h"
-#include "src/type/matrix_type.h"
-#include "src/type/pointer_type.h"
-#include "src/type/struct_type.h"
 #include "src/type/test_helper.h"
 #include "src/type/texture_type.h"
-#include "src/type/u32_type.h"
 
 namespace tint {
 namespace type {

src/type/void_type.cc

@@ -14,7 +14,6 @@
 
 #include "src/type/void_type.h"
 
-#include "src/clone_context.h"
 #include "src/program_builder.h"
 
 TINT_INSTANTIATE_TYPEINFO(tint::type::Void);