Merge pull request #451 from ThePortlandGroup/nv_stage

Pull 2018-04-24T17-21 Recent NVIDIA Changes

Author: sscalpone

tools/flang1/flang1exe/lowersym.c

@@ -1858,7 +1858,7 @@ makefvallocal(int rutype, int fval)
 {
   int dtype;
   /* if this was turned into a subroutine, make the fval a dummy */
-  if (gbl.rutype != RU_FUNC)
+  if (rutype != RU_FUNC)
     return 0;
   /* if the fval is a POINTER variable, make local */
   if (POINTERG(fval))
@@ -5263,34 +5263,41 @@ static int save_dpdsc_cnt = 0;
 static void
 llvm_check_retval_inargs(int sptr)
 {
-  if (FVALG(sptr)) {
+  int fval = FVALG(sptr);
+  if (fval) {
     int dtype;
     int ent_dtype = DTYPEG(sptr);
     llvm_fix_args(sptr, dtype != DT_NONE);
-    dtype = DTYPEG(FVALG(sptr));
+    dtype = DTYPEG(fval);
     fix_class_args(sptr);
+    if (DTYPEG(sptr) != DT_NONE && makefvallocal(RU_FUNC, fval)) {
+      SCP(fval, SC_LOCAL);
+      if (is_iso_cptr(DTYPEG(fval))) {
+        DTYPEP(fval, DT_CPTR);
+      }
+    }
     switch (DTY(dtype)) {
     case TY_ARRAY:
-      if (aux.dpdsc_base[DPDSCG(sptr)] != FVALG(sptr)) {
+      if (aux.dpdsc_base[DPDSCG(sptr)] != fval) {
         DPDSCP(sptr, DPDSCG(sptr) - 1);
-        *(aux.dpdsc_base + DPDSCG(sptr)) = FVALG(sptr);
+        *(aux.dpdsc_base + DPDSCG(sptr)) = fval;
         PARAMCTP(sptr, PARAMCTG(sptr) + 1);
         DTYPEP(sptr, DT_NONE);
-        SCP(FVALG(sptr), SC_DUMMY);
+        SCP(fval, SC_DUMMY);
       }
       break;
     case TY_CHAR:
     case TY_NCHAR:
       if (dtype != ent_dtype)
         return;
-      if (!POINTERG(sptr) && ADJLENG(FVALG(sptr)) && DPDSCG(sptr)) {
+      if (!POINTERG(sptr) && ADJLENG(fval) && DPDSCG(sptr)) {
 
-        if (aux.dpdsc_base[DPDSCG(sptr)] != FVALG(sptr)) {
+        if (aux.dpdsc_base[DPDSCG(sptr)] != fval) {
           DPDSCP(sptr, DPDSCG(sptr) - 1);
-          *(aux.dpdsc_base + DPDSCG(sptr)) = FVALG(sptr);
+          *(aux.dpdsc_base + DPDSCG(sptr)) = fval;
           PARAMCTP(sptr, PARAMCTG(sptr) + 1);
           DTYPEP(sptr, DT_NONE);
-          SCP(FVALG(sptr), SC_DUMMY);
+          SCP(fval, SC_DUMMY);
         }
       }
     case TY_DCMPLX:
@@ -5305,18 +5312,18 @@ llvm_check_retval_inargs(int sptr)
         return;
 
     pointer_check:
-      if (aux.dpdsc_base[DPDSCG(sptr)] != FVALG(sptr) &&
-          (POINTERG(sptr) || ALLOCATTRG(FVALG(sptr)) ||
+      if (aux.dpdsc_base[DPDSCG(sptr)] != fval &&
+          (POINTERG(sptr) || ALLOCATTRG(fval) ||
            (DTY(ent_dtype) == TY_DCMPLX))
 
               ) {
         if (DPDSCG(sptr) && DTYPEG(sptr) != DT_NONE) {
 
           DPDSCP(sptr, DPDSCG(sptr) - 1);
-          *(aux.dpdsc_base + DPDSCG(sptr)) = FVALG(sptr);
+          *(aux.dpdsc_base + DPDSCG(sptr)) = fval;
           PARAMCTP(sptr, PARAMCTG(sptr) + 1);
           DTYPEP(sptr, DT_NONE);
-          SCP(FVALG(sptr), SC_DUMMY);
+          SCP(fval, SC_DUMMY);
         }
       }
       break;

tools/flang1/flang1exe/semsmp.c

@@ -8329,7 +8329,7 @@ restore_clauses(void)
       if (chunk) {
         sptr = sav_chk.chunk;
         chunk = mk_id(sptr);
-      set_parref_flag(chunk, chunk, BLK_UPLEVEL_SPTR(sem.scope_level));
+      set_parref_flag(sptr, sptr, BLK_UPLEVEL_SPTR(sem.scope_level));
       }
     }
     break;

tools/flang1/flang1exe/semutil2.c

@@ -6850,7 +6850,12 @@ dinit_fill_struct(ASTLIST *list, ACL *aclp, int sdtype, int sptr,
           A_SPTRP(aa, sptr);
           add_init(list, aast, dtype, sptr);
         } else {
-          aast = dinit_getval1(aast, sdtype);
+          if (DTY(sdtype) == TY_ARRAY) {
+            aast = dinit_getval1(aast, DTY(sdtype+1));
+          }
+          else 
+            aast = dinit_getval1(aast, sdtype);
+ 
           if (A_TYPEG(SST_ASTG(stkp)) == A_CNST &&
               A_DTYPEG(aast) != A_DTYPEG(SST_ASTG(stkp))) {
             /* constant initialization value needed type conversion,
@@ -6898,8 +6903,13 @@ dinit_fill_struct(ASTLIST *list, ACL *aclp, int sdtype, int sptr,
       b = dinit_fill_struct(&newlist, a->subc, ddtype, sptr, 0, FALSE);
       if (list && DTY(sdtype) != TY_ARRAY)
         append_init_list(list, &newlist);
-      else
-        add_init(list, newlist.head, dtype, sptr);
+      else {
+        if (DTY(ddtype) == TY_DERIVED) {
+          add_init(list, newlist.head, ddtype, sptr);
+        } 
+        else
+          add_init(list, newlist.head, dtype, sptr);
+      }
       break;
     case AC_SCONST:
       dtype = a->dtype;

tools/flang2/flang2exe/verify.c

@@ -181,6 +181,10 @@ is_known_bug(ILI_OP opc, int j, ILI_OP j_opc)
     return true;
   if (opc == IL_PI8MV_LOW && o == ILIO_KRLNK && r == ILIA_AR)
     return true;
+#ifdef IL_PI8BROADCAST
+  if (opc == IL_PI8BROADCAST && o == ILIO_KRLNK && r == ILIA_AR)
+    return true;
+#endif
   if (opc == IL_IMUL && o == ILIO_IRLNK && j_opc == IL_KCON)
     return true;
   if (opc == IL_IKMV && o == ILIO_IRLNK && j_opc == IL_KCON)