diff options
4 files changed, 14 insertions, 4 deletions
diff --git a/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp b/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp index 8ee0ba90af9..0d171fa0668 100644 --- a/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp +++ b/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp @@ -42,8 +42,8 @@ void verify_optimized(const vespalib::string &expr, const FunInfo &details) CellTypeSpace stable_types(CellTypeUtils::list_stable_types(), 2); CellTypeSpace unstable_types(CellTypeUtils::list_unstable_types(), 2); EvalFixture::verify<FunInfo>(expr, {details}, CellTypeSpace(stable_types).same()); - EvalFixture::verify<FunInfo>(expr, {}, CellTypeSpace(stable_types).different()); - EvalFixture::verify<FunInfo>(expr, {}, unstable_types); + EvalFixture::verify<FunInfo>(expr, {}, CellTypeSpace(std::move(stable_types)).different()); + EvalFixture::verify<FunInfo>(expr, {}, std::move(unstable_types)); } void verify_not_optimized(const vespalib::string &expr) { diff --git a/eval/src/vespa/eval/eval/test/cell_type_space.h b/eval/src/vespa/eval/eval/test/cell_type_space.h index e4ab26c2f91..3f8abfe5936 100644 --- a/eval/src/vespa/eval/eval/test/cell_type_space.h +++ b/eval/src/vespa/eval/eval/test/cell_type_space.h @@ -36,6 +36,8 @@ public: assert(n > 0); skip_unwanted(); } + CellTypeSpace(const CellTypeSpace& rhs) = default; + CellTypeSpace(CellTypeSpace&& rhs) noexcept = default; ~CellTypeSpace(); CellTypeSpace &same() { _drop_different = true; diff --git a/vespalib/src/tests/datastore/array_store/array_store_test.cpp b/vespalib/src/tests/datastore/array_store/array_store_test.cpp index 1df03f6eb0a..ba6782334bd 100644 --- a/vespalib/src/tests/datastore/array_store/array_store_test.cpp +++ b/vespalib/src/tests/datastore/array_store/array_store_test.cpp @@ -65,6 +65,7 @@ struct ArrayStoreTest : public TestT EntryRef ref = add(input); assertGet(ref, input); } + size_t reference_store_count(EntryRef ref) const __attribute__((noinline)); EntryRef add(const ElemVector &input) { EntryRef result; if (add_using_allocate) { @@ -78,7 +79,7 @@ struct ArrayStoreTest : public TestT // This is default and preferred way of adding an array. result = store.add(ConstArrayRef(input)); } - assert(refStore.count(result) == 0); + assert(reference_store_count(result) == 0); refStore.insert(std::make_pair(result, input)); return result; } @@ -167,6 +168,13 @@ struct ArrayStoreTest : public TestT template <typename TestT, typename ElemT, typename RefT> ArrayStoreTest<TestT, ElemT, RefT>::~ArrayStoreTest() = default; +template <typename TestT, typename ElemT, typename RefT> +size_t +ArrayStoreTest<TestT, ElemT, RefT>::reference_store_count(EntryRef ref) const +{ + return refStore.count(ref); +} + struct TestParam { bool add_using_allocate; TestParam(bool add_using_allocate_in) : add_using_allocate(add_using_allocate_in) {} diff --git a/vespalog/src/vespa/log/control-file.h b/vespalog/src/vespa/log/control-file.h index 31c15077c8c..c9ab746c3e2 100644 --- a/vespalog/src/vespa/log/control-file.h +++ b/vespalog/src/vespa/log/control-file.h @@ -60,7 +60,7 @@ public: unsigned int *getLevels(const char *name); void ensureComponent(const char *pattern); - static unsigned int *defaultLevels(); + static unsigned int *defaultLevels() __attribute__((noinline)); // make sure in-memory changes are synchronized to disk void flush(); |