Module: Mesa Branch: 9.1 Commit: 0f05066feab2863ff5b4570c8be129a8955996ee URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f05066feab2863ff5b4570c8be129a8955996ee
Author: Paul Berry <[email protected]> Date: Wed Jul 24 08:04:44 2013 -0700 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: [email protected] Reviewed-by: Kenneth Graunke <[email protected]> (cherry picked from commit a5eecb246d66fd8f27eca3c4f6f83bf2641b9403) --- src/glsl/loop_analysis.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/glsl/loop_analysis.cpp b/src/glsl/loop_analysis.cpp index 6a0e4da..fae5768 100644 --- a/src/glsl/loop_analysis.cpp +++ b/src/glsl/loop_analysis.cpp @@ -505,7 +505,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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
