re PR fortran/66942 (trans-expr.c:5701 runtime error: member call on null pointer...

2015-08-03  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/66942
	* trans-expr.c (gfc_conv_procedure_call): Avoid NULL pointer reference

From-SVN: r226517

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 03ea33cc996bf6440e60d8fc0648da57b021f038..36cd6f3b4cd694fc2ca88d80093b713fa048024c 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-03  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/66942
+       * trans-expr.c (gfc_conv_procedure_call): Avoid NULL pointer reference
+
 2015-08-03  Mikael Morin  <mikael@gcc.gnu.org>
 
        PR fortran/64921

diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index be6bfe2006d9996973a3cb32d2eb0a24418fb340..af30b558576e0b0dff3361ae94b1e59f0e37f2b5 100644 (file)
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -5921,18 +5921,18 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
   vec_safe_reserve (retargs, arglen);
 
   /* Add the return arguments.  */
-  retargs->splice (arglist);
+  vec_safe_splice (retargs, arglist);
 
   /* Add the hidden present status for optional+value to the arguments.  */
-  retargs->splice (optionalargs);
+  vec_safe_splice (retargs, optionalargs);
 
   /* Add the hidden string length parameters to the arguments.  */
-  retargs->splice (stringargs);
+  vec_safe_splice (retargs, stringargs);
 
   /* We may want to append extra arguments here.  This is used e.g. for
      calls to libgfortran_matmul_??, which need extra information.  */
-  if (!vec_safe_is_empty (append_args))
-    retargs->splice (append_args);
+  vec_safe_splice (retargs, append_args);
+
   arglist = retargs;
 
   /* Generate the actual call.  */