Fix issue identified in large application

Fix a symbol table flag overloading problem with ASSOC_PTR and
PTR_TARGET flags. Use a new bit flag in the Fortran back-end
called PTR_INITIALIZER to distinguish the overloaded cases.

Also discovered an unrelated bug with inject_arg() in semfin.c.
Make sure we set the arguments' storage class to SC_DUMMY.

Author: gklimowicz

tools/flang1/flang1exe/semfin.c

@@ -239,6 +239,7 @@ inject_arg(int func_sptr, int arg_sptr, int position)
           &aux.dpdsc_base[new_dsc + position],
           (old_args - position) * sizeof *aux.dpdsc_base);
   aux.dpdsc_base[new_dsc + position] = arg_sptr;
+  SCP(arg_sptr, SC_DUMMY);
   DPDSCP(func_sptr, new_dsc);
   PARAMCTP(func_sptr, old_args + 1);
 }

tools/flang2/flang2exe/llassem.cpp

@@ -2758,7 +2758,7 @@ dinits(void)
         item->offset += p->conval;
         item->filepos = dinit_ftell();
       }
-      if (ASSOC_PTRG(sptr)) { 
+      if (PTR_INITIALIZERG(sptr) && ASSOC_PTRG(sptr)) { 
         cmblk = MIDNUMG(ASSOC_PTRG(sptr));
       } else {
         cmblk = MIDNUMG(sptr);
@@ -3734,7 +3734,7 @@ getsname(SPTR sptr)
 #endif
     break;
   case ST_PROC:
-    if (PTR_TARGETG(sptr)) {
+    if (PTR_INITIALIZERG(sptr) && PTR_TARGETG(sptr)) {
       sptr = (SPTR) PTR_TARGETG(sptr);
     }
   case ST_ENTRY:

tools/flang2/flang2exe/llassem_common.cpp

@@ -160,7 +160,7 @@ write_proc_pointer(SPTR sptr)
   const char *fntype = "void()";
   LL_Type * lt;
 
-  if (PTR_TARGETG(sptr)) {
+  if (PTR_INITIALIZERG(sptr) && PTR_TARGETG(sptr)) {
     sptr = (SPTR) PTR_TARGETG(sptr);
   } 
   LL_ABI_Info *abi = ll_proto_get_abi(ll_proto_key(sptr));

tools/flang2/flang2exe/upper.cpp

@@ -2806,7 +2806,12 @@ read_symbol(void)
     LENPARMP(newsptr, lenparm);
     TPALLOCP(newsptr, tpalloc);
     ASSOC_PTRP(newsptr, assocptr);
-    PTR_TARGETP(newsptr, ptrtarget);
+    if (ptrtarget > NOSYM) {
+      PTR_TARGETP(newsptr, ptrtarget);
+    }
+    if (assocptr > NOSYM || ptrtarget > NOSYM) {
+      PTR_INITIALIZERP(newsptr, 1);
+    }
     break;
 
   case ST_NML:
@@ -3115,6 +3120,9 @@ read_symbol(void)
     if (ptrtarget > NOSYM) {
       PTR_TARGETP(newsptr, ptrtarget);
     }
+    if (assocptr > NOSYM || ptrtarget > NOSYM) {
+      PTR_INITIALIZERP(newsptr, 1);
+    }
     break;
 
   case ST_GENERIC:
@@ -3891,7 +3899,7 @@ fix_symbol(void)
         sym_is_refd(sptr);
       break;
     case ST_PROC:
-      if (ASSOC_PTRG(sptr) && PTR_TARGETG(sptr)) {
+      if (PTR_INITIALIZERG(sptr) && ASSOC_PTRG(sptr) && PTR_TARGETG(sptr)) {
         SPTR ptr = symbolxref[ASSOC_PTRG(sptr)];
         ASSOC_PTRP(sptr, MIDNUMG(ptr) > NOSYM ? MIDNUMG(ptr) : ptr);
         PTR_TARGETP(sptr, symbolxref[PTR_TARGETG(sptr)]);

tools/flang2/utils/symtab/symtab.n

@@ -609,6 +609,9 @@ variables, indicates that address has been assigned.
 Set if we need to "re-reference" variable (call back-end's sym_is_refd). This
 can occur if we have a type extension with initializations in the parent
 component which require a call to assn_static_off() in back end's sym_is_refd() function.
+.FL PTR_INITIALIZER f126
+Set when this symbol is used as an initializer for a pointer. Assumes
+ASSOC_PTR and/or PTR_TARGET are also set.
 .FL WEAK f119
 Set if this variable is a weak symbol.
 .FL ADDRTKN f8
@@ -1504,6 +1507,9 @@ Set if this procedure has optional arguments.
 .FL LIBSYM f111
 Indicates that this is a routine symbol from a standard module, such as
 ieee_arithmetic or iso_c_binding, that is resolved from a system library.
+.FL PTR_INITIALIZER f126
+Set when this symbol is used as an initializer for a pointer. Assumes
+ASSOC_PTR and/or PTR_TARGET are also set.
 .ul
 Other Fields
 .SE SYMLK