diff options
author | Francisco Jerez <currojerez@riseup.net> | 2013-09-20 15:36:38 -0700 |
---|---|---|
committer | Francisco Jerez <currojerez@riseup.net> | 2013-10-01 17:30:51 -0700 |
commit | 8bd1c69f3bc731a53d785aa7b3e8fea05bacef7d (patch) | |
tree | 313a298efb8b34f92169efa1774f43f185d4171d | |
parent | 70953b5fea1445fe121ac4b4a816c984742f2e19 (diff) |
glsl: Switch ast_node to the non-zeroing allocator.
All member variables of ast_node are already being initialized from
its constructor, but some of its derived classes were leaving members
uninitialized -- Fix them.
Using rzalloc makes it more likely that we will start relying on the
allocator to zero out all memory if the class is ever extended with
new member variables. That's bad because it ties objects to some
specific allocation scheme, and gives unpredictable results when an
object is created with a different allocator -- Stack allocation,
array allocation, or aggregation inside a different object are some of
the useful possibilities that come to my mind.
v2: Use NULL initialization instead of default construction for pointers.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r-- | src/glsl/ast.h | 10 | ||||
-rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/glsl/ast.h b/src/glsl/ast.h index c3361a1066..320e8ddd0e 100644 --- a/src/glsl/ast.h +++ b/src/glsl/ast.h @@ -49,7 +49,7 @@ struct YYLTYPE; */ class ast_node { public: - DECLARE_RZALLOC_CXX_OPERATORS(ast_node); + DECLARE_RALLOC_CXX_OPERATORS(ast_node); /** * Print an AST node in something approximating the original GLSL code @@ -576,6 +576,10 @@ public: virtual void print(void) const; bool has_qualifiers() const; + ast_fully_specified_type() : qualifier(), specifier(NULL) + { + } + const struct glsl_type *glsl_type(const char **name, struct _mesa_glsl_parse_state *state) const; @@ -859,6 +863,10 @@ public: class ast_function_definition : public ast_node { public: + ast_function_definition() : prototype(NULL), body(NULL) + { + } + virtual void print(void) const; virtual ir_rvalue *hir(exec_list *instructions, diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 3bc8d48277..4f2f2893a9 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -1050,7 +1050,8 @@ ast_expression::print(void) const ast_expression::ast_expression(int oper, ast_expression *ex0, ast_expression *ex1, - ast_expression *ex2) + ast_expression *ex2) : + primary_expression() { this->oper = ast_operators(oper); this->subexpressions[0] = ex0; |