disallow static in return type (#9686) [nobackport]

2 files changed, 6 insertions, 1 deletions

diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index 3bc2f4ede..a2425e9fa 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -1230,6 +1230,9 @@ proc semProcTypeNode(c: PContext, n, genericParams: PNode,
         # 'p(): auto' and 'p(): expr' are equivalent, but the rest of the
         # compiler is hardly aware of 'auto':
         r = newTypeS(tyUntyped, c)
+      elif r.kind == tyStatic:
+        # type allowed should forbid this type
+        discard
       else:
         if r.sym == nil or sfAnon notin r.sym.flags:
           let lifted = liftParamType(c, kind, genericParams, r, "result",
diff --git a/compiler/types.nim b/compiler/types.nim
index e41f45780..20f0d516e 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -1238,7 +1238,9 @@ proc typeAllowedAux(marker: var IntSet, typ: PType, kind: TSymKind,
   of tyTypeDesc:
     # XXX: This is still a horrible idea...
     result = nil
-  of tyUntyped, tyTyped, tyStatic:
+  of tyStatic:
+    if kind notin {skParam}: result = t
+  of tyUntyped, tyTyped:
     if kind notin {skParam, skResult}: result = t
   of tyVoid:
     if taField notin flags: result = t