better better fix for Issue #629 Recursive generic types not working

1 files changed, 4 insertions, 5 deletions

diff --git a/compiler/types.nim b/compiler/types.nim
index 058eb77ed..4dec9ea2f 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -838,11 +838,10 @@ proc SameTypeAux(x, y: PType, c: var TSameTypeClosure): bool =
   of tyDistinct:
     CycleCheck()
     if c.cmp == dcEq:      
-      result = false      
-      if a.sym != nil and b.sym != nil:
-        if a.sym.name == b.sym.name:
-          result = sameTypeAux(a.sons[0], b.sons[0], c) and sameFlags(a, b)      
-    else:           
+      if sameFlags(a, b):
+        IfFastObjectTypeCheckFailed(a, b):
+          result = sameTypeAux(a.sons[0], b.sons[0], c)     
+    else: 
       result = sameTypeAux(a.sons[0], b.sons[0], c) and sameFlags(a, b)
   of tyEnum, tyForward, tyProxy:
     # XXX generic enums do not make much sense, but require structural checking