[vala/emit-let: 1/4] codegen: Guard access to array length of TargetValue

[Luca Bruno <lucabru src gnome org>]

commit 6979319cb35016d7e7cfe8e665d05d0d6e95ed67
Author: Luca Bruno <lucabru src gnome org>
Date:   Thu Jan 20 00:31:41 2011 +0100

    codegen: Guard access to array length of TargetValue

 codegen/valaccodeassignmentmodule.vala |    8 +++-----
 codegen/valaccodebasemodule.vala       |   32 +++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/codegen/valaccodeassignmentmodule.vala b/codegen/valaccodeassignmentmodule.vala
index cf8e217..08d4544 100644
--- a/codegen/valaccodeassignmentmodule.vala
+++ b/codegen/valaccodeassignmentmodule.vala
@@ -67,7 +67,7 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
 				ccode.add_expression (get_unref_expression (lhs, assignment.left.value_type, assignment.left));
 			}
 			
-			if (array) {
+			if (array && has_array_length (assignment.left.target_value)) {
 				var array_type = (ArrayType) assignment.left.value_type;
 				for (int dim = 1; dim <= array_type.rank; dim++) {
 					var lhs_array_len = get_array_length_cexpression (assignment.left, dim);
@@ -195,11 +195,9 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
 				ccopy.add_argument (get_cvalue_ (value));
 				ccopy.add_argument (size);
 				ccode.add_expression (ccopy);
-			} else {
+			} else if (has_array_length (lvalue)) {
 				for (int dim = 1; dim <= array_type.rank; dim++) {
-					if (get_array_length_cvalue (lvalue, dim) != null) {
-						ccode.add_assignment (get_array_length_cvalue (lvalue, dim), get_array_length_cvalue (value, dim));
-					}
+					ccode.add_assignment (get_array_length_cvalue (lvalue, dim), get_array_length_cvalue (value, dim));
 				}
 				if (array_type.rank == 1) {
 					if (get_array_size_cvalue (lvalue) != null) {
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 14258bc..1c0e415 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -2910,7 +2910,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 				ccall.add_argument (new CCodeConstant ("TRUE"));
 			} else if (type is ArrayType) {
 				var array_type = (ArrayType) type;
-				if (requires_destroy (array_type.element_type)) {
+				if (requires_destroy (array_type.element_type) && has_array_length (value)) {
 					CCodeExpression csizeexpr = null;
 					bool first = true;
 					for (int dim = 1; dim <= array_type.rank; dim++) {
@@ -3193,13 +3193,15 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
 			var array_type = (ArrayType) current_return_type;
 
-			for (int dim = 1; dim <= array_type.rank; dim++) {
-				var len_l = get_result_cexpression (get_array_length_cname ("result", dim));
-				if (!is_in_coroutine ()) {
-					len_l = new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, len_l);
+			if (has_array_length (stmt.return_expression.target_value)) {
+				for (int dim = 1; dim <= array_type.rank; dim++) {
+					var len_l = get_result_cexpression (get_array_length_cname ("result", dim));
+					if (!is_in_coroutine ()) {
+						len_l = new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, len_l);
+					}
+					var len_r = get_array_length_cexpression (stmt.return_expression, dim);
+					ccode.add_assignment (len_l, len_r);
 				}
-				var len_r = get_array_length_cexpression (stmt.return_expression, dim);
-				ccode.add_assignment (len_l, len_r);
 			}
 
 			set_cvalue (stmt.return_expression, get_variable_cexpression (return_expr_decl.name));
@@ -3800,7 +3802,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 				ccall.add_argument (ctemp);
 			}
 
-			if (expression_type is ArrayType) {
+			if (expression_type is ArrayType && has_array_length (expr.target_value)) {
 				var array_type = (ArrayType) expression_type;
 				bool first = true;
 				CCodeExpression csizeexpr = null;
@@ -4354,7 +4356,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 			set_cvalue (expr, new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, get_cvalue (expr.inner)));
 
 			var array_type = expr.value_type as ArrayType;
-			if (array_type != null) {
+			if (array_type != null && has_array_length (expr.inner.target_value)) {
 				for (int dim = 1; dim <= array_type.rank; dim++) {
 					append_array_length (expr, new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, get_array_length_cexpression (expr.inner, dim)));
 				}
@@ -4539,7 +4541,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
 			// retain array length
 			var array_type = expr.type_reference as ArrayType;
-			if (array_type != null && expr.inner.value_type is ArrayType) {
+			if (array_type != null && has_array_length (expr.inner.target_value)) {
 				for (int dim = 1; dim <= array_type.rank; dim++) {
 					append_array_length (expr, get_array_length_cexpression (expr.inner, dim));
 				}
@@ -4608,7 +4610,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 		set_cvalue (expr, cvar);
 
 		var array_type = expr.value_type as ArrayType;
-		if (array_type != null) {
+		if (array_type != null && has_array_length (expr.inner.target_value)) {
 			for (int dim = 1; dim <= array_type.rank; dim++) {
 				append_array_length (expr, get_array_length_cexpression (expr.inner, dim));
 			}
@@ -5070,7 +5072,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 				ccode.add_assignment (get_variable_cexpression (decl.name), cexpr);
 				cexpr = get_variable_cexpression (decl.name);
 
-				if (expression_type is ArrayType && expr != null) {
+				if (expression_type is ArrayType && expr != null && has_array_length (expr.target_value)) {
 					var array_type = (ArrayType) expression_type;
 					for (int dim = 1; dim <= array_type.rank; dim++) {
 						var len_decl = new LocalVariable (int_type.copy (), get_array_length_cname (decl.name, dim));
@@ -5154,7 +5156,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 			cfunc.modifiers = CCodeModifiers.STATIC;
 			cfunc.add_parameter (new CCodeParameter ("value", expression_type.get_cname ()));
 
-			if (expression_type is ArrayType) {
+			if (expression_type is ArrayType && has_array_length (expr.target_value)) {
 				// return array length if appropriate
 				var array_type = (ArrayType) expression_type;
 
@@ -5863,6 +5865,10 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 		}
 		return glib_value.array_length_cvalues;
 	}
+
+	public bool has_array_length (TargetValue value) {
+		return value != null && ((GLibValue) value).array_length_cvalues != null;
+	}
 }
 
 public class Vala.GLibValue : TargetValue {