From 7f4db7c80779ecbc57d1146654daf0acfe18de66 Mon Sep 17 00:00:00 2001
From: rus <rus@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 9 Nov 2009 20:58:24 +0000
Subject: merge from trunk

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/profile-stdlib@154052 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/fortran/trans-intrinsic.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gcc/fortran/trans-intrinsic.c')

diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 1e7b35f5c17..c3d7dfbab3c 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -4490,6 +4490,8 @@ gfc_conv_intrinsic_transfer (gfc_se * se, gfc_expr * expr)
 scalar_transfer:
   extent = fold_build2 (MIN_EXPR, gfc_array_index_type,
 			dest_word_len, source_bytes);
+  extent = fold_build2 (MAX_EXPR, gfc_array_index_type,
+			extent, gfc_index_zero_node);
 
   if (expr->ts.type == BT_CHARACTER)
     {
-- 
cgit v1.2.1