[coco] Support visit over const Instr objects (#866)

The current implementation of 'accept' has no const qualifier, and thus
it is impossible to apply visitor over const Instr objects.

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

diff --git a/contrib/coco/core/include/coco/IR/Instr.h b/contrib/coco/core/include/coco/IR/Instr.h
index 4863a61..04d8f3d 100644 (file)
--- a/contrib/coco/core/include/coco/IR/Instr.h
+++ b/contrib/coco/core/include/coco/IR/Instr.h
@@ -60,7 +60,7 @@ public:
   };
 
 public:
-  template<typename T> T accept(Visitor<T> *v)
+  template<typename T> T accept(Visitor<T> *v) const
   {
     if (auto ins = asUnitF())
     {
@@ -70,8 +70,8 @@ public:
     throw std::runtime_error{"unreachable"};
   }
 
-  template<typename T> T accept(Visitor<T> &v) { return accept(&v); }
-  template<typename T> T accept(Visitor<T> &&v) { return accept(&v); }
+  template<typename T> T accept(Visitor<T> &v) const { return accept(&v); }
+  template<typename T> T accept(Visitor<T> &&v) const { return accept(&v); }
 };
 
 } // namespace coco

diff --git a/contrib/coco/core/src/IR/Instr.test.cpp b/contrib/coco/core/src/IR/Instr.test.cpp
index 0ab7169..0eac6db 100644 (file)
--- a/contrib/coco/core/src/IR/Instr.test.cpp
+++ b/contrib/coco/core/src/IR/Instr.test.cpp
@@ -110,5 +110,9 @@ TEST(IR_UNIT_F, visitor)
   coco::PtrLink<coco::Instr, coco::Block> link;
   coco::UnitF ins{&link};
 
-  ASSERT_TRUE(ins.accept(UnitFDetector{}));
+  coco::Instr *mutable_ptr = &ins;
+  const coco::Instr *immutable_ptr = &ins;
+
+  ASSERT_TRUE(mutable_ptr->accept(UnitFDetector{}));
+  ASSERT_TRUE(immutable_ptr->accept(UnitFDetector{}));
 }