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>
diff --git a/src/ast/access_decoration.cc b/src/ast/access_decoration.cc
index 1d59be5..ed90ddc 100644
--- a/src/ast/access_decoration.cc
+++ b/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 {
diff --git a/src/ast/array_accessor_expression.cc b/src/ast/array_accessor_expression.cc
index c0d7c09..f82337f 100644
--- a/src/ast/array_accessor_expression.cc
+++ b/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 {
diff --git a/src/ast/array_decoration.cc b/src/ast/array_decoration.cc
index 7a5733a..1da02af 100644
--- a/src/ast/array_decoration.cc
+++ b/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 {
diff --git a/src/ast/assignment_statement.cc b/src/ast/assignment_statement.cc
index 9c8787e..f382948 100644
--- a/src/ast/assignment_statement.cc
+++ b/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 {
diff --git a/src/ast/binary_expression.cc b/src/ast/binary_expression.cc
index 980d035..a430e18 100644
--- a/src/ast/binary_expression.cc
+++ b/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 {
diff --git a/src/ast/binding_decoration.cc b/src/ast/binding_decoration.cc
index b15f023..b96c2aa 100644
--- a/src/ast/binding_decoration.cc
+++ b/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 {
diff --git a/src/ast/bitcast_expression.cc b/src/ast/bitcast_expression.cc
index eecfe7e..a134c21 100644
--- a/src/ast/bitcast_expression.cc
+++ b/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 {
diff --git a/src/ast/block_statement.cc b/src/ast/block_statement.cc
index 09ff97d..d5d18dc 100644
--- a/src/ast/block_statement.cc
+++ b/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 {
diff --git a/src/ast/bool_literal.cc b/src/ast/bool_literal.cc
index 1952456..d689730 100644
--- a/src/ast/bool_literal.cc
+++ b/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 {
diff --git a/src/ast/break_statement.cc b/src/ast/break_statement.cc
index 59de3d4..4346939 100644
--- a/src/ast/break_statement.cc
+++ b/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 {
diff --git a/src/ast/builtin_decoration.cc b/src/ast/builtin_decoration.cc
index 02300b6..90b5e40 100644
--- a/src/ast/builtin_decoration.cc
+++ b/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 {
diff --git a/src/ast/call_expression.cc b/src/ast/call_expression.cc
index d6a2c5a..8a85eb2 100644
--- a/src/ast/call_expression.cc
+++ b/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 {
diff --git a/src/ast/call_statement.cc b/src/ast/call_statement.cc
index 97bc730..b5fedd3 100644
--- a/src/ast/call_statement.cc
+++ b/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 {
diff --git a/src/ast/case_statement.cc b/src/ast/case_statement.cc
index a467999..dd60126 100644
--- a/src/ast/case_statement.cc
+++ b/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 {
diff --git a/src/ast/constant_id_decoration.cc b/src/ast/constant_id_decoration.cc
index 1fa9987..f816703 100644
--- a/src/ast/constant_id_decoration.cc
+++ b/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 {
diff --git a/src/ast/constructor_expression.cc b/src/ast/constructor_expression.cc
index 76d7636..7074cf9 100644
--- a/src/ast/constructor_expression.cc
+++ b/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 {
diff --git a/src/ast/continue_statement.cc b/src/ast/continue_statement.cc
index 5d3d7cb..a82cd34 100644
--- a/src/ast/continue_statement.cc
+++ b/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 {
diff --git a/src/ast/decoration.cc b/src/ast/decoration.cc
index 42abdde..c7573f4 100644
--- a/src/ast/decoration.cc
+++ b/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 {
diff --git a/src/ast/discard_statement.cc b/src/ast/discard_statement.cc
index 9deed12..e4a2c85 100644
--- a/src/ast/discard_statement.cc
+++ b/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 {
diff --git a/src/ast/else_statement.cc b/src/ast/else_statement.cc
index a80fe36..7643946 100644
--- a/src/ast/else_statement.cc
+++ b/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 {
diff --git a/src/ast/expression.cc b/src/ast/expression.cc
index 27745cf..57d546e 100644
--- a/src/ast/expression.cc
+++ b/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 {
diff --git a/src/ast/fallthrough_statement.cc b/src/ast/fallthrough_statement.cc
index ce1e715..5110928 100644
--- a/src/ast/fallthrough_statement.cc
+++ b/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 {
diff --git a/src/ast/float_literal.cc b/src/ast/float_literal.cc
index a99bec2..421880a 100644
--- a/src/ast/float_literal.cc
+++ b/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 {
diff --git a/src/ast/function.cc b/src/ast/function.cc
index f93e1d6..8110248 100644
--- a/src/ast/function.cc
+++ b/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 {
diff --git a/src/ast/function_decoration.cc b/src/ast/function_decoration.cc
index e81258f..802bd9c 100644
--- a/src/ast/function_decoration.cc
+++ b/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 {
diff --git a/src/ast/group_decoration.cc b/src/ast/group_decoration.cc
index 08a4107..c64d395 100644
--- a/src/ast/group_decoration.cc
+++ b/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 {
diff --git a/src/ast/identifier_expression.cc b/src/ast/identifier_expression.cc
index c8c9fd1..cd5c346 100644
--- a/src/ast/identifier_expression.cc
+++ b/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 {
diff --git a/src/ast/if_statement.cc b/src/ast/if_statement.cc
index 5ad49aa..94fc2df 100644
--- a/src/ast/if_statement.cc
+++ b/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 {
diff --git a/src/ast/int_literal.cc b/src/ast/int_literal.cc
index ba0b978..d915650 100644
--- a/src/ast/int_literal.cc
+++ b/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 {
diff --git a/src/ast/literal.cc b/src/ast/literal.cc
index 4c365da..f6a9ceb 100644
--- a/src/ast/literal.cc
+++ b/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 {
diff --git a/src/ast/location_decoration.cc b/src/ast/location_decoration.cc
index 4052819..0337f29 100644
--- a/src/ast/location_decoration.cc
+++ b/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 {
diff --git a/src/ast/loop_statement.cc b/src/ast/loop_statement.cc
index 9616499..98c99e4 100644
--- a/src/ast/loop_statement.cc
+++ b/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 {
diff --git a/src/ast/member_accessor_expression.cc b/src/ast/member_accessor_expression.cc
index be335f4..b632a61 100644
--- a/src/ast/member_accessor_expression.cc
+++ b/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 {
diff --git a/src/ast/module.cc b/src/ast/module.cc
index 91b8fdb..3791a18 100644
--- a/src/ast/module.cc
+++ b/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 {
diff --git a/src/ast/node.cc b/src/ast/node.cc
index 41480b2..4be1bec 100644
--- a/src/ast/node.cc
+++ b/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 {
diff --git a/src/ast/null_literal.cc b/src/ast/null_literal.cc
index 7ea8476..ccbc75c 100644
--- a/src/ast/null_literal.cc
+++ b/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 {
diff --git a/src/ast/return_statement.cc b/src/ast/return_statement.cc
index 49bebbc..81ec4f3 100644
--- a/src/ast/return_statement.cc
+++ b/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 {
diff --git a/src/ast/scalar_constructor_expression.cc b/src/ast/scalar_constructor_expression.cc
index 61cad8f..bd7a034 100644
--- a/src/ast/scalar_constructor_expression.cc
+++ b/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 {
diff --git a/src/ast/sint_literal.cc b/src/ast/sint_literal.cc
index 7a7eaef..784e204 100644
--- a/src/ast/sint_literal.cc
+++ b/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 {
diff --git a/src/ast/stage_decoration.cc b/src/ast/stage_decoration.cc
index bb12dfe..d5bf1ad 100644
--- a/src/ast/stage_decoration.cc
+++ b/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 {
diff --git a/src/ast/statement.cc b/src/ast/statement.cc
index cef7a9a..8ecb2b0 100644
--- a/src/ast/statement.cc
+++ b/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 {
diff --git a/src/ast/stride_decoration.cc b/src/ast/stride_decoration.cc
index 282aea6..8eb33e3 100644
--- a/src/ast/stride_decoration.cc
+++ b/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 {
diff --git a/src/ast/struct.cc b/src/ast/struct.cc
index 451fc19..f144568 100644
--- a/src/ast/struct.cc
+++ b/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 {
diff --git a/src/ast/struct_block_decoration.cc b/src/ast/struct_block_decoration.cc
index 87f5121..6c116af 100644
--- a/src/ast/struct_block_decoration.cc
+++ b/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 {
diff --git a/src/ast/struct_decoration.cc b/src/ast/struct_decoration.cc
index cb9a502..14ff5eb 100644
--- a/src/ast/struct_decoration.cc
+++ b/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 {
diff --git a/src/ast/struct_member.cc b/src/ast/struct_member.cc
index 9fc39c5..88b300f 100644
--- a/src/ast/struct_member.cc
+++ b/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 {
diff --git a/src/ast/struct_member_decoration.cc b/src/ast/struct_member_decoration.cc
index 2396d3d..ff472c9 100644
--- a/src/ast/struct_member_decoration.cc
+++ b/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 {
diff --git a/src/ast/struct_member_offset_decoration.cc b/src/ast/struct_member_offset_decoration.cc
index 9444dc5..68cd7b3 100644
--- a/src/ast/struct_member_offset_decoration.cc
+++ b/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 {
diff --git a/src/ast/switch_statement.cc b/src/ast/switch_statement.cc
index 67908a8..3b2bf36 100644
--- a/src/ast/switch_statement.cc
+++ b/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 {
diff --git a/src/ast/type_constructor_expression.cc b/src/ast/type_constructor_expression.cc
index 778ecca..d81bb34 100644
--- a/src/ast/type_constructor_expression.cc
+++ b/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 {
diff --git a/src/ast/type_decoration.cc b/src/ast/type_decoration.cc
index 68c7e89..03e4584 100644
--- a/src/ast/type_decoration.cc
+++ b/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 {
diff --git a/src/ast/uint_literal.cc b/src/ast/uint_literal.cc
index aaaf341..db03380 100644
--- a/src/ast/uint_literal.cc
+++ b/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 {
diff --git a/src/ast/unary_op_expression.cc b/src/ast/unary_op_expression.cc
index e803c21..10907c7 100644
--- a/src/ast/unary_op_expression.cc
+++ b/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 {
diff --git a/src/ast/variable.cc b/src/ast/variable.cc
index 1dd1bfe..042d412 100644
--- a/src/ast/variable.cc
+++ b/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 {
diff --git a/src/ast/variable_decl_statement.cc b/src/ast/variable_decl_statement.cc
index cf9c8d7..c0780c5 100644
--- a/src/ast/variable_decl_statement.cc
+++ b/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 {
diff --git a/src/ast/variable_decoration.cc b/src/ast/variable_decoration.cc
index b79ed55..4500817 100644
--- a/src/ast/variable_decoration.cc
+++ b/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 {
diff --git a/src/ast/workgroup_decoration.cc b/src/ast/workgroup_decoration.cc
index 8282a7c..8d4362c 100644
--- a/src/ast/workgroup_decoration.cc
+++ b/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 {
diff --git a/src/castable.h b/src/castable.h
index f619467..23be942 100644
--- a/src/castable.h
+++ b/src/castable.h
@@ -28,7 +28,7 @@
} // 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 @@
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 {
diff --git a/src/castable_test.cc b/src/castable_test.cc
index c2b9d7e..3330757 100644
--- a/src/castable_test.cc
+++ b/src/castable_test.cc
@@ -141,12 +141,12 @@
} // 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
diff --git a/src/clone_context.cc b/src/clone_context.cc
index cba462d..1ff9ff2 100644
--- a/src/clone_context.cc
+++ b/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 {
diff --git a/src/clone_context_test.cc b/src/clone_context_test.cc
index bb13dc3..5f38c99 100644
--- a/src/clone_context_test.cc
+++ b/src/clone_context_test.cc
@@ -284,9 +284,9 @@
} // 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
diff --git a/src/reader/spirv/function.cc b/src/reader/spirv/function.cc
index 2e9ead9..e9f0494 100644
--- a/src/reader/spirv/function.cc
+++ b/src/reader/spirv/function.cc
@@ -5019,7 +5019,7 @@
} // 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);
diff --git a/src/semantic/sem_call.cc b/src/semantic/sem_call.cc
index 6ba47ed..a39a036 100644
--- a/src/semantic/sem_call.cc
+++ b/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 {
diff --git a/src/semantic/sem_call_target.cc b/src/semantic/sem_call_target.cc
index 5c8011d..10c4817 100644
--- a/src/semantic/sem_call_target.cc
+++ b/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 {
diff --git a/src/semantic/sem_expression.cc b/src/semantic/sem_expression.cc
index 285493e..3f8b89a 100644
--- a/src/semantic/sem_expression.cc
+++ b/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 {
diff --git a/src/semantic/sem_function.cc b/src/semantic/sem_function.cc
index 28eb7f0..13c8e8c 100644
--- a/src/semantic/sem_function.cc
+++ b/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 {
diff --git a/src/semantic/sem_intrinsic.cc b/src/semantic/sem_intrinsic.cc
index 9e610ee..990cc3c 100644
--- a/src/semantic/sem_intrinsic.cc
+++ b/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 {
diff --git a/src/semantic/sem_member_accessor_expression.cc b/src/semantic/sem_member_accessor_expression.cc
index fdbaeb3..00488cc 100644
--- a/src/semantic/sem_member_accessor_expression.cc
+++ b/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 {
diff --git a/src/semantic/sem_node.cc b/src/semantic/sem_node.cc
index 84be5ab..82e570d 100644
--- a/src/semantic/sem_node.cc
+++ b/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 {
diff --git a/src/semantic/sem_statement.cc b/src/semantic/sem_statement.cc
index af25872..b9daf6c 100644
--- a/src/semantic/sem_statement.cc
+++ b/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 {
diff --git a/src/semantic/sem_variable.cc b/src/semantic/sem_variable.cc
index 8282087..1051a6e 100644
--- a/src/semantic/sem_variable.cc
+++ b/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 {
diff --git a/src/transform/first_index_offset.cc b/src/transform/first_index_offset.cc
index 55d0f27..cb543f8 100644
--- a/src/transform/first_index_offset.cc
+++ b/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 {
diff --git a/src/transform/transform.cc b/src/transform/transform.cc
index ed368ae..36dbc8f 100644
--- a/src/transform/transform.cc
+++ b/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 {
diff --git a/src/type/access_control_type.cc b/src/type/access_control_type.cc
index 19e938b..cdf034a 100644
--- a/src/type/access_control_type.cc
+++ b/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 {
diff --git a/src/type/alias_type.cc b/src/type/alias_type.cc
index 1bb580c..346db1d 100644
--- a/src/type/alias_type.cc
+++ b/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 {
diff --git a/src/type/array_type.cc b/src/type/array_type.cc
index aee68fa..914b3f5 100644
--- a/src/type/array_type.cc
+++ b/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 {
diff --git a/src/type/bool_type.cc b/src/type/bool_type.cc
index e548fde..b0e6a2c 100644
--- a/src/type/bool_type.cc
+++ b/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 {
diff --git a/src/type/depth_texture_type.cc b/src/type/depth_texture_type.cc
index 57f4b21..1a8573d 100644
--- a/src/type/depth_texture_type.cc
+++ b/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 {
diff --git a/src/type/f32_type.cc b/src/type/f32_type.cc
index e9b341a..53dfc24 100644
--- a/src/type/f32_type.cc
+++ b/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 {
diff --git a/src/type/i32_type.cc b/src/type/i32_type.cc
index d3f72ec..11c61f9 100644
--- a/src/type/i32_type.cc
+++ b/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 {
diff --git a/src/type/matrix_type.cc b/src/type/matrix_type.cc
index 0723543..8fbd2fd 100644
--- a/src/type/matrix_type.cc
+++ b/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 {
diff --git a/src/type/multisampled_texture_type.cc b/src/type/multisampled_texture_type.cc
index 4c0ec25..8568c98 100644
--- a/src/type/multisampled_texture_type.cc
+++ b/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 {
diff --git a/src/type/pointer_type.cc b/src/type/pointer_type.cc
index 7dd3649..7a7a635 100644
--- a/src/type/pointer_type.cc
+++ b/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 {
diff --git a/src/type/sampled_texture_type.cc b/src/type/sampled_texture_type.cc
index 24c0863..937c331 100644
--- a/src/type/sampled_texture_type.cc
+++ b/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 {
diff --git a/src/type/sampler_type.cc b/src/type/sampler_type.cc
index 01579ca..b005826 100644
--- a/src/type/sampler_type.cc
+++ b/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 {
diff --git a/src/type/storage_texture_type.cc b/src/type/storage_texture_type.cc
index 8c25055..488eb7a 100644
--- a/src/type/storage_texture_type.cc
+++ b/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 {
diff --git a/src/type/struct_type.cc b/src/type/struct_type.cc
index 11a8711..b8c50e6 100644
--- a/src/type/struct_type.cc
+++ b/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 {
diff --git a/src/type/texture_type.cc b/src/type/texture_type.cc
index 6fdc99c..8f55ad7 100644
--- a/src/type/texture_type.cc
+++ b/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 {
diff --git a/src/type/type.cc b/src/type/type.cc
index 2f089a0..b6cb59d 100644
--- a/src/type/type.cc
+++ b/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 {
diff --git a/src/type/u32_type.cc b/src/type/u32_type.cc
index b97fde6..407538b 100644
--- a/src/type/u32_type.cc
+++ b/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 {
diff --git a/src/type/vector_type.cc b/src/type/vector_type.cc
index b141a87..cb1ff73 100644
--- a/src/type/vector_type.cc
+++ b/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 {
diff --git a/src/type/void_type.cc b/src/type/void_type.cc
index 342c5ec..df750af 100644
--- a/src/type/void_type.cc
+++ b/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 {
