From: Paul Berry Date: Wed, 24 Jul 2013 15:04:44 +0000 (-0700) Subject: glsl: Handle empty if statement encountered during loop analysis. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5eecb246d66fd8f27eca3c4f6f83bf2641b9403;p=mesa.git glsl: Handle empty if statement encountered during loop analysis. The is_loop_terminator() function was asserting that the following kind of if statement could never occur: if (...) { } else { } (presumably based on the assumption that such an if statement would be eliminated by previous optimization stages). But that isn't the case--it's possible that previous optimization stages might simplify more complex code down to this empty if statement, in which case it won't be eliminated until the next time through the optimization loop. So is_loop_terminator() needs to handle it. Fortunately it's easy to handle--it's not a loop terminator because it does nothing. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64330 CC: mesa-stable@lists.freedesktop.org Reviewed-by: Kenneth Graunke --- diff --git a/src/glsl/loop_analysis.cpp b/src/glsl/loop_analysis.cpp index 191e92de7c4..40897bb6fa8 100644 --- a/src/glsl/loop_analysis.cpp +++ b/src/glsl/loop_analysis.cpp @@ -503,7 +503,8 @@ is_loop_terminator(ir_if *ir) ir_instruction *const inst = (ir_instruction *) ir->then_instructions.get_head(); - assert(inst != NULL); + if (inst == NULL) + return false; if (inst->ir_type != ir_type_loop_jump) return false;