From 26ed4e5413e5f2cc131f4fcb087c39e7a862e5d4 Mon Sep 17 00:00:00 2001
From: Jason Beetham <beefers331@gmail.com>
Date: Wed, 22 Dec 2021 23:12:56 -0700
Subject: [PATCH] Fixed object field access of static objects in generics
 (#19283) [backport]

(cherry picked from commit fa96e56ad06f0562b5d608cc896a9b17c9512958)
---
 compiler/semexprs.nim    | 2 +-
 tests/system/tstatic.nim | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index c11cecfa99..c60471ceb3 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -1414,7 +1414,7 @@ proc builtinFieldAccess(c: PContext, n: PNode, flags: TExprFlags): PNode =
 
   if ty.kind in tyUserTypeClasses and ty.isResolvedUserTypeClass:
     ty = ty.lastSon
-  ty = skipTypes(ty, {tyGenericInst, tyVar, tyLent, tyPtr, tyRef, tyOwned, tyAlias, tySink})
+  ty = skipTypes(ty, {tyGenericInst, tyVar, tyLent, tyPtr, tyRef, tyOwned, tyAlias, tySink, tyStatic})
   while tfBorrowDot in ty.flags: ty = ty.skipTypes({tyDistinct, tyGenericInst, tyAlias})
   var check: PNode = nil
   if ty.kind == tyObject:
diff --git a/tests/system/tstatic.nim b/tests/system/tstatic.nim
index 1f1b9dbe36..6e2893e2bf 100644
--- a/tests/system/tstatic.nim
+++ b/tests/system/tstatic.nim
@@ -44,6 +44,14 @@ template main() =
       proc parseInt(f: static[bool]): int {.used.} = discard
 
       doAssert "123".parseInt == 123
+  block:
+    type
+      MyType = object
+        field: float32
+      AType[T: static MyType] = distinct range[0f32 .. T.field]
+    var a: AType[MyType(field: 5f32)]
+    proc n(S: static Slice[int]): range[S.a..S.b] = discard
+    assert typeof(n 1..2) is range[1..2]
 
 
 static: main()