Merge from trunk revision 257954.gccgo

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gccgo@257955 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 20 insertions, 20 deletions

diff --git a/gcc/testsuite/gfortran.dg/class_array_16.f90 b/gcc/testsuite/gfortran.dg/class_array_16.f90
index 3630ad19234..14ed8426936 100644
--- a/gcc/testsuite/gfortran.dg/class_array_16.f90
+++ b/gcc/testsuite/gfortran.dg/class_array_16.f90
@@ -15,8 +15,8 @@ contains
   subroutine sub(x)
      class(t), allocatable, intent(out) :: x(:)
 
-     if (allocated (x)) call abort()
-     if (.not. same_type_as(x, var_t)) call abort()
+     if (allocated (x)) STOP 1
+     if (.not. same_type_as(x, var_t)) STOP 2
 
      allocate (t2 :: x(5))
   end subroutine sub
@@ -25,8 +25,8 @@ contains
      class(t), allocatable, OPTIONAL, intent(out) :: x(:)
 
      if (.not. present(x)) return
-     if (allocated (x)) call abort()
-     if (.not. same_type_as(x, var_t)) call abort()
+     if (allocated (x)) STOP 3
+     if (.not. same_type_as(x, var_t)) STOP 4
 
      allocate (t2 :: x(5))
   end subroutine sub2
@@ -36,34 +36,34 @@ use m
 implicit none
 class(t), save, allocatable :: y(:)
 
-if (allocated (y)) call abort()
-if (.not. same_type_as(y,var_t)) call abort()
+if (allocated (y)) STOP 5
+if (.not. same_type_as(y,var_t)) STOP 6
 
 call sub(y)
-if (.not.allocated(y)) call abort()
-if (.not. same_type_as(y, var_t2)) call abort()
-if (size (y) /= 5) call abort()
+if (.not.allocated(y)) STOP 7
+if (.not. same_type_as(y, var_t2)) STOP 8
+if (size (y) /= 5) STOP 9
 
 call sub(y)
-if (.not.allocated(y)) call abort()
-if (.not. same_type_as(y, var_t2)) call abort()
-if (size (y) /= 5) call abort()
+if (.not.allocated(y)) STOP 10
+if (.not. same_type_as(y, var_t2)) STOP 11
+if (size (y) /= 5) STOP 12
 
 deallocate (y)
-if (allocated (y)) call abort()
-if (.not. same_type_as(y,var_t)) call abort()
+if (allocated (y)) STOP 13
+if (.not. same_type_as(y,var_t)) STOP 14
 
 call sub2()
 
 call sub2(y)
-if (.not.allocated(y)) call abort()
-if (.not. same_type_as(y, var_t2)) call abort()
-if (size (y) /= 5) call abort()
+if (.not.allocated(y)) STOP 15
+if (.not. same_type_as(y, var_t2)) STOP 16
+if (size (y) /= 5) STOP 17
 
 call sub2(y)
-if (.not.allocated(y)) call abort()
-if (.not. same_type_as(y, var_t2)) call abort()
-if (size (y) /= 5) call abort()
+if (.not.allocated(y)) STOP 18
+if (.not. same_type_as(y, var_t2)) STOP 19
+if (size (y) /= 5) STOP 20
 end
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 5 "original" } }