ast: Make all non-semantic fields const

Annotate those that are set by the TypeDeterminer as "Semantic Info"

Bug: tint:396
Bug: tint:390
Change-Id: I0705c64e8e23d97a6430230728f82e64dd92efb7
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/35165
Auto-Submit: Ben Clayton <bclayton@google.com>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Reviewed-by: dan sinclair <dsinclair@chromium.org>

src/ast/access_decoration.h

@@ -49,7 +49,7 @@ class AccessDecoration : public Castable<AccessDecoration, TypeDecoration> {
   AccessDecoration* Clone(CloneContext* ctx) const override;
 
  private:
-  AccessControl value_ = ast::AccessControl::kReadWrite;
+  AccessControl const value_;
 };
 
 }  // namespace ast

src/ast/array_accessor_expression.h

@@ -64,8 +64,8 @@ class ArrayAccessorExpression
  private:
   ArrayAccessorExpression(const ArrayAccessorExpression&) = delete;
 
-  Expression* array_ = nullptr;
+  Expression* const array_;
-  Expression* idx_expr_ = nullptr;
+  Expression* const idx_expr_;
 };
 
 }  // namespace ast

src/ast/assignment_statement.h

@@ -61,8 +61,8 @@ class AssignmentStatement : public Castable<AssignmentStatement, Statement> {
  private:
   AssignmentStatement(const AssignmentStatement&) = delete;
 
-  Expression* lhs_ = nullptr;
+  Expression* const lhs_;
-  Expression* rhs_ = nullptr;
+  Expression* const rhs_;
 };
 
 }  // namespace ast

src/ast/binary_expression.h

@@ -127,9 +127,9 @@ class BinaryExpression : public Castable<BinaryExpression, Expression> {
  private:
   BinaryExpression(const BinaryExpression&) = delete;
 
-  BinaryOp op_ = BinaryOp::kNone;
+  BinaryOp const op_;
-  Expression* lhs_ = nullptr;
+  Expression* const lhs_;
-  Expression* rhs_ = nullptr;
+  Expression* const rhs_;
 };
 
 inline std::ostream& operator<<(std::ostream& out, BinaryOp op) {

src/ast/binding_decoration.h

@@ -49,7 +49,7 @@ class BindingDecoration
   BindingDecoration* Clone(CloneContext* ctx) const override;
 
  private:
-  uint32_t value_;
+  uint32_t const value_;
 };
 
 }  // namespace ast

src/ast/bitcast_expression.h

@@ -61,8 +61,8 @@ class BitcastExpression : public Castable<BitcastExpression, Expression> {
  private:
   BitcastExpression(const BitcastExpression&) = delete;
 
-  type::Type* type_ = nullptr;
+  type::Type* const type_;
-  Expression* expr_ = nullptr;
+  Expression* const expr_;
 };
 
 }  // namespace ast

src/ast/block_statement.h

@@ -83,7 +83,7 @@ class BlockStatement : public Castable<BlockStatement, Statement> {
  private:
   BlockStatement(const BlockStatement&) = delete;
 
-  StatementList statements_;
+  StatementList const statements_;
 };
 
 }  // namespace ast

src/ast/bool_literal.h

@@ -52,7 +52,7 @@ class BoolLiteral : public Castable<BoolLiteral, Literal> {
   BoolLiteral* Clone(CloneContext* ctx) const override;
 
  private:
-  bool value_;
+  bool const value_;
 };
 
 }  // namespace ast

src/ast/builtin_decoration.h

@@ -48,7 +48,7 @@ class BuiltinDecoration
   BuiltinDecoration* Clone(CloneContext* ctx) const override;
 
  private:
-  Builtin builtin_ = Builtin::kNone;
+  Builtin const builtin_;
 };
 
 }  // namespace ast

src/ast/call_expression.h

@@ -60,8 +60,8 @@ class CallExpression : public Castable<CallExpression, Expression> {
  private:
   CallExpression(const CallExpression&) = delete;
 
-  Expression* func_ = nullptr;
+  Expression* const func_;
-  ExpressionList params_;
+  ExpressionList const params_;
 };
 
 }  // namespace ast

src/ast/call_statement.h

@@ -57,7 +57,7 @@ class CallStatement : public Castable<CallStatement, Statement> {
  private:
   CallStatement(const CallStatement&) = delete;
 
-  CallExpression* call_ = nullptr;
+  CallExpression* const call_;
 };
 
 }  // namespace ast

src/ast/case_statement.h

@@ -73,8 +73,8 @@ class CaseStatement : public Castable<CaseStatement, Statement> {
  private:
   CaseStatement(const CaseStatement&) = delete;
 
-  CaseSelectorList selectors_;
+  CaseSelectorList const selectors_;
-  BlockStatement* body_ = nullptr;
+  BlockStatement* const body_;
 };
 
 /// A list of case statements

src/ast/constant_id_decoration.h

@@ -48,7 +48,7 @@ class ConstantIdDecoration
   ConstantIdDecoration* Clone(CloneContext* ctx) const override;
 
  private:
-  uint32_t value_ = 0;
+  uint32_t const value_;
 };
 
 }  // namespace ast

src/ast/else_statement.h

@@ -69,8 +69,8 @@ class ElseStatement : public Castable<ElseStatement, Statement> {
  private:
   ElseStatement(const ElseStatement&) = delete;
 
-  Expression* condition_ = nullptr;
+  Expression* const condition_;
-  BlockStatement* body_ = nullptr;
+  BlockStatement* const body_;
 };
 
 /// A list of else statements

src/ast/expression.h

@@ -52,7 +52,7 @@ class Expression : public Castable<Expression, Node> {
  private:
   Expression(const Expression&) = delete;
 
-  type::Type* result_type_ = nullptr;
+  type::Type* result_type_ = nullptr;  // Semantic info
 };
 
 /// A list of expressions

src/ast/float_literal.h

@@ -50,7 +50,7 @@ class FloatLiteral : public Castable<FloatLiteral, Literal> {
   FloatLiteral* Clone(CloneContext* ctx) const override;
 
  private:
-  float value_;
+  float const value_;
 };
 
 }  // namespace ast

src/ast/function.h

@@ -202,15 +202,16 @@ class Function : public Castable<Function, Node> {
   const std::vector<std::pair<Variable*, Function::BindingInfo>>
   ReferencedSampledTextureVariablesImpl(bool multisampled) const;
 
-  Symbol symbol_;
+  Symbol const symbol_;
-  std::string name_;
+  std::string const name_;
-  VariableList params_;
+  VariableList const params_;
-  type::Type* return_type_ = nullptr;
+  type::Type* const return_type_;
-  BlockStatement* body_ = nullptr;
+  BlockStatement* const body_;
-  std::vector<Variable*> referenced_module_vars_;
+
-  std::vector<Variable*> local_referenced_module_vars_;
+  std::vector<Variable*> referenced_module_vars_;        // Semantic info
-  std::vector<Symbol> ancestor_entry_points_;
+  std::vector<Variable*> local_referenced_module_vars_;  // Semantic info
-  FunctionDecorationList decorations_;
+  std::vector<Symbol> ancestor_entry_points_;            // Semantic info
+  FunctionDecorationList decorations_;                   // Semantic info
 };
 
 /// A list of functions

src/ast/identifier_expression.h

@@ -83,10 +83,11 @@ class IdentifierExpression : public Castable<IdentifierExpression, Expression> {
  private:
   IdentifierExpression(const IdentifierExpression&) = delete;
 
-  Intrinsic intrinsic_ = Intrinsic::kNone;
+  Symbol const sym_;
-  std::unique_ptr<intrinsic::Signature> intrinsic_sig_;
+  std::string const name_;
-  Symbol sym_;
+
-  std::string name_;
+  Intrinsic intrinsic_ = Intrinsic::kNone;               // Semantic info
+  std::unique_ptr<intrinsic::Signature> intrinsic_sig_;  // Semantic info
 };
 
 }  // namespace ast

src/ast/if_statement.h

@@ -51,8 +51,6 @@ class IfStatement : public Castable<IfStatement, Statement> {
 
   /// @returns the else statements
   const ElseStatementList& else_statements() const { return else_statements_; }
-  /// @returns the else statements
-  ElseStatementList& else_statements() { return else_statements_; }
 
   /// @returns true if there are else statements
   bool has_else_statements() const { return !else_statements_.empty(); }
@@ -76,9 +74,9 @@ class IfStatement : public Castable<IfStatement, Statement> {
  private:
   IfStatement(const IfStatement&) = delete;
 
-  Expression* condition_ = nullptr;
+  Expression* const condition_;
-  BlockStatement* body_ = nullptr;
+  BlockStatement* const body_;
-  ElseStatementList else_statements_;
+  ElseStatementList const else_statements_;
 };
 
 }  // namespace ast

src/ast/literal.h

@@ -52,7 +52,7 @@ class Literal : public Castable<Literal, Node> {
   explicit Literal(const Source& source, type::Type* type);
 
  private:
-  type::Type* type_ = nullptr;
+  type::Type* const type_;
 };
 
 }  // namespace ast

src/ast/location_decoration.h

@@ -49,7 +49,7 @@ class LocationDecoration
   LocationDecoration* Clone(CloneContext* ctx) const override;
 
  private:
-  uint32_t value_;
+  uint32_t const value_;
 };
 
 }  // namespace ast

src/ast/loop_statement.h

@@ -71,8 +71,8 @@ class LoopStatement : public Castable<LoopStatement, Statement> {
  private:
   LoopStatement(const LoopStatement&) = delete;
 
-  BlockStatement* body_ = nullptr;
+  BlockStatement* const body_;
-  BlockStatement* continuing_ = nullptr;
+  BlockStatement* const continuing_;
 };
 
 }  // namespace ast

src/ast/member_accessor_expression.h

@@ -64,8 +64,8 @@ class MemberAccessorExpression
  private:
   MemberAccessorExpression(const MemberAccessorExpression&) = delete;
 
-  Expression* struct_ = nullptr;
+  Expression* const struct_;
-  IdentifierExpression* member_ = nullptr;
+  IdentifierExpression* const member_;
 };
 
 }  // namespace ast

src/ast/node.h

@@ -75,7 +75,7 @@ class Node : public Castable<Node> {
  private:
   Node(const Node&) = delete;
 
-  Source source_;
+  Source const source_;
 };
 
 }  // namespace ast

src/ast/return_statement.cc

@@ -22,7 +22,8 @@ TINT_INSTANTIATE_CLASS_ID(tint::ast::ReturnStatement);
 namespace tint {
 namespace ast {
 
-ReturnStatement::ReturnStatement(const Source& source) : Base(source) {}
+ReturnStatement::ReturnStatement(const Source& source)
+    : Base(source), value_(nullptr) {}
 
 ReturnStatement::ReturnStatement(const Source& source, Expression* value)
     : Base(source), value_(value) {}

src/ast/return_statement.h

@@ -62,7 +62,7 @@ class ReturnStatement : public Castable<ReturnStatement, Statement> {
  private:
   ReturnStatement(const ReturnStatement&) = delete;
 
-  Expression* value_ = nullptr;
+  Expression* const value_;
 };
 
 }  // namespace ast

src/ast/scalar_constructor_expression.h

@@ -58,7 +58,7 @@ class ScalarConstructorExpression
  private:
   ScalarConstructorExpression(const ScalarConstructorExpression&) = delete;
 
-  Literal* literal_ = nullptr;
+  Literal* const literal_;
 };
 
 }  // namespace ast

src/ast/set_decoration.h

@@ -48,7 +48,7 @@ class SetDecoration : public Castable<SetDecoration, VariableDecoration> {
   SetDecoration* Clone(CloneContext* ctx) const override;
 
  private:
-  uint32_t value_;
+  uint32_t const value_;
 };
 
 }  // namespace ast

src/ast/sint_literal.h

@@ -50,7 +50,7 @@ class SintLiteral : public Castable<SintLiteral, IntLiteral> {
   SintLiteral* Clone(CloneContext* ctx) const override;
 
  private:
-  int32_t value_;
+  int32_t const value_;
 };
 
 }  // namespace ast

src/ast/stage_decoration.h

@@ -47,7 +47,7 @@ class StageDecoration : public Castable<StageDecoration, FunctionDecoration> {
   StageDecoration* Clone(CloneContext* ctx) const override;
 
  private:
-  PipelineStage stage_ = PipelineStage::kNone;
+  PipelineStage const stage_;
 };
 
 }  // namespace ast

src/ast/stride_decoration.h

@@ -48,7 +48,7 @@ class StrideDecoration : public Castable<StrideDecoration, ArrayDecoration> {
   StrideDecoration* Clone(CloneContext* ctx) const override;
 
  private:
-  uint32_t stride_;
+  uint32_t const stride_;
 };
 
 }  // namespace ast

src/ast/struct.h

@@ -74,8 +74,8 @@ class Struct : public Castable<Struct, Node> {
  private:
   Struct(const Struct&) = delete;
 
-  StructMemberList members_;
+  StructMemberList const members_;
-  StructDecorationList decorations_;
+  StructDecorationList const decorations_;
 };
 
 }  // namespace ast

src/ast/struct_member.h

@@ -77,9 +77,9 @@ class StructMember : public Castable<StructMember, Node> {
  private:
   StructMember(const StructMember&) = delete;
 
-  std::string name_;
+  std::string const name_;
-  type::Type* type_ = nullptr;
+  type::Type* const type_;
-  StructMemberDecorationList decorations_;
+  StructMemberDecorationList const decorations_;
 };
 
 /// A list of struct members

src/ast/struct_member_offset_decoration.h

@@ -49,7 +49,7 @@ class StructMemberOffsetDecoration
   StructMemberOffsetDecoration* Clone(CloneContext* ctx) const override;
 
  private:
-  uint32_t offset_;
+  uint32_t const offset_;
 };
 
 }  // namespace ast

src/ast/switch_statement.h

@@ -45,8 +45,6 @@ class SwitchStatement : public Castable<SwitchStatement, Statement> {
   /// @returns true if this is a default statement
   bool IsDefault() const { return condition_ == nullptr; }
 
-  /// @returns the Switch body
-  CaseStatementList& body() { return body_; }
   /// @returns the Switch body
   const CaseStatementList& body() const { return body_; }
 
@@ -69,8 +67,8 @@ class SwitchStatement : public Castable<SwitchStatement, Statement> {
  private:
   SwitchStatement(const SwitchStatement&) = delete;
 
-  Expression* condition_ = nullptr;
+  Expression* const condition_;
-  CaseStatementList body_;
+  CaseStatementList const body_;
 };
 
 }  // namespace ast

src/ast/type/access_control_type.h

@@ -66,8 +66,8 @@ class AccessControl : public Castable<AccessControl, Type> {
   AccessControl* Clone(CloneContext* ctx) const override;
 
  private:
-  ast::AccessControl access_ = ast::AccessControl::kReadOnly;
+  ast::AccessControl const access_;
-  Type* subtype_ = nullptr;
+  Type* const subtype_;
 };
 
 }  // namespace type

src/ast/type/alias_type.h

@@ -63,9 +63,9 @@ class Alias : public Castable<Alias, Type> {
   Alias* Clone(CloneContext* ctx) const override;
 
  private:
-  Symbol symbol_;
+  Symbol const symbol_;
-  std::string name_;
+  std::string const name_;
-  Type* subtype_ = nullptr;
+  Type* const subtype_;
 };
 
 }  // namespace type

src/ast/type/array_type.h

@@ -76,9 +76,9 @@ class Array : public Castable<Array, Type> {
   Array* Clone(CloneContext* ctx) const override;
 
  private:
-  Type* subtype_ = nullptr;
+  Type* const subtype_;
-  uint32_t size_ = 0;
+  uint32_t const size_;
-  ArrayDecorationList decos_;
+  ArrayDecorationList const decos_;
 };
 
 }  // namespace type

src/ast/type/matrix_type.h

@@ -61,9 +61,9 @@ class Matrix : public Castable<Matrix, Type> {
   Matrix* Clone(CloneContext* ctx) const override;
 
  private:
-  Type* subtype_ = nullptr;
+  Type* const subtype_;
-  uint32_t rows_ = 2;
+  uint32_t const rows_;
-  uint32_t columns_ = 2;
+  uint32_t const columns_;
 };
 
 }  // namespace type

src/ast/type/multisampled_texture_type.h

@@ -46,7 +46,7 @@ class MultisampledTexture : public Castable<MultisampledTexture, Texture> {
   MultisampledTexture* Clone(CloneContext* ctx) const override;
 
  private:
-  Type* type_ = nullptr;
+  Type* const type_;
 };
 
 }  // namespace type

src/ast/type/pointer_type.h

@@ -50,8 +50,8 @@ class Pointer : public Castable<Pointer, Type> {
   Pointer* Clone(CloneContext* ctx) const override;
 
  private:
-  Type* subtype_;
+  Type* const subtype_;
-  StorageClass storage_class_;
+  StorageClass const storage_class_;
 };
 
 }  // namespace type

src/ast/type/sampled_texture_type.h

@@ -46,7 +46,7 @@ class SampledTexture : public Castable<SampledTexture, Texture> {
   SampledTexture* Clone(CloneContext* ctx) const override;
 
  private:
-  Type* type_ = nullptr;
+  Type* const type_;
 };
 
 }  // namespace type

src/ast/type/sampler_type.h

@@ -58,7 +58,7 @@ class Sampler : public Castable<Sampler, Type> {
   Sampler* Clone(CloneContext* ctx) const override;
 
  private:
-  SamplerKind kind_ = SamplerKind::kSampler;
+  SamplerKind const kind_;
 };
 
 }  // namespace type

src/ast/type/storage_texture_type.h

@@ -101,9 +101,10 @@ class StorageTexture : public Castable<StorageTexture, Texture> {
   StorageTexture* Clone(CloneContext* ctx) const override;
 
  private:
-  Type* type_ = nullptr;
+  ast::AccessControl const access_;
-  ast::AccessControl access_ = ast::AccessControl::kReadOnly;
+  ImageFormat const image_format_;
-  ImageFormat image_format_ = ImageFormat::kRgba32Float;
+
+  Type* type_ = nullptr;  // Semantic info
 };
 
 }  // namespace type

src/ast/type/struct_type.h

@@ -68,9 +68,9 @@ class Struct : public Castable<Struct, Type> {
   Struct* Clone(CloneContext* ctx) const override;
 
  private:
-  Symbol symbol_;
+  Symbol const symbol_;
-  std::string name_;
+  std::string const name_;
-  ast::Struct* struct_ = nullptr;
+  ast::Struct* const struct_;
 
   uint64_t LargestMemberBaseAlignment(MemoryLayout mem_layout) const;
 };

src/ast/type/texture_type.h

@@ -56,7 +56,7 @@ class Texture : public Castable<Texture, Type> {
   TextureDimension dim() const { return dim_; }
 
  private:
-  TextureDimension dim_ = TextureDimension::k1d;
+  TextureDimension const dim_;
 };
 
 }  // namespace type

src/ast/type/vector_type.h

@@ -58,8 +58,8 @@ class Vector : public Castable<Vector, Type> {
   Vector* Clone(CloneContext* ctx) const override;
 
  private:
-  Type* subtype_ = nullptr;
+  Type* const subtype_;
-  uint32_t size_ = 2;
+  uint32_t const size_;
 };
 
 }  // namespace type

src/ast/type_constructor_expression.h

@@ -63,8 +63,8 @@ class TypeConstructorExpression
  private:
   TypeConstructorExpression(const TypeConstructorExpression&) = delete;
 
-  type::Type* type_ = nullptr;
+  type::Type* const type_;
-  ExpressionList values_;
+  ExpressionList const values_;
 };
 
 }  // namespace ast

src/ast/uint_literal.h

@@ -50,7 +50,7 @@ class UintLiteral : public Castable<UintLiteral, IntLiteral> {
   UintLiteral* Clone(CloneContext* ctx) const override;
 
  private:
-  uint32_t value_;
+  uint32_t const value_;
 };
 
 }  // namespace ast

src/ast/unary_op_expression.h

@@ -61,8 +61,8 @@ class UnaryOpExpression : public Castable<UnaryOpExpression, Expression> {
  private:
   UnaryOpExpression(const UnaryOpExpression&) = delete;
 
-  UnaryOp op_ = UnaryOp::kNegation;
+  UnaryOp const op_;
-  Expression* expr_ = nullptr;
+  Expression* const expr_;
 };
 
 }  // namespace ast

src/ast/variable.cc

@@ -34,11 +34,11 @@ Variable::Variable(const Source& source,
                    VariableDecorationList decorations)
     : Base(source),
       name_(name),
-      storage_class_(sc),
       type_(type),
       is_const_(is_const),
       constructor_(constructor),
-      decorations_(std::move(decorations)) {}
+      decorations_(std::move(decorations)),
+      storage_class_(sc) {}
 
 Variable::Variable(Variable&&) = default;
 

src/ast/variable.h

@@ -162,13 +162,14 @@ class Variable : public Castable<Variable, Node> {
  private:
   Variable(const Variable&) = delete;
 
-  std::string name_;
+  std::string const name_;
-  StorageClass storage_class_ = StorageClass::kNone;
   // The value type if a const or formal paramter, and the store type if a var
-  type::Type* type_ = nullptr;
+  type::Type* const type_;
-  bool is_const_ = false;
+  bool const is_const_;
-  Expression* constructor_ = nullptr;
+  Expression* const constructor_;
-  VariableDecorationList decorations_;
+  VariableDecorationList const decorations_;
+
+  StorageClass storage_class_ = StorageClass::kNone;  // Semantic info
 };
 
 /// A list of variables

src/ast/variable_decl_statement.h

@@ -59,7 +59,7 @@ class VariableDeclStatement
  private:
   VariableDeclStatement(const VariableDeclStatement&) = delete;
 
-  Variable* variable_ = nullptr;
+  Variable* const variable_;
 };
 
 }  // namespace ast

src/ast/workgroup_decoration.cc

@@ -23,12 +23,12 @@ namespace tint {
 namespace ast {
 
 WorkgroupDecoration::WorkgroupDecoration(const Source& source, uint32_t x)
-    : Base(source), x_(x) {}
+    : WorkgroupDecoration(source, x, 1, 1) {}
 
 WorkgroupDecoration::WorkgroupDecoration(const Source& source,
                                          uint32_t x,
                                          uint32_t y)
-    : Base(source), x_(x), y_(y) {}
+    : WorkgroupDecoration(source, x, y, 1) {}
 
 WorkgroupDecoration::WorkgroupDecoration(const Source& source,
                                          uint32_t x,

src/ast/workgroup_decoration.h

@@ -64,9 +64,9 @@ class WorkgroupDecoration
   WorkgroupDecoration* Clone(CloneContext* ctx) const override;
 
  private:
-  uint32_t x_ = 1;
+  uint32_t const x_;
-  uint32_t y_ = 1;
+  uint32_t const y_;
-  uint32_t z_ = 1;
+  uint32_t const z_;
 };
 
 }  // namespace ast