Index: gcc/fortran/trans-stmt.c
===================================================================
*** gcc/fortran/trans-stmt.c	(revision 265231)
--- gcc/fortran/trans-stmt.c	(working copy)
*************** trans_associate_var (gfc_symbol *sym, gf
*** 1656,1662 ****
    bool need_len_assign;
    bool whole_array = true;
    gfc_ref *ref;
-   symbol_attribute attr;
  
    gcc_assert (sym->assoc);
    e = sym->assoc->target;
--- 1656,1661 ----
*************** trans_associate_var (gfc_symbol *sym, gf
*** 1916,1924 ****
  	    }
  	}
  
-       attr = gfc_expr_attr (e);
        if (sym->ts.type == BT_CHARACTER && e->ts.type == BT_CHARACTER
- 	  && (attr.allocatable || attr.pointer || attr.dummy)
  	  && POINTER_TYPE_P (TREE_TYPE (se.expr)))
  	{
  	  /* These are pointer types already.  */
--- 1915,1921 ----
*************** trans_associate_var (gfc_symbol *sym, gf
*** 1926,1933 ****
  	}
        else
  	{
!           tmp = TREE_TYPE (sym->backend_decl);
!           tmp = gfc_build_addr_expr (tmp, se.expr);
  	}
  
        gfc_add_modify (&se.pre, sym->backend_decl, tmp);
--- 1923,1930 ----
  	}
        else
  	{
! 	  tmp = TREE_TYPE (sym->backend_decl);
! 	  tmp = gfc_build_addr_expr (tmp, se.expr);
  	}
  
        gfc_add_modify (&se.pre, sym->backend_decl, tmp);
Index: gcc/testsuite/gfortran.dg/associate_45.f90
===================================================================
*** gcc/testsuite/gfortran.dg/associate_45.f90	(nonexistent)
--- gcc/testsuite/gfortran.dg/associate_45.f90	(working copy)
***************
*** 0 ****
--- 1,38 ----
+ ! { dg-do run }
+ !
+ ! Test the fix for PR58618 by checking that substring associate targets
+ ! work correctly.
+ !
+ ! Contributed by Vladimir Fuka  <vladimir.fuka@gmail.com>
+ !
+     character(5) :: s(2) = ['abcde','fghij']
+     character (6), pointer :: ptr => NULL()
+     character (6), target :: tgt = 'lmnopq'
+ 
+     associate (x=>s(2)(3:4))
+       if (x .ne. 'hi') stop 1
+       x = 'uv'
+     end associate
+     if (any (s .ne. ['abcde','fguvj'])) stop 2
+ 
+ ! Unity based substrings are cast differently.  */
+     associate (x=>s(1)(1:4))
+       if (x .ne. 'abcd') stop 3
+       x(2:3) = 'wx'
+     end associate
+     if (any (s .ne. ['awxde','fguvj'])) stop 4
+ 
+ ! Make sure that possible misidentifications do not occur.
+     ptr => tgt
+     associate (x=>ptr)
+       if (x .ne. 'lmnopq') stop 5
+       x(2:3) = 'wx'
+     end associate
+     if (tgt .ne. 'lwxopq') stop 6
+ 
+     associate (x=>ptr(5:6))
+       if (x .ne. 'pq') stop 7
+       x = 'wx'
+     end associate
+     if (tgt .ne. 'lwxowx') stop 8
+   end