send result type as first arg to all make_instruction methods

7 files changed, 15 insertions, 7 deletions

diff --git a/eval/src/tests/instruction/generic_cell_cast/generic_cell_cast_test.cpp b/eval/src/tests/instruction/generic_cell_cast/generic_cell_cast_test.cpp
index 06b74eff4d5..eb156bbe531 100644
--- a/eval/src/tests/instruction/generic_cell_cast/generic_cell_cast_test.cpp
+++ b/eval/src/tests/instruction/generic_cell_cast/generic_cell_cast_test.cpp
@@ -37,7 +37,8 @@ TensorSpec perform_generic_cell_cast(const TensorSpec &a, CellType to, const Val
 {
     Stash stash;
     auto lhs = value_from_spec(a, factory);
-    auto my_op = GenericCellCast::make_instruction(lhs->type(), to, stash);
+    auto res_type = lhs->type().cell_cast(to);
+    auto my_op = GenericCellCast::make_instruction(res_type, lhs->type(), to, stash);
     InterpretedFunction::EvalSingle single(factory, my_op);
     return spec_from_value(single.eval(std::vector<Value::CREF>({*lhs})));
 }
diff --git a/eval/src/tests/instruction/generic_concat/generic_concat_test.cpp b/eval/src/tests/instruction/generic_concat/generic_concat_test.cpp
index 8bf6751cd73..6b6a803a4b1 100644
--- a/eval/src/tests/instruction/generic_concat/generic_concat_test.cpp
+++ b/eval/src/tests/instruction/generic_concat/generic_concat_test.cpp
@@ -68,7 +68,8 @@ TensorSpec perform_generic_concat(const TensorSpec &a, const TensorSpec &b,
     Stash stash;
     auto lhs = value_from_spec(a, factory);
     auto rhs = value_from_spec(b, factory);
-    auto my_op = GenericConcat::make_instruction(lhs->type(), rhs->type(), concat_dim, factory, stash);
+    auto res_type = ValueType::concat(lhs->type(), rhs->type(), concat_dim);
+    auto my_op = GenericConcat::make_instruction(res_type, lhs->type(), rhs->type(), concat_dim, factory, stash);
     InterpretedFunction::EvalSingle single(factory, my_op);
     return spec_from_value(single.eval(std::vector<Value::CREF>({*lhs,*rhs})));
 }
diff --git a/eval/src/tests/instruction/generic_join/generic_join_test.cpp b/eval/src/tests/instruction/generic_join/generic_join_test.cpp
index 2f619bcaa54..114881e6bee 100644
--- a/eval/src/tests/instruction/generic_join/generic_join_test.cpp
+++ b/eval/src/tests/instruction/generic_join/generic_join_test.cpp
@@ -55,7 +55,8 @@ TensorSpec perform_generic_join(const TensorSpec &a, const TensorSpec &b,
     Stash stash;
     auto lhs = value_from_spec(a, factory);
     auto rhs = value_from_spec(b, factory);
-    auto my_op = GenericJoin::make_instruction(lhs->type(), rhs->type(), function, factory, stash);
+    auto res_type = ValueType::join(lhs->type(), rhs->type());
+    auto my_op = GenericJoin::make_instruction(res_type, lhs->type(), rhs->type(), function, factory, stash);
     InterpretedFunction::EvalSingle single(factory, my_op);
     return spec_from_value(single.eval(std::vector<Value::CREF>({*lhs,*rhs})));
 }
diff --git a/eval/src/tests/instruction/generic_map/generic_map_test.cpp b/eval/src/tests/instruction/generic_map/generic_map_test.cpp
index cf4b09914c3..56405eefdde 100644
--- a/eval/src/tests/instruction/generic_map/generic_map_test.cpp
+++ b/eval/src/tests/instruction/generic_map/generic_map_test.cpp
@@ -36,7 +36,9 @@ const std::vector<GenSpec> map_layouts = {
 TensorSpec perform_generic_map(const TensorSpec &a, map_fun_t func, const ValueBuilderFactory &factory)
 {
     auto lhs = value_from_spec(a, factory);
-    auto my_op = GenericMap::make_instruction(lhs->type(), func);
+    // XXX for now:
+    auto res_type = lhs->type();
+    auto my_op = GenericMap::make_instruction(res_type, lhs->type(), func);
     InterpretedFunction::EvalSingle single(factory, my_op);
     return spec_from_value(single.eval(std::vector<Value::CREF>({*lhs})));
 }
diff --git a/eval/src/tests/instruction/generic_merge/generic_merge_test.cpp b/eval/src/tests/instruction/generic_merge/generic_merge_test.cpp
index 025ab7f857e..9fde59a7c86 100644
--- a/eval/src/tests/instruction/generic_merge/generic_merge_test.cpp
+++ b/eval/src/tests/instruction/generic_merge/generic_merge_test.cpp
@@ -40,7 +40,8 @@ TensorSpec perform_generic_merge(const TensorSpec &a, const TensorSpec &b, join_
     Stash stash;
     auto lhs = value_from_spec(a, factory);
     auto rhs = value_from_spec(b, factory);
-    auto my_op = GenericMerge::make_instruction(lhs->type(), rhs->type(), fun, factory, stash);
+    auto res_type = ValueType::merge(lhs->type(), rhs->type());
+    auto my_op = GenericMerge::make_instruction(res_type, lhs->type(), rhs->type(), fun, factory, stash);
     InterpretedFunction::EvalSingle single(factory, my_op);
     return spec_from_value(single.eval(std::vector<Value::CREF>({*lhs, *rhs})));
 }
diff --git a/eval/src/tests/instruction/generic_reduce/generic_reduce_test.cpp b/eval/src/tests/instruction/generic_reduce/generic_reduce_test.cpp
index 8eb7b5bd057..af0ebba00c7 100644
--- a/eval/src/tests/instruction/generic_reduce/generic_reduce_test.cpp
+++ b/eval/src/tests/instruction/generic_reduce/generic_reduce_test.cpp
@@ -42,7 +42,8 @@ TensorSpec perform_generic_reduce(const TensorSpec &a, Aggr aggr, const std::vec
 {
     Stash stash;
     auto lhs = value_from_spec(a, factory);
-    auto my_op = GenericReduce::make_instruction(lhs->type(), aggr, dims, factory, stash);
+    auto res_type = lhs->type().reduce(dims);
+    auto my_op = GenericReduce::make_instruction(res_type, lhs->type(), aggr, dims, factory, stash);
     InterpretedFunction::EvalSingle single(factory, my_op);
     return spec_from_value(single.eval(std::vector<Value::CREF>({*lhs})));
 }
diff --git a/eval/src/tests/instruction/generic_rename/generic_rename_test.cpp b/eval/src/tests/instruction/generic_rename/generic_rename_test.cpp
index 7b67f1bbd22..4edf2a0ca87 100644
--- a/eval/src/tests/instruction/generic_rename/generic_rename_test.cpp
+++ b/eval/src/tests/instruction/generic_rename/generic_rename_test.cpp
@@ -103,7 +103,8 @@ TensorSpec perform_generic_rename(const TensorSpec &a,
 {
     Stash stash;
     auto lhs = value_from_spec(a, factory);
-    auto my_op = GenericRename::make_instruction(lhs->type(), ft.from, ft.to, factory, stash);
+    auto res_type = lhs->type().rename(ft.from, ft.to);
+    auto my_op = GenericRename::make_instruction(res_type, lhs->type(), ft.from, ft.to, factory, stash);
     InterpretedFunction::EvalSingle single(factory, my_op);
     return spec_from_value(single.eval(std::vector<Value::CREF>({*lhs})));
 }