From b6924383df63c91f0ad6baf63d0b1aa84f9329b7 Mon Sep 17 00:00:00 2001 From: narimiran Date: Fri, 21 Feb 2020 09:46:37 +0100 Subject: [PATCH] Revert "fixes #13378 [backport] (#13392)" This reverts commit 14e1f82f426e6eaf027292ab3fa4472cf0374262. --- compiler/sigmatch.nim | 2 -- tests/generics/tgeneric0.nim | 16 ---------------- 2 files changed, 18 deletions(-) diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim index a15df695c2ed..5fa7c995a472 100644 --- a/compiler/sigmatch.nim +++ b/compiler/sigmatch.nim @@ -1945,8 +1945,6 @@ proc localConvMatch(c: PContext, m: var TCandidate, f, a: PType, if result != nil: if result.typ == nil: return nil - # bug #13378, ensure we produce a real generic instantiation: - result = c.semExpr(c, call) # resulting type must be consistent with the other arguments: var r = typeRel(m, f.sons[0], result.typ) if r < isGeneric: return nil diff --git a/tests/generics/tgeneric0.nim b/tests/generics/tgeneric0.nim index ae4820f5719e..ca012734b9ef 100644 --- a/tests/generics/tgeneric0.nim +++ b/tests/generics/tgeneric0.nim @@ -4,7 +4,6 @@ discard """ 0 float32 float32 -(name: "Resource 1", readers: ..., writers: ...) ''' """ @@ -125,18 +124,3 @@ block tgeneric5: echo T bar(0.0'f32) - -# bug #13378 - -type - Resource = ref object of RootObj - name: string - readers, writers: seq[RenderTask] - - RenderTask = ref object - name: string - -var res = Resource(name: "Resource 1") - -(proc (r: typeof(res)) = - echo r[])(res)