Deinline as compiler makes the best choices.

4 files changed, 7 insertions, 0 deletions

diff --git a/storage/src/tests/bucketdb/lockablemaptest.cpp b/storage/src/tests/bucketdb/lockablemaptest.cpp
index 91f273928d6..2e6cd0656e4 100644
--- a/storage/src/tests/bucketdb/lockablemaptest.cpp
+++ b/storage/src/tests/bucketdb/lockablemaptest.cpp
@@ -349,8 +349,11 @@ namespace {
         uint32_t _counter;
 
         LoadGiver(Map& map) : _map(map), _counter(0) {}
+        ~LoadGiver() __attribute__((noinline));
     };
 
+    LoadGiver::~LoadGiver() { }
+
     struct InsertEraseLoadGiver : public LoadGiver {
         InsertEraseLoadGiver(Map& map) : LoadGiver(map) {}
 
diff --git a/storage/src/tests/common/teststorageapp.cpp b/storage/src/tests/common/teststorageapp.cpp
index 92516f15ee1..b91210f3459 100644
--- a/storage/src/tests/common/teststorageapp.cpp
+++ b/storage/src/tests/common/teststorageapp.cpp
@@ -274,6 +274,8 @@ TestDistributorApp::TestDistributorApp(NodeIndex index,
     configure(configId);
 }
 
+TestDistributorApp::~TestDistributorApp() {}
+
 api::Timestamp
 TestDistributorApp::getUniqueTimestamp()
 {
diff --git a/storage/src/tests/common/teststorageapp.h b/storage/src/tests/common/teststorageapp.h
index 3b64fb6e6fa..119be74a3d2 100644
--- a/storage/src/tests/common/teststorageapp.h
+++ b/storage/src/tests/common/teststorageapp.h
@@ -146,6 +146,7 @@ class TestDistributorApp : public TestStorageApp,
 public:
     TestDistributorApp(vespalib::stringref configId = "");
     TestDistributorApp(NodeIndex index, vespalib::stringref configId = "");
+    ~TestDistributorApp();
 
     DistributorComponentRegisterImpl& getComponentRegister() {
         return _compReg;
diff --git a/storage/src/tests/storageserver/statemanagertest.cpp b/storage/src/tests/storageserver/statemanagertest.cpp
index f9c5c97e6bc..ee55550baf7 100644
--- a/storage/src/tests/storageserver/statemanagertest.cpp
+++ b/storage/src/tests/storageserver/statemanagertest.cpp
@@ -133,6 +133,7 @@ namespace {
 
         MyStateListener(const NodeStateUpdater& upd)
             : updater(upd), current(*updater.getReportedNodeState()) {}
+        ~MyStateListener() { }
 
         void handleNewState() override {
             ost << current << " -> ";