Merge branch 'devel' into feature/3691

2017-02-07 18:34:05 +01:00 · 2017-02-07 18:34:05 +01:00 · d5bb5e832b
commit d5bb5e832b
parent b7d7feffee 7c15120247
84 changed files with 1381 additions and 492 deletions
--- a/compiler/ast.nim
+++ b/compiler/ast.nim
@ -1541,7 +1541,8 @@ proc skipGenericOwner*(s: PSym): PSym =
  ## Generic instantiations are owned by their originating generic
  ## symbol. This proc skips such owners and goes straight to the owner
  ## of the generic itself (the module or the enclosing proc).
-  result = if s.kind in skProcKinds and sfFromGeneric in s.flags:
+  result = if s.kind in skProcKinds and {sfGenSym, sfFromGeneric} * s.flags ==
+                                                  {sfFromGeneric}:
             s.owner.owner
           else:
             s.owner