From 7a348b91ce983c7efb1db61f36083f7d8d088f26 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 13 Mar 2012 13:05:16 -0700 Subject: [PATCH] glsl: Make ir_dereference_variable ctor assert the variable exists. This also seems like a bad idea. There were too many instances for me to thoroughly scan the code as I did with the last two patches, but a quick scan indicated that most callers newly allocate a variable, dereference it, or NULL-check. In some cases, it wasn't clear that the value would be non-NULL, but they didn't check for error_type either. At any rate, not checking for this is a bug, and assertions will trigger it earlier and more reliably than returning error_type. Signed-off-by: Kenneth Graunke Reviewed-by: Eric Anholt --- src/glsl/ir.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index fb9a50e..3c9d6e1 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -1026,9 +1026,11 @@ ir_loop::ir_loop() ir_dereference_variable::ir_dereference_variable(ir_variable *var) { + assert(var != NULL); + this->ir_type = ir_type_dereference_variable; this->var = var; - this->type = (var != NULL) ? var->type : glsl_type::error_type; + this->type = var->type; } -- 2.7.4