collectIteratorMaps: undo argument renaming

Now that collectIteratorMaps is a stand-alone function,
the renaming of 020faf0 (Compilation fix for
-Werror=shadow-compatible-local, Mon May 7 15:12:13 2018 -0700)
is no longer needed.

Author: Sven Verdoolaege

tc/core/polyhedral/codegen_llvm.cc

@@ -609,31 +609,31 @@ struct IslCodegenRes {
 isl::ast_node collectIteratorMaps(
     isl::ast_node node,
     isl::ast_build build,
-    IteratorMapsType& iteratorMapsInFun,
-    const Scop& scopInFun,
-    StmtSubscriptExprMapType& stmtSubscriptsInFun) {
+    IteratorMapsType& iteratorMaps,
+    const Scop& scop,
+    StmtSubscriptExprMapType& stmtSubscripts) {
   auto user = node.as<isl::ast_node_user>();
   CHECK(user);
   auto expr = user.get_expr().as<isl::ast_expr_op>();
   auto schedule = build.get_schedule();
   auto scheduleMap = isl::map::from_union_map(schedule);
 
   auto stmtId = expr.get_arg(0).as<isl::ast_expr_id>().get_id();
-  CHECK_EQ(0u, iteratorMapsInFun.count(stmtId)) << "entry exists: " << stmtId;
+  CHECK_EQ(0u, iteratorMaps.count(stmtId)) << "entry exists: " << stmtId;
   auto iteratorMap = isl::pw_multi_aff(scheduleMap.reverse());
-  auto iterators = scopInFun.halide.iterators.at(stmtId);
-  auto& stmtIteratorMap = iteratorMapsInFun[stmtId];
+  auto iterators = scop.halide.iterators.at(stmtId);
+  auto& stmtIteratorMap = iteratorMaps[stmtId];
   for (size_t i = 0; i < iterators.size(); ++i) {
     auto expr = build.expr_from(iteratorMap.get_pw_aff(i));
     stmtIteratorMap.emplace(iterators[i], expr);
   }
-  auto& subscripts = stmtSubscriptsInFun[stmtId];
+  auto& subscripts = stmtSubscripts[stmtId];
   auto provide =
-      scopInFun.halide.statements.at(stmtId).as<Halide::Internal::Provide>();
+      scop.halide.statements.at(stmtId).as<Halide::Internal::Provide>();
   for (auto e : provide->args) {
     const auto& map = iteratorMap;
     auto space = map.get_space().params();
-    auto aff = scopInFun.makeIslAffFromStmtExpr(stmtId, space, e);
+    auto aff = scop.makeIslAffFromStmtExpr(stmtId, space, e);
     auto pulled = isl::pw_aff(aff).pullback(map);
     CHECK_EQ(pulled.n_piece(), 1);
     subscripts.push_back(build.expr_from(pulled));