Fix when the array being passed is an member of a derived type

When constructing the runtime call to create the temporary
descriptor, need to call check_member().

Author: gklimowicz

tools/flang1/flang1exe/dpm_out.c

@@ -2358,19 +2358,19 @@ emit_alnd(int sptr, int memberast, LOGICAL free_flag, LOGICAL for_allocate,
 }
 
 void
-make_temp_descriptor(int sptr_orig, int sptr_tmp, int before_std)
+make_temp_descriptor(int ast_ele, SPTR sptr_orig, SPTR sptr_tmp, int before_std)
 {
     /* call pgf90_temp_desc(tmp desc, orig desc) */
     SPTR sptr_descr;
-    int  sptrdescr_arg, ast;
+    int  ast;
     int nargs = 2;
     int argt = mk_argt(nargs);
     sptr_descr = DESCRG(sptr_tmp);
-    sptrdescr_arg = mk_id(sptr_descr);
-    ARGT_ARG(argt, 0) = sptrdescr_arg;
+    assert(sptr_descr,"missing descriptor for tmp",(int)sptr_tmp,ERR_Fatal);
+    ARGT_ARG(argt, 0) = mk_id(sptr_descr);
     sptr_descr = DESCRG(sptr_orig);
-    sptrdescr_arg = mk_id(sptr_descr);
-    ARGT_ARG(argt, 1) = sptrdescr_arg;
+    assert(sptr_descr,"missing descriptor for orig",(int)sptr_orig,ERR_Fatal);
+    ARGT_ARG(argt, 1) = check_member(ast_ele,mk_id(sptr_descr));
 
     ast =
         mk_func_node(A_CALL, 

tools/flang1/flang1exe/extern.h

@@ -72,7 +72,7 @@ void copy_surrogate_to_bnds_vars(DTYPE, int, DTYPE, int, int);
 void copy_desc_to_bnds_vars(int sptrdest, int desc, int memdesc, int std);
 void emit_fl(void);                       /* dpm_out.c */
 void init_sdsc_from_dtype(int sptr, DTYPE, int before_std); /* dpm_out.c */
-void make_temp_descriptor(int, int, int); /* dpm_out.c */
+void make_temp_descriptor(int, SPTR, SPTR, int); /* dpm_out.c */
 int init_sdsc(int sptr, DTYPE dtype, int before_std, int parent_sptr);	/* semutil2.c */
 void ipa_restore_dtb(char *line);         /* dpm_out.c */
 void transform_call(int, int);

tools/flang1/flang1exe/rest.c

@@ -1997,9 +1997,9 @@ transform_call(int std, int ast)
            * of zero-based array bounds and lbase calculation. Also, this type
            * of lbase fixup can also be found in runtime routines like
            * ptr_fix_assumeshp(), where a whole array, instead of a section,
-           * is identified.
+           * is identified. 
            */
-          if(XBIT(58,0x400000)&&ASSUMSHPG(inface_arg)&&TARGETG(inface_arg))
+          if(XBIT(58,0x400000) && ASSUMSHPG(inface_arg) && TARGETG(inface_arg))
           {
             char nd[50];    /* new, substitute, descriptor for this arg */
             static int ndctr = 0;
@@ -2011,7 +2011,7 @@ transform_call(int std, int ast)
             get_static_descriptor(sptrtmp); /* add sdsc to sptrtmp; necessary */
             get_all_descriptors(sptrtmp); /* add desc & bounds in dtype */
             /* generate the runtime call pgf90_tmp_desc) */
-            make_temp_descriptor(sptr, sptrtmp, std);
+            make_temp_descriptor(ele, sptr, sptrtmp, std);
             sptrdesc = DESCRG(sptrtmp);
             ARGT_ARG(newargt, newj) = check_member(ele, mk_id(sptrdesc));
           }
@@ -2092,9 +2092,9 @@ transform_call(int std, int ast)
             get_static_descriptor(sptrtmp); /* add sdsc to sptrtmp; necessary */
             get_all_descriptors(sptrtmp); /* add desc & bounds in dtype */
             /* generate the runtime call pgf90_tmp_desc) */
-            make_temp_descriptor(sptr, sptrtmp, std);
+            make_temp_descriptor(ele, sptr, sptrtmp, std);
             sptrdesc = DESCRG(sptrtmp);
-            ARGT_ARG(newargt, newj) = check_member(lop_ele, mk_id(sptrdesc));
+            ARGT_ARG(newargt, newj) = check_member(ele, mk_id(sptrdesc));
           }
           else
             ARGT_ARG(newargt, newj) = descr;