From 702dc43f7eda025103df8adaf9a57067f8f56f87 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 5 Jan 2018 18:19:42 -0800 Subject: [PATCH] glsl: Don't handle visit_stop in several ::accept methods MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit All cases where the result could be non-visit_continue would have already returned. CID: 401351, 1224465, 1224466 Signed-off-by: Ian Romanick Reviewed-by: Alejandro Piñeiro --- src/compiler/glsl/ir_hv_accept.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/compiler/glsl/ir_hv_accept.cpp b/src/compiler/glsl/ir_hv_accept.cpp index bf3f3d4f042..f04a5b6fd19 100644 --- a/src/compiler/glsl/ir_hv_accept.cpp +++ b/src/compiler/glsl/ir_hv_accept.cpp @@ -230,7 +230,8 @@ ir_texture::accept(ir_hierarchical_visitor *v) break; } - return (s == visit_stop) ? s : v->visit_leave(this); + assert(s == visit_continue); + return v->visit_leave(this); } @@ -414,7 +415,8 @@ ir_emit_vertex::accept(ir_hierarchical_visitor *v) if (s != visit_continue) return (s == visit_continue_with_parent) ? visit_continue : s; - return (s == visit_stop) ? s : v->visit_leave(this); + assert(s == visit_continue); + return v->visit_leave(this); } @@ -429,7 +431,8 @@ ir_end_primitive::accept(ir_hierarchical_visitor *v) if (s != visit_continue) return (s == visit_continue_with_parent) ? visit_continue : s; - return (s == visit_stop) ? s : v->visit_leave(this); + assert(s == visit_continue); + return v->visit_leave(this); } ir_visitor_status -- 2.30.2