summary refs log tree commit diff stats
path: root/compiler/ast.nim
diff options
context:
space:
mode:
authorOscar Campbell <oscar@campbell.nu>2015-06-07 13:17:06 +0200
committerOscar Campbell <oscar@campbell.nu>2015-06-07 13:17:06 +0200
commitf0b6c03b2686aca85670cd35f84c6b0bdc3ff23d (patch)
treed0b0357ac4398d68f1067f33b9dac03fe7b308d2 /compiler/ast.nim
parent0a810fd10f81e11e6b738a18ff18e62c89479436 (diff)
parent858cdd0b05df4846fb40a3263f05e54438995e99 (diff)
downloadNim-f0b6c03b2686aca85670cd35f84c6b0bdc3ff23d.tar.gz
Merge branch 'devel' into bugfix-2858-testament-sources-system-wide
Diffstat (limited to 'compiler/ast.nim')
-rw-r--r--compiler/ast.nim3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim
index 044f21341..c141352cb 100644
--- a/compiler/ast.nim
+++ b/compiler/ast.nim
@@ -423,6 +423,7 @@ type
                 # but unfortunately it has measurable impact for compilation
                 # efficiency
     nfTransf,   # node has been transformed
+    nfNoRewrite # node should not be transformed anymore
     nfSem       # node has been checked for semantics
     nfLL        # node has gone through lambda lifting
     nfDotField  # the call can use a dot operator
@@ -1345,7 +1346,7 @@ proc propagateToOwner*(owner, elem: PType) =
       owner.flags.incl tfHasAsgn
 
   if owner.kind notin {tyProc, tyGenericInst, tyGenericBody,
-                       tyGenericInvocation}:
+                       tyGenericInvocation, tyPtr}:
     let elemB = elem.skipTypes({tyGenericInst})
     if elemB.isGCedMem or tfHasGCedMem in elemB.flags:
       # for simplicity, we propagate this flag even to generics. We then