Specify types directly when creating AST nodes.

Author: Johan Dahlin

mypyc/irbuild/builder.py

@@ -19,8 +19,7 @@
 from mypy.nodes import (
     MypyFile, SymbolNode, Statement, OpExpr, IntExpr, NameExpr, LDEF, Var, UnaryExpr,
     CallExpr, IndexExpr, Expression, MemberExpr, RefExpr, Lvalue, TupleExpr,
-    TypeInfo, Decorator, OverloadedFuncDef, StarExpr, GDEF, ARG_POS, ARG_NAMED,
-    ComparisonExpr
+    TypeInfo, Decorator, OverloadedFuncDef, StarExpr, GDEF, ARG_POS, ARG_NAMED
 )
 from mypy.types import (
     Type, Instance, TupleType, UninhabitedType, get_proper_type
@@ -40,7 +39,7 @@
 from mypyc.ir.rtypes import (
     RType, RTuple, RInstance, int_rprimitive, dict_rprimitive,
     none_rprimitive, is_none_rprimitive, object_rprimitive, is_object_rprimitive,
-    str_rprimitive, bool_rprimitive,
+    str_rprimitive,
 )
 from mypyc.ir.func_ir import FuncIR, INVALID_FUNC_DEF
 from mypyc.ir.class_ir import ClassIR, NonExtClassInfo
@@ -835,8 +834,6 @@ def node_type(self, node: Expression) -> RType:
             # TODO: Don't special case IntExpr
             return int_rprimitive
         if node not in self.types:
-            if isinstance(node, (ComparisonExpr, OpExpr)):
-                return bool_rprimitive
             return object_rprimitive
         mypy_type = self.types[node]
         return self.type_to_rtype(mypy_type)

mypyc/irbuild/expression.py

@@ -4,7 +4,7 @@
 and mypyc.irbuild.builder.
 """
 
-from typing import List, Optional, Union
+from typing import List, Optional, Union, cast
 
 from mypy.nodes import (
     Expression, NameExpr, MemberExpr, SuperExpr, CallExpr, UnaryExpr, OpExpr, IndexExpr,
@@ -13,12 +13,13 @@
     SetComprehension, DictionaryComprehension, SliceExpr, GeneratorExpr, CastExpr, StarExpr,
     Var, RefExpr, MypyFile, TypeInfo, TypeApplication, LDEF, ARG_POS
 )
-from mypy.types import TupleType, get_proper_type
+from mypy.types import TupleType, get_proper_type, Instance
 
 from mypyc.ir.ops import (
     Value, TupleGet, TupleSet, PrimitiveOp, BasicBlock, OpDescription, Assign
 )
-from mypyc.ir.rtypes import RTuple, object_rprimitive, is_none_rprimitive
+from mypyc.ir.rtypes import RTuple, object_rprimitive, is_none_rprimitive, \
+    bool_rprimitive
 from mypyc.ir.func_ir import FUNC_CLASSMETHOD, FUNC_STATICMETHOD
 from mypyc.primitives.registry import name_ref_ops
 from mypyc.primitives.generic_ops import iter_op
@@ -368,10 +369,19 @@ def transform_comparison_expr(builder: IRBuilder, e: ComparisonExpr) -> Value:
                 bin_op = 'and'
                 cmp_op = '!='
             lhs = e.operands[0]
-            exprs = (ComparisonExpr([cmp_op], [lhs, item]) for item in items)
-            or_expr = next(exprs)  # type: Expression
+            mypy_file = builder.graph['builtins'].tree
+            assert mypy_file is not None
+            bool_type = Instance(cast(TypeInfo, mypy_file.names['bool'].node), [])
+            exprs = []
+            for item in items:
+                expr = ComparisonExpr([cmp_op], [lhs, item])
+                builder.types[expr] = bool_type
+                exprs.append(expr)
+
+            or_expr = exprs.pop(0)  # type: Expression
             for expr in exprs:
                 or_expr = OpExpr(bin_op, or_expr, expr)
+                builder.types[or_expr] = bool_type
             return builder.accept(or_expr)
         # x in [y]/(y) -> x == y
         # x not in [y]/(y) -> x != y