rebase fixes

Author: stevenraphael

src/Function.cpp

@@ -654,14 +654,14 @@ void Function::define(const vector<string> &args, vector<Expr> values) {
     // memory leaks. We need to break these cycles.
     WeakenFunctionPtrs weakener(contents.get());
     for (auto &arg : init_def_args) {
-        arg = weakener.mutate(arg);
+        arg = weakener(arg);
     }
     for (auto &value : values) {
-        value = weakener.mutate(value);
+        value = weakener(value);
     }
     if (check.reduction_domain.defined()) {
         check.reduction_domain.set_predicate(
-            weakener.mutate(check.reduction_domain.predicate()));
+            weakener(check.reduction_domain.predicate()));
     }
 
     ReductionDomain rdom;

test/correctness/tracing.cpp

@@ -217,11 +217,7 @@ int main(int argc, char **argv) {
     f.realize({10}, get_jit_target_from_environment().with_feature(Target::TracePipeline));
 
     // The golden trace, recorded when this test was written
-<<<<<<< HEAD
     static event correct_pipeline_trace[] = {
-=======
-    event correct_pipeline_trace[] = {
->>>>>>> 2197d3da2 (get default types back to normal; add new test)
         {102, 0, 8, 3, 0, 0, 0, 0, {0, 0, 0, 0}, {0.000000f, 0.000000f, 0.000000f, 0.000000f}, ""},
         {102, 1, 9, 3, 0, 0, 0, 0, {0, 0, 0, 0}, {0.000000f, 0.000000f, 0.000000f, 0.000000f}, ""},
     };