diff options
| author | Araq <rumpf_a@web.de> | 2014-03-13 02:52:51 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-03-13 02:52:51 +0100 |
| commit | 1c35fb3c89bbac393b50c4bc6fe8205af2b7fb9d (patch) | |
| tree | 6f72beee37e3873a1434e10e8bb0fd156acdef78 /compiler/ast.nim | |
| parent | 2fc84325c7cfba82c54c652a5f1a795845b169a9 (diff) | |
| parent | d2f130c3fc1ffa786e8d323c3cd3c51fd45124da (diff) | |
| download | Nim-1c35fb3c89bbac393b50c4bc6fe8205af2b7fb9d.tar.gz | |
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel
Diffstat (limited to 'compiler/ast.nim')
| -rw-r--r-- | compiler/ast.nim | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim index f9cab0d88..ee0d55920 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -1291,7 +1291,7 @@ proc skipTypes*(t: PType, kinds: TTypeKinds): PType = proc propagateToOwner*(owner, elem: PType) = const HaveTheirOwnEmpty = {tySequence, tySet} owner.flags = owner.flags + (elem.flags * {tfHasShared, tfHasMeta, - tfHasStatic, tfHasGCedMem}) + tfHasGCedMem}) if tfNotNil in elem.flags: if owner.kind in {tyGenericInst, tyGenericBody, tyGenericInvokation}: owner.flags.incl tfNotNil @@ -1308,9 +1308,6 @@ proc propagateToOwner*(owner, elem: PType) = if elem.kind in tyMetaTypes: owner.flags.incl tfHasMeta - if elem.kind == tyStatic: - owner.flags.incl tfHasStatic - if elem.kind in {tyString, tyRef, tySequence} or elem.kind == tyProc and elem.callConv == ccClosure: owner.flags.incl tfHasGCedMem |