[coco] Link to Def instead of Producer (#1487)

This commit revises ObjectInfo class to maintain a link(= pointer) to
Def instead of Producer.

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

diff --git a/contrib/coco/core/include/coco/IR/Def.forward.h b/contrib/coco/core/include/coco/IR/Def.forward.h
new file mode 100644 (file)
index 0000000..1adbda4
--- /dev/null
+++ b/contrib/coco/core/include/coco/IR/Def.forward.h
@@ -0,0 +1,11 @@
+#ifndef __COCO_IR_DEF_FORWARD_H__
+#define __COCO_IR_DEF_FORWARD_H__
+
+namespace coco
+{
+
+class Def;
+
+} // namespace coco
+
+#endif // __COCO_IR_DEF_FORWARD_H__

diff --git a/contrib/coco/core/include/coco/IR/Def.h b/contrib/coco/core/include/coco/IR/Def.h
index 9421730..cdb3982 100644 (file)
--- a/contrib/coco/core/include/coco/IR/Def.h
+++ b/contrib/coco/core/include/coco/IR/Def.h
@@ -27,6 +27,9 @@ public:
 public:
   void value(Object *value);
 
+public:
+  Object::Producer *producer(void) const { return _producer; }
+
 private:
   const PtrLink<Object, ObjectInfo> *_link = nullptr;
 

diff --git a/contrib/coco/core/include/coco/IR/ObjectInfo.h b/contrib/coco/core/include/coco/IR/ObjectInfo.h
index 508913e..69193ac 100644 (file)
--- a/contrib/coco/core/include/coco/IR/ObjectInfo.h
+++ b/contrib/coco/core/include/coco/IR/ObjectInfo.h
@@ -2,6 +2,7 @@
 #define __COCO_IR_OBJECT_INFO_H__
 
 #include "coco/IR/Object.h"
+#include "coco/IR/Def.forward.h"
 
 namespace coco
 {
@@ -15,15 +16,15 @@ public:
   virtual ~ObjectInfo() = default;
 
 public:
-  Object::Producer *def(void) const { return _def; }
-  void def(Object::Producer *d);
+  Def *def(void) const { return _def; }
+  void def(Def *d);
 
 public:
   Object::ConsumerSet *user(void) { return &_user; }
   const Object::ConsumerSet *user(void) const { return &_user; }
 
 private:
-  Object::Producer *_def = nullptr;
+  Def *_def = nullptr;
   Object::ConsumerSet _user;
 };
 

diff --git a/contrib/coco/core/src/IR/Def.cpp b/contrib/coco/core/src/IR/Def.cpp
index 78cc2c4..9b3d16a 100644 (file)
--- a/contrib/coco/core/src/IR/Def.cpp
+++ b/contrib/coco/core/src/IR/Def.cpp
@@ -27,7 +27,7 @@ void Def::value(Object *value)
 
     auto info = _link->find(_value);
     assert(info != nullptr);
-    info->def(_producer);
+    info->def(this);
   }
 
   assert(_value == value);

diff --git a/contrib/coco/core/src/IR/Object.cpp b/contrib/coco/core/src/IR/Object.cpp
index a93d0f1..ba3deee 100644 (file)
--- a/contrib/coco/core/src/IR/Object.cpp
+++ b/contrib/coco/core/src/IR/Object.cpp
@@ -1,6 +1,7 @@
 #include "coco/IR/Object.h"
 #include "coco/IR/BagInfo.h"
 #include "coco/IR/ObjectInfo.h"
+#include "coco/IR/Def.h"
 
 #include <cassert>
 #include <stdexcept>
@@ -23,7 +24,16 @@ ObjectInfo *Object::info(void) const
   return res;
 }
 
-Object::Producer *Object::def(void) const { return info()->def(); }
+Object::Producer *Object::def(void) const
+{
+  if (auto d = info()->def())
+  {
+    return d->producer();
+  }
+
+  return nullptr;
+}
+
 const Object::ConsumerSet *Object::user(void) const { return info()->user(); }
 
 } // namespace coco

diff --git a/contrib/coco/core/src/IR/ObjectInfo.cpp b/contrib/coco/core/src/IR/ObjectInfo.cpp
index f49b67d..faace4b 100644 (file)
--- a/contrib/coco/core/src/IR/ObjectInfo.cpp
+++ b/contrib/coco/core/src/IR/ObjectInfo.cpp
@@ -5,7 +5,7 @@
 namespace coco
 {
 
-void ObjectInfo::def(Object::Producer *d)
+void ObjectInfo::def(Def *d)
 {
   // This assert ensures that object cannot have multiple def.
   assert((_def == nullptr) || (d == nullptr));