Correct rebase snags

apache · Feb 15, 2019 · 8909e18 · 8909e18
1 parent de7ea6e
commit 8909e18
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/relay/ir/hash.cc b/src/relay/ir/hash.cc
@@ -19,7 +19,6 @@ namespace relay {
 class RelayHashHandler:
     public AttrsHashHandler,
     public TypeFunctor<size_t(const Type&)>,
-    public ExprFunctor<size_t(const Expr&)> {
     public ExprFunctor<size_t(const Expr&)>,
     public PatternFunctor<size_t(const Pattern&)> {
  public:

diff --git a/src/relay/pass/kind_check.cc b/src/relay/pass/kind_check.cc
@@ -90,10 +90,8 @@ struct KindChecker : TypeFunctor<Kind(const Type&)> {
 
   Kind VisitType_(const RefTypeNode* op) override {
     // ref types should only contain normal types
-    Kind k = this->VisitType(op->value);
-    CHECK(k == Kind::kType)
-      << "The value inside a ref must be of the type kind but "
-      << op->value << " of " << GetRef<RefType>(op) << " is of kind " << k;
+    RefType rt = GetRef<RefType>(op);
+    CheckKindMatches(op->value, rt, Kind::kType, "ref contents");
     return Kind::kType;
   }
 

diff --git a/src/relay/pass/type_infer.cc b/src/relay/pass/type_infer.cc
@@ -477,13 +477,13 @@ class TypeInferencer : private ExprFunctor<Type(const Expr&)>,
   }
 
   Type VisitExpr_(const RefReadNode* op) final {
-    Type it = IncompleteTypeNode::make(TypeVarNode::Kind::kType);
+    Type it = IncompleteTypeNode::make(Kind::kType);
     this->Unify(GetType(op->ref), RefTypeNode::make(it), GetRef<RefRead>(op));
     return it;
   }
 
   Type VisitExpr_(const RefWriteNode* op) final {
-    Type it = IncompleteTypeNode::make(TypeVarNode::Kind::kType);
+    Type it = IncompleteTypeNode::make(Kind::kType);
     this->Unify(GetType(op->ref), RefTypeNode::make(it), GetRef<RefWrite>(op));
     this->Unify(GetType(op->value), it, GetRef<RefWrite>(op));
     return TupleTypeNode::make({});