Merge branch 'aomp-epsdb' into aomp-epsdb-mainline

Change-Id: I1eb022d4882d92fb44eb7ea1f8fffbf92da7a1a1
ROCm · Jul 28, 2022 · f94db46 · f94db46
2 parents 00b2d05 + f69baf4
commit f94db46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -298,7 +298,7 @@ else()
   set(FLANG_HAS_VERSION_PATCHLEVEL 0)
 endif()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcommon -Wno-implicit-function-declaration -Wno-implicit-int")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcommon -Wno-implicit-function-declaration -Wno-implicit-int -Wno-int-conversion")
 
 # Add appropriate flags for GCC
 if (LLVM_COMPILER_IS_GCC_COMPATIBLE)

diff --git a/tools/flang1/flang1exe/semsmp.c b/tools/flang1/flang1exe/semsmp.c
@@ -8221,6 +8221,10 @@ do_tofrom()
       (void)add_stmt(ast);
       A_LOPP(ast, item->ast);
       A_PRAGMATYPEP(ast, item->t.cltype);
+      // AOCC Begin
+      if (A_TYPEG(item->ast) == A_MEM)
+        A_ROPP(ast, A_PARENTG(item->ast));
+      // AOCC End
     }
   }
   if (CL_PRESENT(CL_FROM)) {
@@ -8230,6 +8234,10 @@ do_tofrom()
       (void)add_stmt(ast);
       A_LOPP(ast, item->ast);
       A_PRAGMATYPEP(ast, item->t.cltype);
+      // AOCC Begin
+      if (A_TYPEG(item->ast) == A_MEM)
+        A_ROPP(ast, A_PARENTG(item->ast));
+      // AOCC End
     }
   }
   ast = mk_stmt(A_MP_EMAP, 0);