Merge pull request #326 from salexspb/merge_fb

TC: Compilation fix for -Werror=shadow-compatible-local

Author: salexspb

tc/autotuner/genetic_search.cc

@@ -230,7 +230,7 @@ TuningConfiguration GeneticSearch::crossover(
     }
   };
 
-  for (size_t i = 0; i < kMutateIterations; ++i) {
+  for (size_t iter = 0; iter < kMutateIterations; ++iter) {
     TuningConfiguration child{a};
     auto params = child.collectParameters();
     for (size_t i = 0; i < params.size(); ++i) {

tc/core/halide2isl.cc

@@ -402,12 +402,12 @@ isl::schedule makeScheduleTreeHelper(
     // this loop var at the same index.
     isl::multi_union_pw_aff mupa;
     body.get_domain().foreach_set([&](isl::set s) {
-      isl::aff loopVar(
+      isl::aff newLoopVar(
           isl::local_space(s.get_space()), isl::dim_type::set, thisLoopIdx);
       if (mupa) {
-        mupa = mupa.union_add(isl::union_pw_aff(isl::pw_aff(loopVar)));
+        mupa = mupa.union_add(isl::union_pw_aff(isl::pw_aff(newLoopVar)));
       } else {
-        mupa = isl::union_pw_aff(isl::pw_aff(loopVar));
+        mupa = isl::union_pw_aff(isl::pw_aff(newLoopVar));
       }
     });
 
@@ -420,9 +420,9 @@ isl::schedule makeScheduleTreeHelper(
     // Build a schedule tree for both members of the block and
     // combine them in a sequence.
     std::vector<isl::schedule> schedules;
-    for (Stmt s : stmts) {
+    for (Stmt stmt : stmts) {
       schedules.push_back(makeScheduleTreeHelper(
-          s, set, outer, reads, writes, accesses, statements, iterators));
+          stmt, set, outer, reads, writes, accesses, statements, iterators));
     }
     schedule = schedules[0].sequence(schedules[1]);
 

tc/core/polyhedral/schedule_transforms.cc

@@ -463,9 +463,9 @@ isl::multi_union_pw_aff infixScheduleMupa(
   prefix = prefix.intersect_domain(domain);
   prefix = foldl(
       filterType<ScheduleTreeElemBand>(tree->ancestors(relativeRoot)),
-      [](const ScheduleTree* st, isl::multi_union_pw_aff prefix) {
+      [](const ScheduleTree* st, isl::multi_union_pw_aff pref) {
         auto mupa = st->elemAs<ScheduleTreeElemBand>()->mupa_;
-        return prefix.flat_range_product(mupa);
+        return pref.flat_range_product(mupa);
       },
       prefix);
   return prefix;

tc/core/polyhedral/schedule_tree.cc

@@ -326,9 +326,7 @@ vector<const ScheduleTree*> ScheduleTree::collectDFSPostorder(
 vector<const ScheduleTree*> ScheduleTree::collectDFSPostorder(
     const ScheduleTree* tree,
     detail::ScheduleTreeType type) {
-  auto filterType = [type](const ScheduleTree* tree) {
-    return tree->type_ == type;
-  };
+  auto filterType = [type](const ScheduleTree* t) { return t->type_ == type; };
   return functional::Filter(filterType, collectDFSPostorder(tree));
 }
 
@@ -345,9 +343,7 @@ vector<const ScheduleTree*> ScheduleTree::collectDFSPreorder(
 vector<const ScheduleTree*> ScheduleTree::collectDFSPreorder(
     const ScheduleTree* tree,
     detail::ScheduleTreeType type) {
-  auto filterType = [type](const ScheduleTree* tree) {
-    return tree->type_ == type;
-  };
+  auto filterType = [type](const ScheduleTree* t) { return t->type_ == type; };
   return functional::Filter(filterType, collectDFSPreorder(tree));
 }
 

tc/core/tc2halide.cc

@@ -724,11 +724,11 @@ void translateComprehension(
 
   if (added_implicit_initialization) {
     // Also reorder reduction initializations to the TC convention
-    vector<Var> lhs = func.args();
+    vector<Var> funcArgs = func.args();
     loop_nest.clear();
-    while (!lhs.empty()) {
-      loop_nest.push_back(lhs.back());
-      lhs.pop_back();
+    while (!funcArgs.empty()) {
+      loop_nest.push_back(funcArgs.back());
+      funcArgs.pop_back();
     }
     func.reorder(loop_nest);
   }