Don't do a py_getattr when calling a non-method attr (mypyc/mypyc#685)

msullivan · web-flow · commit 4182d111a868 · 2019-08-18T14:05:18.000-07:00
diff --git a/mypyc/genops.py b/mypyc/genops.py
@@ -1100,7 +1100,6 @@ def handle_ext_method(self, cdef: ClassDef, fdef: FuncDef) -> None:
 
             # Set the callable object representing the decorated method as an attribute of the
             # extension class.
-            class_ir.attributes[name] = decorated_func.type
             self.primitive_op(py_setattr_op,
                               [typ, self.load_static_unicode(name), decorated_func], fdef.line)
 
@@ -3213,6 +3212,11 @@ def gen_method_call(self,
                 arg_values = self.native_args_to_positional(
                     arg_values, arg_kinds, arg_names, decl.bound_sig, line)
                 return self.add(MethodCall(base, name, arg_values, line))
+            elif base.type.class_ir.has_attr(name):
+                function = self.add(GetAttr(base, name, line))
+                return self.py_call(function, arg_values, line,
+                                    arg_kinds=arg_kinds, arg_names=arg_names)
+
         elif isinstance(base.type, RUnion):
             return self.union_method_call(base, base.type, name, arg_values, return_rtype, line,
                                           arg_kinds, arg_names)
diff --git a/test-data/genops-basic.test b/test-data/genops-basic.test
@@ -2136,16 +2136,15 @@ def DerivedProperty.next(self):
     self :: DerivedProperty
     r0 :: object
     r1 :: int
-    r2 :: str
-    r3, r4 :: object
+    r2, r3, r4 :: object
     r5 :: int
     r6 :: DerivedProperty
 L0:
     r0 = self._incr_func
     r1 = self.value
-    r2 = unicode_6 :: static  ('_incr_func')
+    r2 = self._incr_func
     r3 = box(int, r1)
-    r4 = py_method_call(self, r2, r3)
+    r4 = py_call(r2, r3)
     r5 = unbox(int, r4)
     r6 = DerivedProperty(r0, r5)
     return r6
@@ -2170,23 +2169,21 @@ def AgainProperty.next(self):
     self :: AgainProperty
     r0 :: object
     r1 :: int
-    r2 :: str
-    r3, r4 :: object
+    r2, r3, r4 :: object
     r5 :: int
-    r6 :: str
-    r7, r8 :: object
+    r6, r7, r8 :: object
     r9 :: int
     r10 :: AgainProperty
 L0:
     r0 = self._incr_func
     r1 = self.value
-    r2 = unicode_6 :: static  ('_incr_func')
+    r2 = self._incr_func
     r3 = box(int, r1)
-    r4 = py_method_call(self, r2, r3)
+    r4 = py_call(r2, r3)
     r5 = unbox(int, r4)
-    r6 = unicode_6 :: static  ('_incr_func')
+    r6 = self._incr_func
     r7 = box(int, r5)
-    r8 = py_method_call(self, r6, r7)
+    r8 = py_call(r6, r7)
     r9 = unbox(int, r8)
     r10 = AgainProperty(r0, r9)
     return r10
