[coco] Unlink Update from Bag on desturction (#1439)

With this commit, Update unlinks itself from a linked bag if it exists.

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

diff --git a/contrib/coco/core/include/coco/IR/Update.h b/contrib/coco/core/include/coco/IR/Update.h
index 6d2603d..12dd867 100644 (file)
--- a/contrib/coco/core/include/coco/IR/Update.h
+++ b/contrib/coco/core/include/coco/IR/Update.h
@@ -22,6 +22,9 @@ public:
   }
 
 public:
+  ~Update();
+
+public:
   void link(const PtrLink<Bag, BagInfo> *l) { _link = l; }
 
 public:

diff --git a/contrib/coco/core/src/IR/Update.cpp b/contrib/coco/core/src/IR/Update.cpp
index 709b1ba..68fe253 100644 (file)
--- a/contrib/coco/core/src/IR/Update.cpp
+++ b/contrib/coco/core/src/IR/Update.cpp
@@ -6,6 +6,12 @@
 namespace coco
 {
 
+Update::~Update()
+{
+  // Unlink self from a linked bag if it exists
+  bag(nullptr);
+}
+
 void Update::bag(Bag *bag)
 {
   if (_bag)

diff --git a/contrib/coco/core/src/IR/Update.test.cpp b/contrib/coco/core/src/IR/Update.test.cpp
index 7b7db7e..84c0e03 100644 (file)
--- a/contrib/coco/core/src/IR/Update.test.cpp
+++ b/contrib/coco/core/src/IR/Update.test.cpp
@@ -57,3 +57,18 @@ TEST_F(UpdateTest, value)
     ASSERT_EQ(updates.size(), 0);
   }
 }
+
+TEST_F(UpdateTest, unlink_on_destruction)
+{
+  ::mock::Update updater;
+
+  auto bag = bag_mgr.create(1);
+
+  {
+    coco::Update update{&bag_link, &updater};
+    update.bag(bag);
+    ASSERT_EQ(bag->updates().size(), 1);
+  }
+
+  ASSERT_EQ(bag->updates().size(), 0);
+}