From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 15 Sep 2016 18:11:12 +0000 (-0700)
Subject: glsl: Fix cut-and-paste bug in hierarchical visitor ir_expression::accept
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea6ed2379d43330152273caa87f93ea7a77ec9f7;p=mesa.git

glsl: Fix cut-and-paste bug in hierarchical visitor ir_expression::accept

At this point in the code, s must be visit_continue.  If the child
returned visit_stop, visit_stop is the only correct thing to return.

Found by inspection.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/compiler/glsl/ir_hv_accept.cpp b/src/compiler/glsl/ir_hv_accept.cpp
index 213992af28c..5cc6a346fa4 100644
--- a/src/compiler/glsl/ir_hv_accept.cpp
+++ b/src/compiler/glsl/ir_hv_accept.cpp
@@ -147,7 +147,7 @@ ir_expression::accept(ir_hierarchical_visitor *v)
 	 goto done;
 
       case visit_stop:
-	 return s;
+	 return visit_stop;
       }
    }