diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index bf54e29271b..30bf112bdab 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,7 +1,14 @@
+2019-06-20  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/90937
+	* trans-types.c (get_formal_from_actual_arglist): Get symbol from
+	current namespace so it will be freed later.  If symbol is of type
+	character, get an empty character length.
+
 2019-06-19  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/69499
-	* match.c (gfc_match_select_type):  SELECT TYPE is an executable 
+	* match.c (gfc_match_select_type):  SELECT TYPE is an executable
 	statement, and cannot appear in MODULE or SUBMODULE scope.
 
 2019-06-19  Steven G. Kargl  <kargl@gcc.gnu.org>
@@ -18,7 +25,7 @@
 
 2019-06-19  Jim MacArthur  <jim.macarthur@codethink.co.uk>
 	    Mark Eggleston  <mark.eggleston@codethink.com>
-	
+
 	PR fortran/89103
 	* gfortran.texi: Add -fdec-blank-format-item
 	* invoke.texi: Add option to list of options.
@@ -105,7 +112,7 @@
 
 	PR fortran/90002
 	* array.c (gfc_free_array_spec): When freeing an array-spec, avoid
-	an ICE for assumed-shape coarrays 
+	an ICE for assumed-shape coarrays.
 
 2019-06-08  Paul Thomas  <pault@gcc.gnu.org>
 
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index d236f37be6d..1dbb842a1c4 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -2997,7 +2997,7 @@ get_formal_from_actual_arglist (gfc_symbol *sym, gfc_actual_arglist *actual_args
       if (a->expr)
 	{
 	  snprintf (name, GFC_MAX_SYMBOL_LEN, "_formal_%d", var_num ++);
-	  gfc_get_symbol (name, NULL, &s);
+	  gfc_get_symbol (name, gfc_current_ns, &s);
 	  if (a->expr->ts.type == BT_PROCEDURE)
 	    {
 	      s->attr.flavor = FL_PROCEDURE;
@@ -3005,6 +3005,10 @@ get_formal_from_actual_arglist (gfc_symbol *sym, gfc_actual_arglist *actual_args
 	  else
 	    {
 	      s->ts = a->expr->ts;
+
+	      if (s->ts.type == BT_CHARACTER)
+		  s->ts.u.cl = gfc_get_charlen ();
+
 	      s->ts.deferred = 0;
 	      s->ts.is_iso_c = 0;
 	      s->ts.is_c_interop = 0;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 50a0feacbfd..c91f8ed98a2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-20  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/90937
+	* gfortran.dg/external_procedure_4.f90: New test.
+
 2019-06-20  Tom de Vries  <tdevries@suse.de>
 
 	* gcc.dg/pr90866-2.c: Require global_constructor.
@@ -118,7 +123,7 @@
 	PR fortran/89103
 	* gfortran.dg/dec_format_empty_item_1.f: New test.
 	* gfortran.dg/dec_format_empty_item_2.f: New test.
-	* gfortran.dg/dec_format_empty_item_3.f: New test. 
+	* gfortran.dg/dec_format_empty_item_3.f: New test.
 
 2019-06-19  Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
 
diff --git a/gcc/testsuite/gfortran.dg/external_procedure_4.f90 b/gcc/testsuite/gfortran.dg/external_procedure_4.f90
new file mode 100644
index 00000000000..403f1732e26
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/external_procedure_4.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+! PR fortran/90937 - this used to cause an ICE.
+! Original test case by Toon Moene.
+subroutine lfidiff
+
+   implicit none
+
+   contains 
+
+      subroutine grlfi(cdnom)
+
+         character(len=*) cdnom(:)
+         character(len=len(cdnom)) clnoma
+
+         call lficas(clnoma)
+
+      end subroutine grlfi
+
+end subroutine lfidiff