[coco] Remove deprecated get (#1499)

This commit removes deprecated get method in DLinkedList Node.

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

diff --git a/contrib/coco/core/include/coco/ADT/DLinkedList.h b/contrib/coco/core/include/coco/ADT/DLinkedList.h
index 81ac344..92c1743 100644 (file)
--- a/contrib/coco/core/include/coco/ADT/DLinkedList.h
+++ b/contrib/coco/core/include/coco/ADT/DLinkedList.h
@@ -148,10 +148,6 @@ template <typename Child, typename Parent> struct DLinkedList
   public:
     virtual ~Node() = default;
 
-  protected:
-    // NOTE This method will be deprecated
-    virtual void get(const PtrLink<Child, Parent> **out) const = 0;
-
   public:
     Parent *parent(void) const { return _parent; }
 

diff --git a/contrib/coco/core/include/coco/IR/Block.h b/contrib/coco/core/include/coco/IR/Block.h
index ec98f31..e17ddb7 100644 (file)
--- a/contrib/coco/core/include/coco/IR/Block.h
+++ b/contrib/coco/core/include/coco/IR/Block.h
@@ -21,8 +21,9 @@ using BlockList = DLinkedList<Block, Module>::Head;
 class Block final : public DLinkedList<Block, Module>::Node
 {
 public:
-  Block(const PtrLink<Block, Module> *block_link, PtrLink<Instr, Block> *instr_link)
-      : _block_link{block_link}, _instr{this, instr_link}
+  // TODO Update constructor
+  Block(const PtrLink<Block, Module> *, PtrLink<Instr, Block> *instr_link)
+      : _instr{this, instr_link}
   {
     // DO NOTHING
   }
@@ -31,12 +32,6 @@ public:
   Block(const Block &) = delete;
   Block(Block &&) = delete;
 
-private:
-  const PtrLink<Block, Module> *const _block_link;
-
-private:
-  void get(const PtrLink<Block, Module> **out) const override { *out = _block_link; }
-
 public:
   InstrList *instr(void) { return &_instr; }
   const InstrList *instr(void) const { return &_instr; }

diff --git a/contrib/coco/core/include/coco/IR/Shuffle.h b/contrib/coco/core/include/coco/IR/Shuffle.h
index 6536612..e6a5b9b 100644 (file)
--- a/contrib/coco/core/include/coco/IR/Shuffle.h
+++ b/contrib/coco/core/include/coco/IR/Shuffle.h
@@ -18,8 +18,9 @@ namespace coco
 class Shuffle final : public Instr, public Bag::Reader, public Bag::Updater
 {
 public:
-  Shuffle(const PtrLink<Instr, Block> *instr_link, const PtrLink<Bag, BagInfo> *bag_link)
-      : _instr_link{instr_link}, _from{bag_link, this}, _into{bag_link, this}
+  // TODO Update constructor interface
+  Shuffle(const PtrLink<Instr, Block> *, const PtrLink<Bag, BagInfo> *bag_link)
+      : _from{bag_link, this}, _into{bag_link, this}
   {
     // DO NOTHING
   }
@@ -35,9 +36,6 @@ public:
 public:
   Instr *loc(void) override { return this; }
 
-private:
-  void get(const PtrLink<Instr, Block> **out) const override { *out = _instr_link; }
-
 public:
   Bag *from(void) const { return _from.bag(); }
   void from(Bag *bag);
@@ -68,9 +66,6 @@ public:
   void insert(const ElemID &from, const ElemID &into);
 
 private:
-  const PtrLink<Instr, Block> *const _instr_link;
-
-private:
   Read _from;
   Update _into;
 

diff --git a/contrib/coco/core/include/coco/IR/UnitF.h b/contrib/coco/core/include/coco/IR/UnitF.h
index b03ebc3..beb5acf 100644 (file)
--- a/contrib/coco/core/include/coco/IR/UnitF.h
+++ b/contrib/coco/core/include/coco/IR/UnitF.h
@@ -15,9 +15,10 @@ namespace coco
 class UnitF final : public FeatureInstr
 {
 public:
-  UnitF(PtrLink<Op, Instr> *op_link, const PtrLink<Instr, Block> *link,
+  // TODO Update constructor
+  UnitF(PtrLink<Op, Instr> *op_link, const PtrLink<Instr, Block> *,
         const PtrLink<Object, ObjectInfo> *obj_link)
-      : FeatureInstr{obj_link}, _op_link{op_link}, _link{link}, _op{nullptr}
+      : FeatureInstr{obj_link}, _op_link{op_link}, _op{nullptr}
   {
     // DO NOTHING
   }
@@ -35,10 +36,6 @@ public:
 
 private:
   PtrLink<Op, Instr> *const _op_link;
-  const PtrLink<Instr, Block> *const _link;
-
-private:
-  void get(const PtrLink<Instr, Block> **out) const override { *out = _link; }
 
 private:
   Op *_op;

diff --git a/contrib/coco/core/src/ADT/DLinkedList.test.cpp b/contrib/coco/core/src/ADT/DLinkedList.test.cpp
index 051d8dc..caaffdc 100644 (file)
--- a/contrib/coco/core/src/ADT/DLinkedList.test.cpp
+++ b/contrib/coco/core/src/ADT/DLinkedList.test.cpp
@@ -28,19 +28,14 @@ private:
 class Child final : public coco::DLinkedList<Child, Parent>::Node
 {
 public:
-  Child(const coco::PtrLink<Child, Parent> *link) : _link{link}
+  // TODO Update constructor
+  Child(const coco::PtrLink<Child, Parent> *)
   {
     // DO NOTHING
   }
 
 private:
-  void get(const coco::PtrLink<Child, Parent> **out) const override { *out = _link; }
-
-private:
   ChildList *head(void) const override { return parent()->children(); }
-
-private:
-  const coco::PtrLink<Child, Parent> *_link;
 };
 
 } // namespace

diff --git a/contrib/coco/core/src/IR/Instr.test.cpp b/contrib/coco/core/src/IR/Instr.test.cpp
index b3b163e..83a8f1d 100644 (file)
--- a/contrib/coco/core/src/IR/Instr.test.cpp
+++ b/contrib/coco/core/src/IR/Instr.test.cpp
@@ -46,9 +46,6 @@ public:
     // DO NOTHING
   }
 
-private:
-  void get(const coco::PtrLink<coco::Instr, coco::Block> **) const override { return; }
-
 public:
   std::set<coco::Bag *> reads(void) const override { return std::set<coco::Bag *>(); }
   std::set<coco::Bag *> updates(void) const override { return std::set<coco::Bag *>(); }