From 8c2c60de38041e579cfaae4a8987248fbfc3d16c Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Sun, 7 Jun 2020 13:19:18 +0000
Subject: - Test both normal and inverted bit vectors. - Use 64 byte alignment
 of buffer. - Improve error messages.

---
 searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'searchlib')

diff --git a/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.cpp b/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.cpp
index ae270dd8ea0..ca82e45cf0e 100644
--- a/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.cpp
@@ -24,9 +24,10 @@ public:
     explicit MultiBitVectorIterator(const Children & children)
         : MultiBitVectorIteratorBase(children),
           _update(),
-          _lastWords(),
-          _accel(IAccelrated::getAccelrator())
+          _accel(IAccelrated::getAccelrator()),
+          _lastWords()
     {
+        static_assert(sizeof(_lastWords) == 64, "Latswords should have 64 byte size");
         memset(&_lastWords, 0, sizeof(_lastWords));
     }
 protected:
@@ -37,8 +38,8 @@ private:
     Trinary is_strict() const override { return Trinary::False; }
     bool acceptExtraFilter() const override { return Update::isAnd(); }
     Update              _update;
-    Word                _lastWords[8] __attribute__((aligned(32)));
     const IAccelrated & _accel;
+    alignas(64) Word    _lastWords[8];
 };
 
 template<typename Update>
-- 
cgit v1.2.3