also merge similar cases

2 files changed, 4 insertions, 4 deletions

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 4e462a827b3..a051a345290 100644
--- a/eval/src/tests/instruction/generic_concat/generic_concat_test.cpp
+++ b/eval/src/tests/instruction/generic_concat/generic_concat_test.cpp
@@ -27,6 +27,8 @@ std::vector<Layout> concat_layouts = {
     {y(2)},                                             {z(3)},
     {x(5)},                                             {x(2),y(5)},
     {y(3)},                                             {x(2),z(3)},
+    {x(2)},                                             {x(3),y(5),z(2)},
+    {x(2),y(5),z(2)},                                   {x(3),y(5),z(2)},
     {x(3),y(5)},                                        {y(5),z(7)},
     float_cells({x(3),y(5)}),                           {y(5),z(7)},
     {x(3),y(5)},                                        float_cells({y(5),z(7)}),
diff --git a/eval/src/vespa/eval/instruction/generic_concat.cpp b/eval/src/vespa/eval/instruction/generic_concat.cpp
index 08874abd092..afb041f2bec 100644
--- a/eval/src/vespa/eval/instruction/generic_concat.cpp
+++ b/eval/src/vespa/eval/instruction/generic_concat.cpp
@@ -153,11 +153,11 @@ DenseConcatPlan::InOutLoop::InOutLoop(const ValueType &in_type,
 {
     Case prev_case = Case::NONE;
     auto update_plan = [&](Case my_case, size_t in_size, size_t out_size, size_t in_val, size_t out_val) {
-        /*if (my_case == prev_case) {
+        if (my_case == prev_case) {
             assert(!out_loop_cnt.empty());
             in_loop_cnt.back() *= in_size;
             out_loop_cnt.back() *= out_size;
-        } else */ {
+        } else {
             in_loop_cnt.push_back(in_size);
             out_loop_cnt.push_back(out_size);
             in_stride.push_back(in_val);
@@ -221,8 +221,6 @@ DenseConcatPlan::DenseConcatPlan(const ValueType &lhs_type,
     }
     assert(right_offset > 0);
     assert(left.output_size  == right.output_size);
-    assert(left.out_loop_cnt == right.out_loop_cnt);
-    assert(left.out_stride   == right.out_stride);
 }
 
 DenseConcatPlan::~DenseConcatPlan() = default;