Replace VariableDecoration::(Is|As)Location with Castable

Change-Id: I3096045fc093f3782401ce8623a18e0bca49b22c
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/34309
Reviewed-by: dan sinclair <dsinclair@chromium.org>

src/ast/binding_decoration_test.cc

@@ -14,8 +14,8 @@
 
 #include "src/ast/binding_decoration.h"
 
-#include "src/ast/test_helper.h"
 #include "src/ast/constant_id_decoration.h"
+#include "src/ast/test_helper.h"
 
 namespace tint {
 namespace ast {
@@ -34,7 +34,7 @@ TEST_F(BindingDecorationTest, Is) {
   EXPECT_TRUE(d->Is<BindingDecoration>());
   EXPECT_FALSE(d->Is<BuiltinDecoration>());
   EXPECT_FALSE(d->Is<ConstantIdDecoration>());
-  EXPECT_FALSE(bd.IsLocation());
+  EXPECT_FALSE(d->Is<LocationDecoration>());
   EXPECT_FALSE(bd.IsSet());
 }
 

src/ast/builtin_decoration_test.cc

@@ -34,7 +34,7 @@ TEST_F(BuiltinDecorationTest, Is) {
   EXPECT_FALSE(d->Is<BindingDecoration>());
   EXPECT_TRUE(d->Is<BuiltinDecoration>());
   EXPECT_FALSE(d->Is<ConstantIdDecoration>());
-  EXPECT_FALSE(bd.IsLocation());
+  EXPECT_FALSE(d->Is<LocationDecoration>());
   EXPECT_FALSE(bd.IsSet());
 }
 

src/ast/constant_id_decoration_test.cc

@@ -33,7 +33,7 @@ TEST_F(ConstantIdDecorationTest, Is) {
   EXPECT_FALSE(d->Is<BindingDecoration>());
   EXPECT_FALSE(d->Is<BuiltinDecoration>());
   EXPECT_TRUE(d->Is<ConstantIdDecoration>());
-  EXPECT_FALSE(cd.IsLocation());
+  EXPECT_FALSE(d->Is<LocationDecoration>());
   EXPECT_FALSE(cd.IsSet());
 }
 

src/ast/decorated_variable.cc

@@ -18,6 +18,7 @@
 
 #include "src/ast/builtin_decoration.h"
 #include "src/ast/constant_id_decoration.h"
+#include "src/ast/location_decoration.h"
 
 namespace tint {
 namespace ast {
@@ -33,7 +34,7 @@ DecoratedVariable::~DecoratedVariable() = default;
 
 bool DecoratedVariable::HasLocationDecoration() const {
   for (auto* deco : decorations_) {
-    if (deco->IsLocation()) {
+    if (deco->Is<LocationDecoration>()) {
       return true;
     }
   }

src/ast/function.cc

@@ -89,8 +89,8 @@ Function::referenced_location_variables() const {
       continue;
     }
     for (auto* deco : var->AsDecorated()->decorations()) {
-      if (deco->IsLocation()) {
+      if (auto* location = deco->As<LocationDecoration>()) {
-        ret.push_back({var, deco->AsLocation()});
+        ret.push_back({var, location});
         break;
       }
     }

src/ast/location_decoration.cc

@@ -22,10 +22,6 @@ LocationDecoration::LocationDecoration(uint32_t val, const Source& source)
 
 LocationDecoration::~LocationDecoration() = default;
 
-bool LocationDecoration::IsLocation() const {
-  return true;
-}
-
 void LocationDecoration::to_str(std::ostream& out, size_t indent) const {
   make_indent(out, indent);
   out << "LocationDecoration{" << value_ << "}" << std::endl;

src/ast/location_decoration.h

@@ -32,9 +32,6 @@ class LocationDecoration
   explicit LocationDecoration(uint32_t value, const Source& source);
   ~LocationDecoration() override;
 
-  /// @returns true if this is a location decoration
-  bool IsLocation() const override;
-
   /// @returns the location value
   uint32_t value() const { return value_; }
 

src/ast/location_decoration_test.cc

@@ -36,7 +36,7 @@ TEST_F(LocationDecorationTest, Is) {
   EXPECT_FALSE(d->Is<BindingDecoration>());
   EXPECT_FALSE(d->Is<BuiltinDecoration>());
   EXPECT_FALSE(d->Is<ConstantIdDecoration>());
-  EXPECT_TRUE(ld.IsLocation());
+  EXPECT_TRUE(d->Is<LocationDecoration>());
   EXPECT_FALSE(ld.IsSet());
 }
 

src/ast/set_decoration_test.cc

@@ -34,7 +34,7 @@ TEST_F(SetDecorationTest, Is) {
   EXPECT_FALSE(d->Is<BindingDecoration>());
   EXPECT_FALSE(d->Is<BuiltinDecoration>());
   EXPECT_FALSE(d->Is<ConstantIdDecoration>());
-  EXPECT_FALSE(sd.IsLocation());
+  EXPECT_FALSE(d->Is<LocationDecoration>());
   EXPECT_TRUE(sd.IsSet());
 }
 

src/ast/variable_decoration.cc

@@ -16,7 +16,6 @@
 
 #include <assert.h>
 
-#include "src/ast/location_decoration.h"
 #include "src/ast/set_decoration.h"
 
 namespace tint {
@@ -32,19 +31,10 @@ DecorationKind VariableDecoration::GetKind() const {
   return Kind;
 }
 
-bool VariableDecoration::IsLocation() const {
-  return false;
-}
-
 bool VariableDecoration::IsSet() const {
   return false;
 }
 
-LocationDecoration* VariableDecoration::AsLocation() {
-  assert(IsLocation());
-  return static_cast<LocationDecoration*>(this);
-}
-
 SetDecoration* VariableDecoration::AsSet() {
   assert(IsSet());
   return static_cast<SetDecoration*>(this);

src/ast/variable_decoration.h

@@ -25,8 +25,6 @@
 namespace tint {
 namespace ast {
 
-class ConstantIdDecoration;
-class LocationDecoration;
 class SetDecoration;
 
 /// A decoration attached to a variable
@@ -40,13 +38,9 @@ class VariableDecoration : public Castable<VariableDecoration, Decoration> {
   /// @return the decoration kind
   DecorationKind GetKind() const override;
 
-  /// @returns true if this is a location decoration
-  virtual bool IsLocation() const;
   /// @returns true if this is a set decoration
   virtual bool IsSet() const;
 
-  /// @returns the decoration as a location decoration
-  LocationDecoration* AsLocation();
   /// @returns the decoration as a set decoration
   SetDecoration* AsSet();
 

src/reader/wgsl/parser_impl_variable_decoration_list_test.cc

@@ -36,8 +36,8 @@ TEST_F(ParserImplTest, VariableDecorationList_Parses) {
   ASSERT_NE(deco_0, nullptr);
   ASSERT_NE(deco_1, nullptr);
 
-  ASSERT_TRUE(deco_0->IsLocation());
+  ASSERT_TRUE(deco_0->Is<ast::LocationDecoration>());
-  EXPECT_EQ(deco_0->AsLocation()->value(), 4u);
+  EXPECT_EQ(deco_0->As<ast::LocationDecoration>()->value(), 4u);
   ASSERT_TRUE(deco_1->Is<ast::BuiltinDecoration>());
   EXPECT_EQ(deco_1->As<ast::BuiltinDecoration>()->value(),
             ast::Builtin::kPosition);

src/reader/wgsl/parser_impl_variable_decoration_test.cc

@@ -34,9 +34,9 @@ TEST_F(ParserImplTest, VariableDecoration_Location) {
   auto* var_deco = deco.value->As<ast::VariableDecoration>();
   ASSERT_NE(var_deco, nullptr);
   ASSERT_FALSE(p->has_error());
-  ASSERT_TRUE(var_deco->IsLocation());
+  ASSERT_TRUE(var_deco->Is<ast::LocationDecoration>());
 
-  auto* loc = var_deco->AsLocation();
+  auto* loc = var_deco->As<ast::LocationDecoration>();
   EXPECT_EQ(loc->value(), 4u);
 }
 

src/transform/vertex_pulling_transform.cc

@@ -200,20 +200,18 @@ void VertexPullingTransform::ConvertVertexInputVariablesToPrivate() {
     }
 
     for (auto* d : v->AsDecorated()->decorations()) {
-      if (!d->IsLocation()) {
+      if (auto* l = d->As<ast::LocationDecoration>()) {
-        continue;
+        uint32_t location = l->value();
-      }
-
-      uint32_t location = d->AsLocation()->value();
         // This is where the replacement happens. Expressions use identifier
-      // strings instead of pointers, so we don't need to update any other place
+        // strings instead of pointers, so we don't need to update any other
-      // in the AST.
+        // place in the AST.
         v = create<ast::Variable>(v->name(), ast::StorageClass::kPrivate,
                                   v->type());
         location_to_var_[location] = v;
         break;
       }
     }
+  }
 }
 
 void VertexPullingTransform::AddVertexStorageBuffers() {

src/writer/hlsl/generator_impl.cc

@@ -1377,15 +1377,14 @@ bool GeneratorImpl::EmitEntryPointData(
       }
 
       out << " " << var->name() << " : ";
-      if (deco->IsLocation()) {
+      if (auto* location = deco->As<ast::LocationDecoration>()) {
         if (func->pipeline_stage() == ast::PipelineStage::kCompute) {
           error_ = "invalid location variable for pipeline stage";
           return false;
         }
-        out << "TEXCOORD" << deco->AsLocation()->value();
+        out << "TEXCOORD" << location->value();
-      } else if (deco->Is<ast::BuiltinDecoration>()) {
+      } else if (auto* builtin = deco->As<ast::BuiltinDecoration>()) {
-        auto attr =
+        auto attr = builtin_to_attribute(builtin->value());
-            builtin_to_attribute(deco->As<ast::BuiltinDecoration>()->value());
         if (attr.empty()) {
           error_ = "unsupported builtin";
           return false;
@@ -1424,8 +1423,8 @@ bool GeneratorImpl::EmitEntryPointData(
 
       out << " " << var->name() << " : ";
 
-      if (deco->IsLocation()) {
+      if (auto* location = deco->As<ast::LocationDecoration>()) {
-        auto loc = deco->AsLocation()->value();
+        auto loc = location->value();
         if (func->pipeline_stage() == ast::PipelineStage::kVertex) {
           out << "TEXCOORD" << loc;
         } else if (func->pipeline_stage() == ast::PipelineStage::kFragment) {
@@ -1434,9 +1433,8 @@ bool GeneratorImpl::EmitEntryPointData(
           error_ = "invalid location variable for pipeline stage";
           return false;
         }
-      } else if (deco->Is<ast::BuiltinDecoration>()) {
+      } else if (auto* builtin = deco->As<ast::BuiltinDecoration>()) {
-        auto attr =
+        auto attr = builtin_to_attribute(builtin->value());
-            builtin_to_attribute(deco->As<ast::BuiltinDecoration>()->value());
         if (attr.empty()) {
           error_ = "unsupported builtin";
           return false;

src/writer/msl/generator_impl.cc

@@ -1060,8 +1060,8 @@ bool GeneratorImpl::EmitEntryPointData(ast::Function* func) {
 
       out_ << " " << var->name() << " [[";
 
-      if (deco->IsLocation()) {
+      if (auto* location = deco->As<ast::LocationDecoration>()) {
-        auto loc = deco->AsLocation()->value();
+        auto loc = location->value();
         if (func->pipeline_stage() == ast::PipelineStage::kVertex) {
           out_ << "user(locn" << loc << ")";
         } else if (func->pipeline_stage() == ast::PipelineStage::kFragment) {
@@ -1070,9 +1070,8 @@ bool GeneratorImpl::EmitEntryPointData(ast::Function* func) {
           error_ = "invalid location variable for pipeline stage";
           return false;
         }
-      } else if (deco->Is<ast::BuiltinDecoration>()) {
+      } else if (auto* builtin = deco->As<ast::BuiltinDecoration>()) {
-        auto attr =
+        auto attr = builtin_to_attribute(builtin->value());
-            builtin_to_attribute(deco->As<ast::BuiltinDecoration>()->value());
         if (attr.empty()) {
           error_ = "unsupported builtin";
           return false;

src/writer/spirv/builder.cc

@@ -784,10 +784,10 @@ bool Builder::GenerateGlobalVariable(ast::Variable* var) {
         push_annot(spv::Op::OpDecorate,
                    {Operand::Int(var_id), Operand::Int(SpvDecorationBuiltIn),
                     Operand::Int(ConvertBuiltin(builtin->value()))});
-      } else if (deco->IsLocation()) {
+      } else if (auto* location = deco->As<ast::LocationDecoration>()) {
         push_annot(spv::Op::OpDecorate,
                    {Operand::Int(var_id), Operand::Int(SpvDecorationLocation),
-                    Operand::Int(deco->AsLocation()->value())});
+                    Operand::Int(location->value())});
       } else if (auto* binding = deco->As<ast::BindingDecoration>()) {
         push_annot(spv::Op::OpDecorate,
                    {Operand::Int(var_id), Operand::Int(SpvDecorationBinding),

src/writer/wgsl/generator_impl.cc

@@ -645,8 +645,8 @@ bool GeneratorImpl::EmitVariableDecorations(ast::DecoratedVariable* var) {
       out_ << "binding(" << binding->value() << ")";
     } else if (deco->IsSet()) {
       out_ << "set(" << deco->AsSet()->value() << ")";
-    } else if (deco->IsLocation()) {
+    } else if (auto* location = deco->As<ast::LocationDecoration>()) {
-      out_ << "location(" << deco->AsLocation()->value() << ")";
+      out_ << "location(" << location->value() << ")";
     } else if (auto* builtin = deco->As<ast::BuiltinDecoration>()) {
       out_ << "builtin(" << builtin->value() << ")";
     } else if (auto* cid = deco->As<ast::ConstantIdDecoration>()) {