diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-10-02 08:31:38 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-10-02 08:31:38 +0200 |
| commit | e9243a16167b24899d4fcf051f3252b3a5804811 (patch) | |
| tree | dc4733a6f178d4f04ee4da33c50ca807eb7e9dd0 /compiler/sempass2.nim | |
| parent | fc7961d4ccd31ab6e7eabbeb7aa22b5488924b4f (diff) | |
| parent | 02ff5f596c330b68927f843814ecb9b86c2eee67 (diff) | |
| download | Nim-e9243a16167b24899d4fcf051f3252b3a5804811.tar.gz | |
Merge branch 'devel' into araq
Diffstat (limited to 'compiler/sempass2.nim')
| -rw-r--r-- | compiler/sempass2.nim | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim index e24c5fd29..e1a3939fc 100644 --- a/compiler/sempass2.nim +++ b/compiler/sempass2.nim @@ -835,7 +835,7 @@ proc track(tracked: PEffects, n: PNode) = setLen(tracked.locked, oldLocked) tracked.currLockLevel = oldLockLevel of nkTypeSection, nkProcDef, nkConverterDef, nkMethodDef, nkIteratorDef, - nkMacroDef, nkTemplateDef, nkLambda, nkDo: + nkMacroDef, nkTemplateDef, nkLambda, nkDo, nkFuncDef: discard of nkCast, nkHiddenStdConv, nkHiddenSubConv, nkConv: if n.len == 2: track(tracked, n.sons[1]) @@ -937,7 +937,7 @@ proc trackProc*(s: PSym, body: PNode) = track(t, body) if not isEmptyType(s.typ.sons[0]) and {tfNeedsInit, tfNotNil} * s.typ.sons[0].flags != {} and - s.kind in {skProc, skConverter, skMethod}: + s.kind in {skProc, skFunc, skConverter, skMethod}: var res = s.ast.sons[resultPos].sym # get result symbol if res.id notin t.init: message(body.info, warnProveInit, "result") @@ -979,10 +979,10 @@ proc trackProc*(s: PSym, body: PNode) = message(s.info, warnLockLevel, "declared lock level is $1, but real lock level is $2" % [$s.typ.lockLevel, $t.maxLockLevel]) - when useWriteTracking: trackWrites(s, body) + if s.kind == skFunc: trackWrites(s, body) proc trackTopLevelStmt*(module: PSym; n: PNode) = - if n.kind in {nkPragma, nkMacroDef, nkTemplateDef, nkProcDef, + if n.kind in {nkPragma, nkMacroDef, nkTemplateDef, nkProcDef, nkFuncDef, nkTypeSection, nkConverterDef, nkMethodDef, nkIteratorDef}: return var effects = newNode(nkEffectList, n.info) |