diff options
| author | Tapani Pälli <[email protected]> | 2018-08-07 08:20:29 +0300 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2018-08-09 13:07:16 +0300 |
| commit | 03a5acec687454c7fe227b4bdd2db97d515f1af7 (patch) | |
| tree | 8c16eb972f1be1fedbf4dca76b0ed167a7bd773f /src/compiler/glsl | |
| parent | fdfb689a48b11954f35fe39ad49cbe2108f2e279 (diff) | |
glsl: handle error case with ast_post_inc, ast_post_dec
Return ir_rvalue::error_value with ast_post_inc, ast_post_dec if
parser error was emitted previously. This way process_array_size
won't see bogus IR generated like with commit 9c676a64273.
Signed-off-by: Tapani Pälli <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98699
Reviewed-by: Iago Toral Quiroga <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 74160ec142b..5d3f10b6823 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -1928,6 +1928,11 @@ ast_expression::do_hir(exec_list *instructions, error_emitted = op[0]->type->is_error() || op[1]->type->is_error(); + if (error_emitted) { + result = ir_rvalue::error_value(ctx); + break; + } + type = arithmetic_result_type(op[0], op[1], false, state, & loc); ir_rvalue *temp_rhs; |