OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return the rvalue of a variable decl to fix while (bool b = condition) {}

Browse Source
This commit is contained in:
Eric Anholt
2010-04-14 15:38:52 -07:00
parent 3b8d2cd779
commit 8558459512
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ast_to_hir.cpp
View File

@@ -1358,7 +1358,7 @@ ast_declarator_list::hir(exec_list *instructions,
struct simple_node *ptr; struct simple_node *ptr;
const struct glsl_type *decl_type; const struct glsl_type *decl_type;
const char *type_name = NULL; const char *type_name = NULL;
ir_rvalue *result = NULL;
/* FINISHME: Handle vertex shader "invariant" declarations that do not /* FINISHME: Handle vertex shader "invariant" declarations that do not
* FINISHME: include a type. These re-declare built-in variables to be * FINISHME: include a type. These re-declare built-in variables to be
@@ -1619,8 +1619,8 @@ ast_declarator_list::hir(exec_list *instructions,
bool temp = var->read_only; bool temp = var->read_only;
if (this->type->qualifier.constant) if (this->type->qualifier.constant)
var->read_only = false; var->read_only = false;
(void) do_assignment(instructions, state, lhs, rhs, result = do_assignment(instructions, state, lhs, rhs,
this->get_location()); this->get_location());
var->read_only = temp; var->read_only = temp;
} }
} }
@@ -1650,9 +1650,17 @@ ast_declarator_list::hir(exec_list *instructions,
assert(added_variable); assert(added_variable);
} }
/* Variable declarations do not have r-values.
/* Generally, variable declarations do not have r-values. However,
* one is used for the declaration in
*
* while (bool b = some_condition()) {
* ...
* }
*
* so we return the rvalue from the last seen declaration here.
*/ */
return NULL; return result;
} }