the protocol-tree-walk to determine friends was broken

ipc/ipdl/ipdl/lower.py

@@ -1958,34 +1958,28 @@ class _FindFriends(ipdl.ast.Visitor):
         self.mytype = None              # ProtocolType
         self.vtype = None               # ProtocolType
         self.friends = set()            # set<ProtocolType>
-        self.visited = set()            # set<ProtocolType>
 
     def findFriends(self, ptype):
         self.mytype = ptype
-        self.walkUpTheProtocolTree(ptype)
+        toplevel = self.findToplevel(ptype)
-        self.walkDownTheProtocolTree(ptype)
+        self.walkDownTheProtocolTree(toplevel)
         return self.friends
 
     # TODO could make this into a _iterProtocolTreeHelper ...
-    def walkUpTheProtocolTree(self, ptype):
+    def findToplevel(self, ptype):
-        if not ptype.isManaged():
+        if ptype.isToplevel():
-            return
+            return ptype
-        mtype = ptype.manager
+        return self.findToplevel(ptype.manager)
-        self.visit(mtype)
-        self.walkUpTheProtocolTree(mtype)
 
     def walkDownTheProtocolTree(self, ptype):
-        if not ptype.isManager():
+        if ptype != self.mytype:
-            return
+            # don't want to |friend| ourself!
+            self.visit(ptype)
         for mtype in ptype.manages:
-            self.visit(mtype)
             self.walkDownTheProtocolTree(mtype)
 
     def visit(self, ptype):
-        if ptype in self.visited:
+        # |vtype| is the type currently being visited
-            return
-        self.visited.add(ptype)
-
         savedptype = self.vtype
         self.vtype = ptype
         ptype._p.accept(self)