コミット: f11600c98517d58c0f62df8e78f7090524f2d61b - gcc_os216 (git)

GCC with patches for OS216

コミットメタ情報

• リビジョン: f11600c98517d58c0f62df8e78f7090524f2d61b (tree)
• 日時: 2018-03-21 10:07:43
• 作者: Steven G. Kargl <kargl@gcc....>
• コミッター: Steven G. Kargl

ログメッセージ

re PR fortran/85001 (ICE in gfc_build_array_type, at fortran/trans-types.c:1420)

2018-03-20 Steven G. Kargl <[e-mail]>

PR fortran/85001
* interface.c (symbol_rank): Remove bogus null pointer check that
crept in when translating a ternary operator into an if-else
constructor.

2018-03-20 Steven G. Kargl <[e-mail]>

PR fortran/85001
* gfortran.dg/interface_41.f90: New test.

From-SVN: r258698

変更サマリ

• modified: gcc/fortran/ChangeLog
• modified: gcc/fortran/interface.c
• modified: gcc/testsuite/ChangeLog
• add: gcc/testsuite/gfortran.dg/interface_41.f90

差分

--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
[phone]  Steven G. Kargl  <[e-mail]>
+
+	PR fortran/85001
+	* interface.c (symbol_rank): Remove bogus null pointer check that
+	crept in when translating a ternary operator into an if-else 
+	constructor.
+
 2018-03-19  Thomas Koenig  <[e-mail]>
 
 	PR fortran/84931

--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -1268,7 +1268,7 @@ symbol_rank (gfc_symbol *sym)
 {
   gfc_array_spec *as = NULL;
 
-  if (sym->ts.type == BT_CLASS && CLASS_DATA (sym) && CLASS_DATA (sym)->as)
+  if (sym->ts.type == BT_CLASS && CLASS_DATA (sym))
     as = CLASS_DATA (sym)->as;
   else
     as = sym->as;

--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Steven G. Kargl  <[e-mail]>
+
+	PR fortran/85001
+	* gfortran.dg/interface_41.f90: New test.
+
 2018-03-20  Jakub Jelinek  <[e-mail]>
 
 	PR debug/84875

--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/interface_41.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+! PR fortran/85001 
+! Contributed by Gerhard Steinmetz.
+program p
+   type t
+   end type
+   call s
+contains
+   real function f(x)
+      class(t) :: x
+      dimension :: x(:)
+      f = 1.0
+   end
+   subroutine s
+      type(t) :: x(2)
+      real :: z
+      z = f(x)     ! { dg-error "Rank mismatch in argument" }
+   end
+end