Rename TINT_INSTANTIATE_CLASS_ID()

to TINT_INSTANTIATE_TYPEINFO()

ClassID isn't a thing any more.

Change-Id: Ie1c0d4a95e58ef7166d3cab5ef733a2dfc702345
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/42921
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: James Price <jrprice@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>

src/ast/access_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::AccessDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::AccessDecoration);
 
 namespace tint {
 namespace ast {

src/ast/array_accessor_expression.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::ArrayAccessorExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::ArrayAccessorExpression);
 
 namespace tint {
 namespace ast {

src/ast/array_decoration.cc

@@ -18,7 +18,7 @@
 
 #include "src/ast/stride_decoration.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::ArrayDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::ArrayDecoration);
 
 namespace tint {
 namespace ast {

src/ast/assignment_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::AssignmentStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::AssignmentStatement);
 
 namespace tint {
 namespace ast {

src/ast/binary_expression.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::BinaryExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::BinaryExpression);
 
 namespace tint {
 namespace ast {

src/ast/binding_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::BindingDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::BindingDecoration);
 
 namespace tint {
 namespace ast {

src/ast/bitcast_expression.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::BitcastExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::BitcastExpression);
 
 namespace tint {
 namespace ast {

src/ast/block_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::BlockStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::BlockStatement);
 
 namespace tint {
 namespace ast {

src/ast/bool_literal.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::BoolLiteral);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::BoolLiteral);
 
 namespace tint {
 namespace ast {

src/ast/break_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::BreakStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::BreakStatement);
 
 namespace tint {
 namespace ast {

src/ast/builtin_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::BuiltinDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::BuiltinDecoration);
 
 namespace tint {
 namespace ast {

src/ast/call_expression.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::CallExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::CallExpression);
 
 namespace tint {
 namespace ast {

src/ast/call_statement.cc

@@ -18,7 +18,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::CallStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::CallStatement);
 
 namespace tint {
 namespace ast {

src/ast/case_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::CaseStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::CaseStatement);
 
 namespace tint {
 namespace ast {

src/ast/constant_id_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::ConstantIdDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::ConstantIdDecoration);
 
 namespace tint {
 namespace ast {

src/ast/constructor_expression.cc

@@ -16,7 +16,7 @@
 
 #include <assert.h>
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::ConstructorExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::ConstructorExpression);
 
 namespace tint {
 namespace ast {

src/ast/continue_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::ContinueStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::ContinueStatement);
 
 namespace tint {
 namespace ast {

src/ast/decoration.cc

@@ -14,7 +14,7 @@
 
 #include "src/ast/decoration.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::Decoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::Decoration);
 
 namespace tint {
 namespace ast {

src/ast/discard_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::DiscardStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::DiscardStatement);
 
 namespace tint {
 namespace ast {

src/ast/else_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::ElseStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::ElseStatement);
 
 namespace tint {
 namespace ast {

src/ast/expression.cc

@@ -17,7 +17,7 @@
 #include "src/semantic/expression.h"
 #include "src/semantic/info.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::Expression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::Expression);
 
 namespace tint {
 namespace ast {

src/ast/fallthrough_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::FallthroughStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::FallthroughStatement);
 
 namespace tint {
 namespace ast {

src/ast/float_literal.cc

@@ -20,7 +20,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::FloatLiteral);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::FloatLiteral);
 
 namespace tint {
 namespace ast {

src/ast/function.cc

@@ -25,7 +25,7 @@
 #include "src/type/sampled_texture_type.h"
 #include "src/type/texture_type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::Function);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::Function);
 
 namespace tint {
 namespace ast {

src/ast/function_decoration.cc

@@ -14,7 +14,7 @@
 
 #include "src/ast/function_decoration.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::FunctionDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::FunctionDecoration);
 
 namespace tint {
 namespace ast {

src/ast/group_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::GroupDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::GroupDecoration);
 
 namespace tint {
 namespace ast {

src/ast/identifier_expression.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::IdentifierExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::IdentifierExpression);
 
 namespace tint {
 namespace ast {

src/ast/if_statement.cc

@@ -18,7 +18,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::IfStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::IfStatement);
 
 namespace tint {
 namespace ast {

src/ast/int_literal.cc

@@ -14,7 +14,7 @@
 
 #include "src/ast/int_literal.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::IntLiteral);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::IntLiteral);
 
 namespace tint {
 namespace ast {

src/ast/literal.cc

@@ -14,7 +14,7 @@
 
 #include "src/ast/literal.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::Literal);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::Literal);
 
 namespace tint {
 namespace ast {

src/ast/location_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::LocationDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::LocationDecoration);
 
 namespace tint {
 namespace ast {

src/ast/loop_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::LoopStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::LoopStatement);
 
 namespace tint {
 namespace ast {

src/ast/member_accessor_expression.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::MemberAccessorExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::MemberAccessorExpression);
 
 namespace tint {
 namespace ast {

src/ast/module.cc

@@ -23,7 +23,7 @@
 #include "src/type/alias_type.h"
 #include "src/type/struct_type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::Module);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::Module);
 
 namespace tint {
 namespace ast {

src/ast/node.cc

@@ -16,7 +16,7 @@
 
 #include <sstream>
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::Node);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::Node);
 
 namespace tint {
 namespace ast {

src/ast/null_literal.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::NullLiteral);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::NullLiteral);
 
 namespace tint {
 namespace ast {

src/ast/return_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::ReturnStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::ReturnStatement);
 
 namespace tint {
 namespace ast {

src/ast/scalar_constructor_expression.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::ScalarConstructorExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::ScalarConstructorExpression);
 
 namespace tint {
 namespace ast {

src/ast/sint_literal.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::SintLiteral);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::SintLiteral);
 
 namespace tint {
 namespace ast {

src/ast/stage_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::StageDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::StageDecoration);
 
 namespace tint {
 namespace ast {

src/ast/statement.cc

@@ -31,7 +31,7 @@
 #include "src/ast/switch_statement.h"
 #include "src/ast/variable_decl_statement.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::Statement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::Statement);
 
 namespace tint {
 namespace ast {

src/ast/stride_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::StrideDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::StrideDecoration);
 
 namespace tint {
 namespace ast {

src/ast/struct.cc

@@ -18,7 +18,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::Struct);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::Struct);
 
 namespace tint {
 namespace ast {

src/ast/struct_block_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::StructBlockDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::StructBlockDecoration);
 
 namespace tint {
 namespace ast {

src/ast/struct_decoration.cc

@@ -14,7 +14,7 @@
 
 #include "src/ast/struct_decoration.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::StructDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::StructDecoration);
 
 namespace tint {
 namespace ast {

src/ast/struct_member.cc

@@ -18,7 +18,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::StructMember);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::StructMember);
 
 namespace tint {
 namespace ast {

src/ast/struct_member_decoration.cc

@@ -18,7 +18,7 @@
 
 #include "src/ast/struct_member_offset_decoration.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::StructMemberDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::StructMemberDecoration);
 
 namespace tint {
 namespace ast {

src/ast/struct_member_offset_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::StructMemberOffsetDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::StructMemberOffsetDecoration);
 
 namespace tint {
 namespace ast {

src/ast/switch_statement.cc

@@ -18,7 +18,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::SwitchStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::SwitchStatement);
 
 namespace tint {
 namespace ast {

src/ast/type_constructor_expression.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::TypeConstructorExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::TypeConstructorExpression);
 
 namespace tint {
 namespace ast {

src/ast/type_decoration.cc

@@ -18,7 +18,7 @@
 
 #include "src/ast/access_decoration.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::TypeDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::TypeDecoration);
 
 namespace tint {
 namespace ast {

src/ast/uint_literal.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::UintLiteral);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::UintLiteral);
 
 namespace tint {
 namespace ast {

src/ast/unary_op_expression.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::UnaryOpExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::UnaryOpExpression);
 
 namespace tint {
 namespace ast {

src/ast/variable.cc

@@ -21,7 +21,7 @@
 #include "src/program_builder.h"
 #include "src/semantic/variable.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::Variable);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::Variable);
 
 namespace tint {
 namespace ast {

src/ast/variable_decl_statement.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::VariableDeclStatement);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::VariableDeclStatement);
 
 namespace tint {
 namespace ast {

src/ast/variable_decoration.cc

@@ -16,7 +16,7 @@
 
 #include <assert.h>
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::VariableDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::VariableDecoration);
 
 namespace tint {
 namespace ast {

src/ast/workgroup_decoration.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::ast::WorkgroupDecoration);
+TINT_INSTANTIATE_TYPEINFO(tint::ast::WorkgroupDecoration);
 
 namespace tint {
 namespace ast {

src/castable.h

@@ -28,7 +28,7 @@ struct TypeInfoOf;
 }  // namespace detail
 
 /// Helper macro to instantiate the TypeInfo<T> template for `CLASS`.
-#define TINT_INSTANTIATE_CLASS_ID(CLASS)                       \
+#define TINT_INSTANTIATE_TYPEINFO(CLASS)                       \
   template <>                                                  \
   const tint::TypeInfo tint::detail::TypeInfoOf<CLASS>::info { \
     &tint::detail::TypeInfoOf<CLASS::TrueBase>::info, #CLASS,  \
@@ -56,7 +56,7 @@ struct TypeInfo {
 namespace detail {
 
 /// TypeInfoOf contains a single TypeInfo field for the type T.
-/// TINT_INSTANTIATE_CLASS_ID() must be defined in a .cpp file for each type
+/// TINT_INSTANTIATE_TYPEINFO() must be defined in a .cpp file for each type
 /// `T`.
 template <typename T>
 struct TypeInfoOf {

src/castable_test.cc

@@ -141,12 +141,12 @@ TEST(Castable, As) {
 
 }  // namespace
 
-TINT_INSTANTIATE_CLASS_ID(Animal);
-TINT_INSTANTIATE_CLASS_ID(Amphibian);
-TINT_INSTANTIATE_CLASS_ID(Mammal);
-TINT_INSTANTIATE_CLASS_ID(Reptile);
-TINT_INSTANTIATE_CLASS_ID(Frog);
-TINT_INSTANTIATE_CLASS_ID(Bear);
-TINT_INSTANTIATE_CLASS_ID(Gecko);
+TINT_INSTANTIATE_TYPEINFO(Animal);
+TINT_INSTANTIATE_TYPEINFO(Amphibian);
+TINT_INSTANTIATE_TYPEINFO(Mammal);
+TINT_INSTANTIATE_TYPEINFO(Reptile);
+TINT_INSTANTIATE_TYPEINFO(Frog);
+TINT_INSTANTIATE_TYPEINFO(Bear);
+TINT_INSTANTIATE_TYPEINFO(Gecko);
 
 }  // namespace tint

src/clone_context.cc

@@ -19,7 +19,7 @@
 #include "src/program.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::Cloneable);
+TINT_INSTANTIATE_TYPEINFO(tint::Cloneable);
 
 namespace tint {
 

src/clone_context_test.cc

@@ -284,9 +284,9 @@ TEST(CloneContext, CloneWithReplace_WithNotANode) {
 
 }  // namespace
 
-TINT_INSTANTIATE_CLASS_ID(Node);
-TINT_INSTANTIATE_CLASS_ID(Replaceable);
-TINT_INSTANTIATE_CLASS_ID(Replacement);
-TINT_INSTANTIATE_CLASS_ID(NotANode);
+TINT_INSTANTIATE_TYPEINFO(Node);
+TINT_INSTANTIATE_TYPEINFO(Replaceable);
+TINT_INSTANTIATE_TYPEINFO(Replacement);
+TINT_INSTANTIATE_TYPEINFO(NotANode);
 
 }  // namespace tint

src/reader/spirv/function.cc

@@ -5019,7 +5019,7 @@ FunctionEmitter::FunctionDeclaration::~FunctionDeclaration() = default;
 }  // namespace reader
 }  // namespace tint
 
-TINT_INSTANTIATE_CLASS_ID(tint::reader::spirv::StatementBuilder);
-TINT_INSTANTIATE_CLASS_ID(tint::reader::spirv::SwitchStatementBuilder);
-TINT_INSTANTIATE_CLASS_ID(tint::reader::spirv::IfStatementBuilder);
-TINT_INSTANTIATE_CLASS_ID(tint::reader::spirv::LoopStatementBuilder);
+TINT_INSTANTIATE_TYPEINFO(tint::reader::spirv::StatementBuilder);
+TINT_INSTANTIATE_TYPEINFO(tint::reader::spirv::SwitchStatementBuilder);
+TINT_INSTANTIATE_TYPEINFO(tint::reader::spirv::IfStatementBuilder);
+TINT_INSTANTIATE_TYPEINFO(tint::reader::spirv::LoopStatementBuilder);

src/semantic/sem_call.cc

@@ -14,7 +14,7 @@
 
 #include "src/semantic/call.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::semantic::Call);
+TINT_INSTANTIATE_TYPEINFO(tint::semantic::Call);
 
 namespace tint {
 namespace semantic {

src/semantic/sem_call_target.cc

@@ -17,7 +17,7 @@
 #include "src/symbol_table.h"
 #include "src/type/type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::semantic::CallTarget);
+TINT_INSTANTIATE_TYPEINFO(tint::semantic::CallTarget);
 
 namespace tint {
 namespace semantic {

src/semantic/sem_expression.cc

@@ -16,7 +16,7 @@
 
 #include "src/type/type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::semantic::Expression);
+TINT_INSTANTIATE_TYPEINFO(tint::semantic::Expression);
 
 namespace tint {
 namespace semantic {

src/semantic/sem_function.cc

@@ -27,7 +27,7 @@
 #include "src/type/storage_texture_type.h"
 #include "src/type/texture_type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::semantic::Function);
+TINT_INSTANTIATE_TYPEINFO(tint::semantic::Function);
 
 namespace tint {
 namespace semantic {

src/semantic/sem_intrinsic.cc

@@ -14,7 +14,7 @@
 
 #include "src/semantic/intrinsic.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::semantic::Intrinsic);
+TINT_INSTANTIATE_TYPEINFO(tint::semantic::Intrinsic);
 
 namespace tint {
 namespace semantic {

src/semantic/sem_member_accessor_expression.cc

@@ -14,7 +14,7 @@
 
 #include "src/semantic/member_accessor_expression.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::semantic::MemberAccessorExpression);
+TINT_INSTANTIATE_TYPEINFO(tint::semantic::MemberAccessorExpression);
 
 namespace tint {
 namespace semantic {

src/semantic/sem_node.cc

@@ -14,7 +14,7 @@
 
 #include "src/semantic/node.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::semantic::Node);
+TINT_INSTANTIATE_TYPEINFO(tint::semantic::Node);
 
 namespace tint {
 namespace semantic {

src/semantic/sem_statement.cc

@@ -16,7 +16,7 @@
 
 #include "src/type/type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::semantic::Statement);
+TINT_INSTANTIATE_TYPEINFO(tint::semantic::Statement);
 
 namespace tint {
 namespace semantic {

src/semantic/sem_variable.cc

@@ -14,7 +14,7 @@
 
 #include "src/semantic/variable.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::semantic::Variable);
+TINT_INSTANTIATE_TYPEINFO(tint::semantic::Variable);
 
 namespace tint {
 namespace semantic {

src/transform/first_index_offset.cc

@@ -55,7 +55,7 @@
 #include "src/type/u32_type.h"
 #include "src/type_determiner.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::transform::FirstIndexOffset::Data);
+TINT_INSTANTIATE_TYPEINFO(tint::transform::FirstIndexOffset::Data);
 
 namespace tint {
 namespace transform {

src/transform/transform.cc

@@ -19,7 +19,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::transform::Data);
+TINT_INSTANTIATE_TYPEINFO(tint::transform::Data);
 
 namespace tint {
 namespace transform {

src/type/access_control_type.cc

@@ -19,7 +19,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::AccessControl);
+TINT_INSTANTIATE_TYPEINFO(tint::type::AccessControl);
 
 namespace tint {
 namespace type {

src/type/alias_type.cc

@@ -19,7 +19,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Alias);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Alias);
 
 namespace tint {
 namespace type {

src/type/array_type.cc

@@ -22,7 +22,7 @@
 #include "src/program_builder.h"
 #include "src/type/vector_type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Array);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Array);
 
 namespace tint {
 namespace type {

src/type/bool_type.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Bool);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Bool);
 
 namespace tint {
 namespace type {

src/type/depth_texture_type.cc

@@ -20,7 +20,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::DepthTexture);
+TINT_INSTANTIATE_TYPEINFO(tint::type::DepthTexture);
 
 namespace tint {
 namespace type {

src/type/f32_type.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::F32);
+TINT_INSTANTIATE_TYPEINFO(tint::type::F32);
 
 namespace tint {
 namespace type {

src/type/i32_type.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::I32);
+TINT_INSTANTIATE_TYPEINFO(tint::type::I32);
 
 namespace tint {
 namespace type {

src/type/matrix_type.cc

@@ -21,7 +21,7 @@
 #include "src/type/array_type.h"
 #include "src/type/vector_type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Matrix);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Matrix);
 
 namespace tint {
 namespace type {

src/type/multisampled_texture_type.cc

@@ -20,7 +20,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::MultisampledTexture);
+TINT_INSTANTIATE_TYPEINFO(tint::type::MultisampledTexture);
 
 namespace tint {
 namespace type {

src/type/pointer_type.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Pointer);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Pointer);
 
 namespace tint {
 namespace type {

src/type/sampled_texture_type.cc

@@ -20,7 +20,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::SampledTexture);
+TINT_INSTANTIATE_TYPEINFO(tint::type::SampledTexture);
 
 namespace tint {
 namespace type {

src/type/sampler_type.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Sampler);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Sampler);
 
 namespace tint {
 namespace type {

src/type/storage_texture_type.cc

@@ -20,7 +20,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::StorageTexture);
+TINT_INSTANTIATE_TYPEINFO(tint::type::StorageTexture);
 
 namespace tint {
 namespace type {

src/type/struct_type.cc

@@ -24,7 +24,7 @@
 #include "src/type/matrix_type.h"
 #include "src/type/vector_type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Struct);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Struct);
 
 namespace tint {
 namespace type {

src/type/texture_type.cc

@@ -20,7 +20,7 @@
 #include "src/type/multisampled_texture_type.h"
 #include "src/type/sampled_texture_type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Texture);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Texture);
 
 namespace tint {
 namespace type {

src/type/type.cc

@@ -31,7 +31,7 @@
 #include "src/type/vector_type.h"
 #include "src/type/void_type.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Type);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Type);
 
 namespace tint {
 namespace type {

src/type/u32_type.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::U32);
+TINT_INSTANTIATE_TYPEINFO(tint::type::U32);
 
 namespace tint {
 namespace type {

src/type/vector_type.cc

@@ -20,7 +20,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Vector);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Vector);
 
 namespace tint {
 namespace type {

src/type/void_type.cc

@@ -17,7 +17,7 @@
 #include "src/clone_context.h"
 #include "src/program_builder.h"
 
-TINT_INSTANTIATE_CLASS_ID(tint::type::Void);
+TINT_INSTANTIATE_TYPEINFO(tint::type::Void);
 
 namespace tint {
 namespace type {