From: Tobias Burnus <burnus@net-b.de>
Date: Thu, 19 Jan 2012 20:22:33 +0000 (+0100)
Subject: re PR fortran/51904 (ICE on SIZE function evaluation)
X-Git-Tag: releases/gcc-4.7.0~927
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e19c582b18e18030c172cca406b5607114f80cc;p=thirdparty%2Fgcc.git

re PR fortran/51904 (ICE on SIZE function evaluation)

2012-01-19  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51904
        * expr.c (gfc_build_intrinsic_call): Also set the symtree.

2012-01-19  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51904
        * gfortran.dg/intrinsic_size_2.f90: New.

From-SVN: r183310
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index db01c0cfbe23..c3106a5e1b0f 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-19  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/51904
+	* expr.c (gfc_build_intrinsic_call): Also set the symtree.
+
 2012-01-18  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/51634
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 8f04c7310776..7cea780693d2 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -4519,6 +4519,11 @@ gfc_build_intrinsic_call (const char* name, locus where, unsigned numarg, ...)
   result->value.function.name = name;
   result->value.function.isym = isym;
 
+  result->symtree = gfc_find_symtree (gfc_current_ns->sym_root, name);
+  gcc_assert (result->symtree
+	      && (result->symtree->n.sym->attr.flavor == FL_PROCEDURE
+		  || result->symtree->n.sym->attr.flavor == FL_UNKNOWN));
+
   va_start (ap, numarg);
   atail = NULL;
   for (i = 0; i < numarg; ++i)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ea028e13bbe2..eb1663c0e0ff 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-19  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/51904
+	* gfortran.dg/intrinsic_size_2.f90: New.
+
 2012-01-19  Jason Merrill  <jason@redhat.com>
 
 	PR c++/51889
diff --git a/gcc/testsuite/gfortran.dg/intrinsic_size_2.f90 b/gcc/testsuite/gfortran.dg/intrinsic_size_2.f90
new file mode 100644
index 000000000000..6070bc21b7de
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/intrinsic_size_2.f90
@@ -0,0 +1,17 @@
+! { dg-do compile }
+!
+! PR fortran/51904
+!
+! Contributed by David Sagan.
+!
+
+call qp_draw_polyline_basic([1.0,2.0])
+contains
+subroutine qp_draw_polyline_basic (x)
+  implicit none
+  real :: x(:), f
+  integer :: i
+  f = 0
+  print *, size(f*x)
+end subroutine
+end