[coco] Unlink Object's Def on destruction (#1457)

This commit revises DefSlot<T> to unlink linked Def from Object on
destruction.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/coco/core/include/coco/IR/DefSlot.h b/contrib/coco/core/include/coco/IR/DefSlot.h
index 996b2e1..edfe392 100644 (file)
--- a/contrib/coco/core/include/coco/IR/DefSlot.h
+++ b/contrib/coco/core/include/coco/IR/DefSlot.h
@@ -15,6 +15,9 @@ public:
   }
 
 public:
+  ~DefSlot() { value(nullptr); }
+
+public:
   T *value(void) const { return _value; }
 
 public:

diff --git a/contrib/coco/core/src/IR/DefSlot.test.cpp b/contrib/coco/core/src/IR/DefSlot.test.cpp
index b790cf4..26a9681 100644 (file)
--- a/contrib/coco/core/src/IR/DefSlot.test.cpp
+++ b/contrib/coco/core/src/IR/DefSlot.test.cpp
@@ -4,10 +4,14 @@
 
 #include "coco/IR/FeatureObject.h"
 
+#include "nncc/foundation/Memory.h"
+
 #include "Def.mock.h"
 
 #include <gtest/gtest.h>
 
+using nncc::foundation::make_unique;
+
 namespace
 {
 class DefSlotTest : public ::testing::Test
@@ -49,3 +53,21 @@ TEST_F(DefSlotTest, value)
 
   ASSERT_EQ(o->def(), nullptr);
 }
+
+TEST_F(DefSlotTest, unlink_on_destruction)
+{
+  auto o = obj_mgr.create(nncc::core::ADT::feature::Shape{1, 1, 1});
+
+  ::mock::Def def;
+
+  auto slot = make_unique<coco::DefSlot<coco::FeatureObject>>(&obj_link, &def);
+
+  slot->value(o);
+  ASSERT_EQ(o->def(), &def);
+
+  // Let's destruct the allocated slot
+  slot.reset(nullptr);
+
+  // The def of Object SHOULD BE updated
+  ASSERT_EQ(o->def(), nullptr);
+}