From: lhutton1 <35535092+lhutton1@users.noreply.github.com>
Date: Fri, 29 May 2020 14:51:30 +0000 (+0100)
Subject: [RELAY] Fix segfault in pretty print when ObjectRef is null (#5681)
X-Git-Tag: upstream/0.7.0~644
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3698d5d00441079b28f80b3c5012a94682d8ead4;p=platform%2Fupstream%2Ftvm.git

[RELAY] Fix segfault in pretty print when ObjectRef is null (#5681)

* [RELAY] Fix segfault in pretty print when ObjectRef is null

Encountered when pretty printing module with function attribute equal to NullValue<ObjectRef>().

Change-Id: I2e7b304859f03038730ba9c3b9db41ebd3e1fbb5

* Add test case

Change-Id: I579b20da3f5d49054823392be80aaf78a055f596
---

diff --git a/src/printer/relay_text_printer.cc b/src/printer/relay_text_printer.cc
index 076339d..ad16f86 100644
--- a/src/printer/relay_text_printer.cc
+++ b/src/printer/relay_text_printer.cc
@@ -91,7 +91,8 @@ Doc RelayTextPrinter::PrintScope(const ObjectRef& node) {
 }
 
 Doc RelayTextPrinter::PrintFinal(const ObjectRef& node) {
-  if (node->IsInstance<BaseFuncNode>() && !node->IsInstance<relay::FunctionNode>()) {
+  if (node.defined() && node->IsInstance<BaseFuncNode>() &&
+      !node->IsInstance<relay::FunctionNode>()) {
     // Temporarily skip non-relay functions.
     // TODO(tvm-team) enhance the code to work for all functions
   } else if (node.as<ExprNode>()) {
@@ -105,8 +106,8 @@ Doc RelayTextPrinter::PrintFinal(const ObjectRef& node) {
 }
 
 Doc RelayTextPrinter::Print(const ObjectRef& node, bool meta, bool try_inline) {
-  bool is_non_relay_func =
-      node->IsInstance<BaseFuncNode>() && !node->IsInstance<relay::FunctionNode>();
+  bool is_non_relay_func = node.defined() && node->IsInstance<BaseFuncNode>() &&
+                           !node->IsInstance<relay::FunctionNode>();
   if (node.as<ExprNode>() && !is_non_relay_func) {
     return PrintExpr(Downcast<Expr>(node), meta, try_inline);
   } else if (node.as<TypeNode>()) {
diff --git a/tests/python/relay/test_ir_text_printer.py b/tests/python/relay/test_ir_text_printer.py
index 61dbca3..2a88c0c 100644
--- a/tests/python/relay/test_ir_text_printer.py
+++ b/tests/python/relay/test_ir_text_printer.py
@@ -240,6 +240,15 @@ def @main[A]() -> fn (A, List[A]) -> List[A] {
     assert main_def_str.strip() in mod_str
 
 
+def test_null_attribute():
+    x = relay.var("x")
+    y = relay.var("y")
+    z = relay.Function([x], y)
+    z = z.with_attr("TestAttribute", None)
+    txt = astext(z)
+    assert "TestAttribute=(nullptr)" in txt
+
+
 if __name__ == "__main__":
     do_print[0] = True
     test_lstm()
@@ -262,3 +271,4 @@ if __name__ == "__main__":
     test_variable_name()
     test_call_node_order()
     test_unapplied_constructor()
+    test_null_attribute()