Fix two crashes in duplicate decorated functions

mypy/nodes.py

@@ -427,17 +427,24 @@ class OverloadedFuncDef(FuncBase, SymbolNode, Statement):
     """
 
     items = None  # type: List[OverloadPart]
+    unanalyzed_items = None  # type: List[OverloadPart]
     impl = None  # type: Optional[OverloadPart]
 
     def __init__(self, items: List['OverloadPart']) -> None:
         super().__init__()
         assert len(items) > 0
         self.items = items
+        self.unanalyzed_items = items.copy()
         self.impl = None
         self.set_line(items[0].line)
 
     def name(self) -> str:
-        return self.items[0].name()
+        if self.items:
+            return self.items[0].name()
+        else:
+            # This may happen for malformed overload
+            assert self.impl is not None
+            return self.impl.name()
 
     def accept(self, visitor: StatementVisitor[T]) -> T:
         return visitor.visit_overloaded_func_def(self)

mypy/semanal.py

@@ -518,7 +518,7 @@ def _visit_overloaded_func_def(self, defn: OverloadedFuncDef) -> None:
                     # The first item was already visited
                     item.is_overload = True
                     item.accept(self)
-                # TODO support decorated overloaded functions properly
+                # TODO: support decorated overloaded functions properly
                 if isinstance(item, Decorator):
                     callable = function_type(item.func, self.builtin_type('builtins.function'))
                     assert isinstance(callable, CallableType)

mypy/server/aststrip.py

@@ -130,10 +130,8 @@ def visit_decorator(self, node: Decorator) -> None:
     def visit_overloaded_func_def(self, node: OverloadedFuncDef) -> None:
         if not self.recurse_into_functions:
             return
-        if node.impl:
-            # Revert change made during semantic analysis pass 2.
-            assert node.items[-1] is not node.impl
-            node.items.append(node.impl)
+        # Revert change made during semantic analysis pass 2.
+        node.items = node.unanalyzed_items.copy()
         super().visit_overloaded_func_def(node)
 
     @contextlib.contextmanager

test-data/unit/fine-grained.test

@@ -7300,6 +7300,68 @@ def A(x: str) -> str: pass
 ==
 a.py:4: error: Incompatible import of "A" (imported name has type "Callable[[str], str]", local name has type "Type[List[Any]]")
 
+[case testFakeOverloadCrash]
+import b
+[file a.py]
+def dec(fun):
+    pass
+a = 1
+[file a.py.2]
+def dec(fun):
+    pass
+a = 2
+[file b.py]
+from a import dec
+@dec
+def a():
+    pass
+@dec
+def a():
+    pass
+[out]
+b.py:5: error: Name 'a' already defined on line 2
+==
+b.py:5: error: Name 'a' already defined on line 2
+
+[case testFakeOverloadCrash2]
+# this test just should not crash
+import a
+[file a.py]
+T = TypeVar("T")
+
+def foo(func):
+    return func
+
+@foo
+def bar(x: T) -> T:
+    pass
+
+@foo
+def bar(x: T) -> T:
+    pass
+[file a.py.2]
+T = TypeVar("T")
+
+def foo(func):
+    return func
+
+@foo
+def bar(x: T) -> T:
+    pass
+
+@foo
+def bar(x: T) -> T:
+    pass
+x = 1
+[out]
+a.py:1: error: Name 'TypeVar' is not defined
+a.py:10: error: Name 'bar' already defined on line 6
+a.py:11: error: Invalid type "a.T"
+==
+a.py:1: error: Name 'TypeVar' is not defined
+a.py:10: error: Name 'bar' already defined on line 6
+a.py:11: error: Invalid type "a.T"
+
 [case testRefreshForWithTypeComment1]
 [file a.py]
 from typing import List