jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop useless suggestion of unsafeAddr (#10598)

Browse source 
Fixes #10594
This commit is contained in:
LemonBoy 2019-02-08 08:59:38 +01:00 • committed by Andreas Rumpf
commit 6b88ce3384
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/semexprs.nim
View file

@ -15,7 +15,7 @@ const
errXExpectsTypeOrValue = "'$1' expects a type or value" errXExpectsTypeOrValue = "'$1' expects a type or value"
errVarForOutParamNeededX = "for a 'var' type a variable needs to be passed; but '$1' is immutable" errVarForOutParamNeededX = "for a 'var' type a variable needs to be passed; but '$1' is immutable"
errXStackEscape = "address of '$1' may not escape its stack frame" errXStackEscape = "address of '$1' may not escape its stack frame"
errExprHasNoAddress = "expression has no address; maybe use 'unsafeAddr'" errExprHasNoAddress = "expression has no address"
errCannotInterpretNodeX = "cannot evaluate '$1'" errCannotInterpretNodeX = "cannot evaluate '$1'"
errNamedExprExpected = "named expression expected" errNamedExprExpected = "named expression expected"
errNamedExprNotAllowed = "named expression not allowed here" errNamedExprNotAllowed = "named expression not allowed here"

5
compiler/semmagic.nim
View file

@ -16,7 +16,12 @@ proc semAddr(c: PContext; n: PNode; isUnsafeAddr=false): PNode =
if x.kind == nkSym: if x.kind == nkSym:
x.sym.flags.incl(sfAddrTaken) x.sym.flags.incl(sfAddrTaken)
if isAssignable(c, x, isUnsafeAddr) notin {arLValue, arLocalLValue}: if isAssignable(c, x, isUnsafeAddr) notin {arLValue, arLocalLValue}:
# Do not suggest the use of unsafeAddr if this expression already is a
# unsafeAddr
if isUnsafeAddr:
localError(c.config, n.info, errExprHasNoAddress) localError(c.config, n.info, errExprHasNoAddress)
else:
localError(c.config, n.info, errExprHasNoAddress & "; maybe use 'unsafeAddr'")
result.add x result.add x
result.typ = makePtrType(c, x.typ) result.typ = makePtrType(c, x.typ)

7
tests/errmsgs/t10594.nim Normal file
View file

@ -0,0 +1,7 @@
discard """
errormsg: "expression has no address"
line: 7
"""
template foo(v: varargs[int]) = unsafeAddr v
foo(1, 2)