commit 25b7d4064f635d3b857eed02d7d463460e53ecf6
author Ben Clayton <bclayton@google.com> Thu May 27 17:05:47 2021 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 27 17:05:47 2021 +0000
tree 309d93588f0843a9259f7c06bfa7480646860e8e
parent 564000fdd3a5c525d272ecd21f9953e054a04fdd

reader/spirv: Handle parser error

MaybeEmitCombinatorialValue() didn't check that MakeOperand() or RectifySecondOperandSignedness() didn't error, leading to ICEs.

Bug: crbug.com/tint/804
Change-Id: Ic78487a70a591e718c7b5936c6678e7a19c4b626
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/51927
Commit-Queue: Ben Clayton <bclayton@google.com>
Auto-Submit: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: David Neto <dneto@google.com>

src/reader/spirv/function.cc

diff --git a/src/reader/spirv/function.cc b/src/reader/spirv/function.cc
index 0987f53..7ded27d 100644
--- a/src/reader/spirv/function.cc
+++ b/src/reader/spirv/function.cc
@@ -3510,6 +3510,9 @@
     auto arg0 = MakeOperand(inst, 0);
     auto arg1 = parser_impl_.RectifySecondOperandSignedness(
         inst, arg0.type, MakeOperand(inst, 1));
+    if (!arg0 || !arg1) {
+      return {};
+    }
     auto* binary_expr = create<ast::BinaryExpression>(Source{}, binary_op,
                                                       arg0.expr, arg1.expr);
     TypedExpression result{ast_type, binary_expr};