REMOVE_DIST_ARRAYS_FROM_IO: use more general isSgVarListDeclStmt and isSgNestedVarListDeclStmt functions

CMakeLists.txt

@@ -497,7 +497,7 @@ else()
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     endif()
     if(NOT CMAKE_BUILD_TYPE)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
     endif()
 endif()
 

src/Transformations/ReplaceArraysInIO/replace_dist_arrays_in_io.cpp

@@ -17,14 +17,6 @@ using std::pair;
 
 #define DEBUG_TRACE 0
 
-static bool hasArrayRef(SgExpression* ex)
-{
-    if (ex)
-        return isArrayRef(ex) || hasArrayRef(ex->lhs()) || hasArrayRef(ex->rhs());
-
-    return false;
-}
-
 static inline bool isArrayDeclaration(SgStatement* st)
 {
     return isSgDeclarationStatement(st) || isSgVarListDeclStmt(st) || isSgNestedVarListDeclStmt(st);
@@ -209,15 +201,11 @@ static bool populateDistributedIoArrays(map<SgSymbol*, set<SgStatement*>>& array
         if (!arg)
             return false;
 
-        if (hasArrayRef(arg))
+        if (!isArrayRef(arg))
-        {
-            if (isArrayRef(arg) && arg->lhs())
-                need_replace = true;
-        }
-        else
-        {
             return false;
-        }
+
+        if (arg->lhs())
+            need_replace = true;
     }
     else
     {

src/Utils/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2446"
+#define VERSION_SPF "2445"