New semantic analyzer: fix daemon crash and performance regression (#6836)

JukkaL · web-flow · commit 466bff8f2471 · 2019-05-15T12:01:29.000-04:00
Some attribute patches weren't applied after stripping a class. This could result in crashes when stripping, as an expected attribute wasn't included in the symbol table. It also resulted in unnecessary work, as the attributes would be added back by triggering the methods the define the attribute. Fixes #6834.
diff --git a/mypy/server/update.py b/mypy/server/update.py
@@ -950,7 +950,8 @@ def key(node: FineGrainedDeferredNode) -> int:
         if not manager.options.new_semantic_analyzer:
             strip_target(deferred.node)
         else:
-            patches = strip_target_new(deferred.node)
+            new_patches = strip_target_new(deferred.node)
+            patches.extend(new_patches)
     if not options.new_semantic_analyzer:
         re_analyze_nodes(file_node, nodes, manager, options)
     else:
diff --git a/test-data/unit/fine-grained.test b/test-data/unit/fine-grained.test
@@ -8815,3 +8815,33 @@ B().x
 [out]
 ==
 ==
+
+[case testNewSemanticAnalyzerUpdateMethodAndClass]
+# flags: --new-semantic-analyzer
+import m
+
+m.x
+
+class A:
+    def f(self) -> None:
+        self.x = 0
+        m.y
+
+    def g(self) -> None:
+        m.x
+
+[file m.py]
+x = 0
+y = 0
+
+[file m.py.2]
+x = ''
+y = 0
+
+[file m.py.3]
+x = ''
+y = ''
+
+[out]
+==
+==
