From 0da1c7b90fe01cdd1672fc65f118bff6c6a82878 Mon Sep 17 00:00:00 2001
From: Chad Versace <chad.versace@intel.com>
Date: Mon, 8 Nov 2010 17:30:13 -0800
Subject: [PATCH] glsl: Fix ir_expression::constant_expression_value()

When the type of the ir_expression is error_type, return NULL.
This fixes bug 31371.
(cherry picked from commit b62c1c4595551c4936323135224a5ea686ba972a)
---
 src/glsl/ir_constant_expression.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 61a708f6e2d..bab7466500e 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -54,6 +54,9 @@ dot(ir_constant *op0, ir_constant *op1)
 ir_constant *
 ir_expression::constant_expression_value()
 {
+   if (this->type->is_error())
+      return NULL;
+
    ir_constant *op[2] = { NULL, NULL };
    ir_constant_data data;