[DepInfo] Use isl++ in Dependences::isValidSchedule. NFC.

Also change StatementToIslMapTy to hold isl::map, because it is used as a
parameter.

llvm-svn: 339484

1 files changed, 3 insertions, 11 deletions

diff --git a/polly/lib/Exchange/JSONExporter.cpp b/polly/lib/Exchange/JSONExporter.cpp
index 0a744901e2b..41975396efa 100644
--- a/polly/lib/Exchange/JSONExporter.cpp
+++ b/polly/lib/Exchange/JSONExporter.cpp
@@ -288,9 +288,6 @@ static bool importSchedule(Scop &S, const json::Object &JScop,
     // Check if key 'schedule' is present.
     if (!statements[Index].getAsObject()->get("schedule")) {
       errs() << "Statement " << Index << " has no 'schedule' key.\n";
-      for (auto Element : NewSchedule) {
-        isl_map_free(Element.second);
-      }
       return false;
     }
     Optional<StringRef> Schedule =
@@ -304,9 +301,6 @@ static bool importSchedule(Scop &S, const json::Object &JScop,
     if (!Map) {
       errs() << "The schedule was not parsed successfully (index = " << Index
              << ").\n";
-      for (auto Element : NewSchedule) {
-        isl_map_free(Element.second);
-      }
       return false;
     }
 
@@ -321,23 +315,21 @@ static bool importSchedule(Scop &S, const json::Object &JScop,
       Map = isl_map_set_dim_id(Map, isl_dim_param, i, Id);
     }
     isl_space_free(Space);
-    NewSchedule[&Stmt] = Map;
+    NewSchedule[&Stmt] = isl::manage(Map);
     Index++;
   }
 
   // Check whether the new schedule is valid or not.
-  if (!D.isValidSchedule(S, &NewSchedule)) {
+  if (!D.isValidSchedule(S, NewSchedule)) {
     errs() << "JScop file contains a schedule that changes the "
            << "dependences. Use -disable-polly-legality to continue anyways\n";
-    for (auto Element : NewSchedule)
-      isl_map_free(Element.second);
     return false;
   }
 
   auto ScheduleMap = isl::union_map::empty(S.getParamSpace());
   for (ScopStmt &Stmt : S) {
     if (NewSchedule.find(&Stmt) != NewSchedule.end())
-      ScheduleMap = ScheduleMap.add_map(isl::manage(NewSchedule[&Stmt]));
+      ScheduleMap = ScheduleMap.add_map(NewSchedule[&Stmt]);
     else
       ScheduleMap = ScheduleMap.add_map(Stmt.getSchedule());
   }