From 90bbafa12541b420036912b2522038c871682996 Mon Sep 17 00:00:00 2001 From: David Neto Date: Mon, 20 Apr 2020 22:09:26 +0000 Subject: [PATCH] [spirv-reader] Fix build Fix bad merge around emission of OpBitcast. Change-Id: Iacc5ba1c3940745e4b2c46878bbc416397ec555f Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/20047 Reviewed-by: David Neto --- src/reader/spirv/function.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/reader/spirv/function.cc b/src/reader/spirv/function.cc index 33b6e4d08f..9e1d8ef687 100644 --- a/src/reader/spirv/function.cc +++ b/src/reader/spirv/function.cc @@ -427,9 +427,8 @@ TypedExpression FunctionEmitter::MaybeEmitCombinatorialValue( if (inst.opcode() == SpvOpBitcast) { auto target_ty = parser_impl_.ConvertType(inst.type_id()); - auto cast = std::make_unique(target_ty, operand(0)); - cast->set_result_type(target_ty); - return cast; + return {target_ty, + std::make_unique(target_ty, operand(0).expr)}; } // builtin readonly function