commit f19e0e4360403dbaa83c10c8e29f8e540b36a14d
author Antonio Maiorano <amaiorano@google.com> Mon Jun 21 20:51:16 2021 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jun 21 20:51:16 2021 +0000
tree 64ddeaf5ad74b87c2f4374acc1302de063e24468
parent fd75bd0965020ead514ce25caf946974bf50d06e

Validate that functions return atomic-free plain types

Bug: tint:876
Change-Id: If00aa2c64fc3039d6271d3c5e35c05635a6bf3d1
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/55480
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>

src/resolver/resolver.cc

diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc
index 25b1dbf..5d01d64 100644
--- a/src/resolver/resolver.cc
+++ b/src/resolver/resolver.cc
@@ -176,19 +176,45 @@
 }
 
 // https://gpuweb.github.io/gpuweb/wgsl/#plain-types-section
-bool Resolver::IsPlain(const sem::Type* type) {
+bool Resolver::IsPlain(const sem::Type* type) const {
   return type->is_scalar() || type->Is<sem::Atomic>() ||
          type->Is<sem::Vector>() || type->Is<sem::Matrix>() ||
          type->Is<sem::Array>() || type->Is<sem::Struct>();
 }
 
+// https://gpuweb.github.io/gpuweb/wgsl/#atomic-free
+bool Resolver::IsAtomicFreePlain(const sem::Type* type) const {
+  if (type->Is<sem::Atomic>()) {
+    return false;
+  }
+
+  if (type->is_scalar() || type->Is<sem::Vector>() || type->Is<sem::Matrix>()) {
+    return true;
+  }
+
+  if (auto* arr = type->As<sem::Array>()) {
+    return IsAtomicFreePlain(arr->ElemType());
+  }
+
+  if (auto* str = type->As<sem::Struct>()) {
+    for (auto* m : str->Members()) {
+      if (!IsAtomicFreePlain(m->Type())) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  return false;
+}
+
 // https://gpuweb.github.io/gpuweb/wgsl.html#storable-types
-bool Resolver::IsStorable(const sem::Type* type) {
+bool Resolver::IsStorable(const sem::Type* type) const {
   return IsPlain(type) || type->Is<sem::Texture>() || type->Is<sem::Sampler>();
 }
 
 // https://gpuweb.github.io/gpuweb/wgsl.html#host-shareable-types
-bool Resolver::IsHostShareable(const sem::Type* type) {
+bool Resolver::IsHostShareable(const sem::Type* type) const {
   if (type->IsAnyOf<sem::I32, sem::U32, sem::F32>()) {
     return true;
   }
@@ -1013,6 +1039,13 @@
   }
 
   if (!info->return_type->Is<sem::Void>()) {
+    if (!IsAtomicFreePlain(info->return_type)) {
+      diagnostics_.add_error(
+          "function return type must be an atomic-free plain type",
+          func->return_type()->source());
+      return false;
+    }
+
     if (func->body()) {
       if (!func->get_last_statement() ||
           !func->get_last_statement()->Is<ast::ReturnStatement>()) {