better original patch + don't constant fold calls in typeof

metagn · Aug 16, 2024 · 399c7fd · 399c7fd
1 parent 6fa0c1c
commit 399c7fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
@@ -971,7 +971,7 @@ proc evalAtCompileTime(c: PContext, n: PNode): PNode =
     if callee.magic notin ctfeWhitelist: return
 
     if callee.kind notin {skProc, skFunc, skConverter, skConst} or
-        hasUnresolvedParams(n[0], {}):
+        callee.isGenericRoutineStrict:
       return
 
     if n.typ != nil and typeAllowed(n.typ, skConst, c) != nil: return
@@ -1119,7 +1119,8 @@ proc afterCallActions(c: PContext; n, orig: PNode, flags: TExprFlags; expectedTy
           not (result.typ.kind == tySequence and result.elementType.kind == tyEmpty):
         liftTypeBoundOps(c, result.typ, n.info)
     #result = patchResolvedTypeBoundOp(c, result)
-  if c.matchedConcept == nil:
+  if c.matchedConcept == nil and efInTypeof notin flags:
+    # don't fold calls in concepts and typeof
     result = evalAtCompileTime(c, result)
 
 proc semIndirectOp(c: PContext, n: PNode, flags: TExprFlags; expectedType: PType = nil): PNode =

diff --git a/tests/vm/tgenericcompiletimeproc.nim b/tests/vm/tgenericcompiletimeproc.nim
@@ -17,3 +17,10 @@ block: # issue #19365
   proc f[T](x: static T): T {.compileTime.} = x + x
   doAssert f(123) == 246
   doAssert f(1.0) == 2.0
+
+block:
+  # don't fold compile time procs in typeof
+  proc fail[T](x: T): T {.compileTime.} =
+    doAssert false
+    x
+  doAssert typeof(fail(123)) is typeof(123)