Ensure ClassElementImplementation removed from ThreadLocal set to prevent memory leak

compiler/java/com/google/dart/compiler/resolver/ClassElementImplementation.java

Index: compiler/java/com/google/dart/compiler/resolver/ClassElementImplementation.java
===================================================================
--- compiler/java/com/google/dart/compiler/resolver/ClassElementImplementation.java	(revision 1240)
+++ compiler/java/com/google/dart/compiler/resolver/ClassElementImplementation.java	(working copy)
@@ -319,35 +319,38 @@
       throw new CyclicDeclarationException(this);
     }
     ArrayList<InterfaceType> supertypes = new ArrayList<InterfaceType>();
-    for (InterfaceType intf : getInterfaces()) {
-      addCheckDuplicated(interfaces, supertypes, intf);
-    }
-    for (InterfaceType intf : getInterfaces()) {
-      for (InterfaceType t : intf.getElement().getAllSupertypes()) {
-        if (!t.getElement().isObject()) {
-          addCheckDuplicated(interfaces, supertypes,
-                             t.subst(intf.getArguments(),
-                                     intf.getElement().getTypeParameters()));
-        }
+    try {
+      for (InterfaceType intf : getInterfaces()) {
+        addCheckDuplicated(interfaces, supertypes, intf);
       }
-    }
-    if (supertype != null) {
-      for (InterfaceType t : supertype.getElement().getAllSupertypes()) {
-        if (t.getElement().isInterface()) {
-          addCheckDuplicated(interfaces, supertypes,
-                             t.subst(supertype.getArguments(),
-                                     supertype.getElement().getTypeParameters()));
+      for (InterfaceType intf : getInterfaces()) {
+        for (InterfaceType t : intf.getElement().getAllSupertypes()) {
+          if (!t.getElement().isObject()) {
+            addCheckDuplicated(interfaces, supertypes,
+                               t.subst(intf.getArguments(),
+                                       intf.getElement().getTypeParameters()));
+          }
         }
       }
-      supertypes.add(supertype);
-      for (InterfaceType t : supertype.getElement().getAllSupertypes()) {
-        if (!t.getElement().isInterface()) {
-          supertypes.add(t.subst(supertype.getArguments(),
-                                 supertype.getElement().getTypeParameters()));
+      if (supertype != null) {
+        for (InterfaceType t : supertype.getElement().getAllSupertypes()) {
+          if (t.getElement().isInterface()) {
+            addCheckDuplicated(interfaces, supertypes,
+                               t.subst(supertype.getArguments(),
+                                       supertype.getElement().getTypeParameters()));
+          }
         }
+        supertypes.add(supertype);
+        for (InterfaceType t : supertype.getElement().getAllSupertypes()) {
+          if (!t.getElement().isInterface()) {
+            supertypes.add(t.subst(supertype.getArguments(),
+                                   supertype.getElement().getTypeParameters()));
+          }
+        }
       }
+    } finally {

[danrubel, 2011/11/07 11:13:07]

Added try/finally to ensure "this" was removed from set

+      seenSupertypes.get().remove(this);
     }
-    seenSupertypes.get().remove(this);
     return supertypes;
   }