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

borrow checking (#15282)

Browse source 
* refactoring: move procs to typeallowed.nim
* frontend preparations for first class openArray support
* prepare the code generator for first class openArray
* code generation for first class openArray; WIP
* code generation for open arrays, progress
* added isViewType proc
* preparations for borrow checking
* added borrow checking to the front end
This commit is contained in:
Andreas Rumpf 2020-09-09 07:32:03 +02:00 • committed by GitHub
commit 10988d4840
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 554 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

36
compiler/varpartitions.nim
View file

@ -17,6 +17,7 @@ import ast, types, lineinfos, options, msgs, renderer
from trees import getMagic, whichPragma
from wordrecg import wNoSideEffect
from isolation_check import canAlias
from typeallowed import isViewType
type
SubgraphFlag = enum
@ -48,7 +49,7 @@ type
maxMutation, minConnection: int
mutations: seq[int]
Partitions = object
Partitions* = object
abstractTime: int
s: seq[VarIndex]
graphs: seq[MutationInfo]
@ -74,7 +75,7 @@ proc `$`*(config: ConfigRef; g: MutationInfo): string =
result.add config $ g.connectedVia
result.add " is the statement that connected the mutation to the parameter"
proc hasSideEffect(c: var Partitions; info: var MutationInfo): bool =
proc hasSideEffect*(c: var Partitions; info: var MutationInfo): bool =
for g in mitems c.graphs:
if g.flags == {isMutated, connectsConstParam} and mutationAfterConnection(g):
info = g
@ -505,17 +506,16 @@ proc traverse(c: var Partitions; n: PNode) =
else:
for child in n: traverse(c, child)
proc mutatesNonVarParameters*(s: PSym; n: PNode; info: var MutationInfo): bool =
var par = Partitions(performCursorInference: false)
if s.kind != skMacro:
proc computeGraphPartitions*(s: PSym; n: PNode; cursorInference = false): Partitions =
result = Partitions(performCursorInference: cursorInference)
if s.kind notin {skModule, skMacro}:
let params = s.typ.n
for i in 1..<params.len:
registerVariable(par, params[i])
registerVariable(result, params[i])
if resultPos < s.ast.safeLen:
registerVariable(par, s.ast[resultPos])
registerVariable(result, s.ast[resultPos])
traverse(par, n)
result = hasSideEffect(par, info)
traverse(result, n)
proc dangerousMutation(g: MutationInfo; v: VarIndex): bool =
if isMutated in g.flags:
@ -524,16 +524,16 @@ proc dangerousMutation(g: MutationInfo; v: VarIndex): bool =
return true
return false
proc computeCursors*(s: PSym; n: PNode; config: ConfigRef) =
var par = Partitions(performCursorInference: true)
if s.kind notin {skMacro, skModule}:
let params = s.typ.n
for i in 1..<params.len:
registerVariable(par, params[i])
if resultPos < s.ast.safeLen:
registerVariable(par, s.ast[resultPos])
proc checkBorrowedLocations*(par: var Partitions; config: ConfigRef) =
for i in 0 ..< par.s.len:
let s = par.s[i].sym
if s.kind != skParam and isViewType(s.typ):
let rid = root(par, i)
if par.s[rid].kind == isRootOf and dangerousMutation(par.graphs[par.s[rid].graphIndex], par.s[i]):
localError(config, s.info, config $ par.graphs[par.s[rid].graphIndex])
traverse(par, n)
proc computeCursors*(s: PSym; n: PNode; config: ConfigRef) =
var par = computeGraphPartitions(s, n, true)
for i in 0 ..< par.s.len:
let v = addr(par.s[i])
if v.flags == {} and v.sym.kind notin {skParam, skResult} and