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

more precise borrow checking of 'result' (#15406)

Browse source
This commit is contained in:
Andreas Rumpf 2020-09-24 22:07:23 +02:00 • committed by GitHub
commit e3b5f80a89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/sempass2.nim
View file

@ -1248,7 +1248,7 @@ proc trackProc*(c: PContext; s: PSym, body: PNode) =
if not t.hasSideEffect and t.hasDangerousAssign: if not t.hasSideEffect and t.hasDangerousAssign:
t.hasSideEffect = varpartitions.hasSideEffect(partitions, mutationInfo) t.hasSideEffect = varpartitions.hasSideEffect(partitions, mutationInfo)
if views in c.features: if views in c.features:
checkBorrowedLocations(partitions, g.config) checkBorrowedLocations(partitions, body, g.config)
if sfThread in s.flags and t.gcUnsafe: if sfThread in s.flags and t.gcUnsafe:
if optThreads in g.config.globalOptions and optThreadAnalysis in g.config.globalOptions: if optThreads in g.config.globalOptions and optThreadAnalysis in g.config.globalOptions:

9
compiler/varpartitions.nim
View file

@ -110,6 +110,9 @@ proc registerVariable(c: var Partitions; n: PNode) =
connectedVia: unknownLineInfo, flags: {connectsConstParam}, connectedVia: unknownLineInfo, flags: {connectsConstParam},
maxMutation: -1, minConnection: high(int), maxMutation: -1, minConnection: high(int),
mutations: @[]) mutations: @[])
elif n.sym.kind == skResult:
c.s.add VarIndex(kind: isEmptyRoot, sym: n.sym,
aliveStart: high(int), aliveEnd: c.abstractTime)
else: else:
c.s.add VarIndex(kind: isEmptyRoot, sym: n.sym, c.s.add VarIndex(kind: isEmptyRoot, sym: n.sym,
aliveStart: c.abstractTime, aliveEnd: c.abstractTime) aliveStart: c.abstractTime, aliveEnd: c.abstractTime)
@ -567,6 +570,8 @@ proc computeLiveRanges(c: var Partitions; n: PNode) =
let id = variableId(c, n.sym) let id = variableId(c, n.sym)
if id >= 0: if id >= 0:
c.s[id].aliveEnd = max(c.s[id].aliveEnd, c.abstractTime) c.s[id].aliveEnd = max(c.s[id].aliveEnd, c.abstractTime)
if n.sym.kind == skResult:
c.s[id].aliveStart = min(c.s[id].aliveStart, c.abstractTime)
of nodesToIgnoreSet: of nodesToIgnoreSet:
dec c.abstractTime dec c.abstractTime
@ -621,7 +626,7 @@ proc computeGraphPartitions*(s: PSym; n: PNode; cursorInference = false): Partit
traverse(result, n) traverse(result, n)
proc dangerousMutation(g: MutationInfo; v: VarIndex): bool = proc dangerousMutation(g: MutationInfo; v: VarIndex): bool =
#echo "range ", v.aliveStart, " .. ", v.aliveEnd #echo "range ", v.aliveStart, " .. ", v.aliveEnd, " ", v.sym
if isMutated in g.flags: if isMutated in g.flags:
for m in g.mutations: for m in g.mutations:
#echo "mutation ", m #echo "mutation ", m
@ -643,7 +648,7 @@ proc cannotBorrow(config: ConfigRef; s: PSym; g: MutationInfo) =
m.add " is the statement that connected the mutation to the parameter" m.add " is the statement that connected the mutation to the parameter"
localError(config, s.info, m) localError(config, s.info, m)
proc checkBorrowedLocations*(par: var Partitions; config: ConfigRef) = proc checkBorrowedLocations*(par: var Partitions; body: PNode; config: ConfigRef) =
for i in 0 ..< par.s.len: for i in 0 ..< par.s.len:
let s = par.s[i].sym let s = par.s[i].sym
if s.kind != skParam and isViewType(s.typ): if s.kind != skParam and isViewType(s.typ):