try fix weave, t14509, adapt nim-lang#23438 for union, tmacrogenerics

metagn · Aug 20, 2024 · 568bcb4 · 568bcb4
1 parent 72a679c
commit 568bcb4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/compiler/semcall.nim b/compiler/semcall.nim
@@ -751,7 +751,7 @@ proc semOverloadedCall(c: PContext, n, nOrig: PNode,
               candidates)
     result = semResolvedCall(c, r, n, flags, expectedType)
   else:
-    if efDetermineType in flags and c.inGenericContext > 0 and c.matchedConcept == nil:
+    if c.inGenericContext > 0 and c.matchedConcept == nil:
       result = semGenericStmt(c, n)
       result.typ = makeTypeFromExpr(c, result.copyTree)
     elif efExplain notin flags:

diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
@@ -1028,7 +1028,7 @@ proc semOverloadedCallAnalyseEffects(c: PContext, n: PNode, nOrig: PNode,
 
   if result != nil:
     if result[0].kind != nkSym:
-      if not (efDetermineType in flags and c.inGenericContext > 0):
+      if not (c.inGenericContext > 0): # see generic context check in semOverloadedCall
         internalError(c.config, "semOverloadedCallAnalyseEffects")
       return
     let callee = result[0].sym

diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
@@ -1684,6 +1684,8 @@ proc semTypeExpr(c: PContext, n: PNode; prev: PType): PType =
         # unnecessary new type creation
         let alias = maybeAliasType(c, result, prev)
         if alias != nil: result = alias
+  elif n.typ.kind == tyFromExpr and c.inGenericContext > 0:
+    result = n.typ
   else:
     localError(c.config, n.info, "expected type, but got: " & n.renderTree)
     result = errorType(c)

diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
@@ -1914,7 +1914,8 @@ proc typeRel(c: var TCandidate, f, aOrig: PType,
       # when `f` is an unresolved typedesc, `a` could be any
       # type, so we should not perform this check earlier
       if c.c.inGenericContext > 0 and
-          a.skipTypes({tyTypeDesc}).kind == tyGenericParam:
+          a.skipTypes({tyTypeDesc}).kind == tyGenericParam and
+          not (c.calleeSym != nil and c.calleeSym.kind in {skMacro, skTemplate}):
         # generic type bodies can sometimes compile call expressions
         # prevent unresolved generic parameters from being passed to procs as
         # typedesc parameters