diff options
| author | Araq <rumpf_a@web.de> | 2018-11-19 18:51:47 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-11-19 18:51:47 +0100 |
| commit | e8bec614131957e7bd8b9f377ba4a08aa762309c (patch) | |
| tree | c4264849a2f13c463d0620917a58590ff7c7435e | |
| parent | 6acffcd28f3217cc2b146154358f6a5550423ed1 (diff) | |
| download | Nim-e8bec614131957e7bd8b9f377ba4a08aa762309c.tar.gz | |
incremental compilation: bugfixes
| -rw-r--r-- | compiler/options.nim | 3 | ||||
| -rw-r--r-- | compiler/rodimpl.nim | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/options.nim b/compiler/options.nim index 4e8ae9d1f..80d665d62 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -402,7 +402,8 @@ proc importantComments*(conf: ConfigRef): bool {.inline.} = conf.cmd in {cmdDoc, proc usesWriteBarrier*(conf: ConfigRef): bool {.inline.} = conf.selectedGC >= gcRefc template compilationCachePresent*(conf: ConfigRef): untyped = - conf.symbolFiles in {v2Sf, writeOnlySf} + false +# conf.symbolFiles in {v2Sf, writeOnlySf} template optPreserveOrigSource*(conf: ConfigRef): untyped = optEmbedOrigSrc in conf.globalOptions diff --git a/compiler/rodimpl.nim b/compiler/rodimpl.nim index 859d98095..794c78b8d 100644 --- a/compiler/rodimpl.nim +++ b/compiler/rodimpl.nim @@ -768,7 +768,8 @@ proc loadModuleSymTab(g; module: PSym) = b.s.add '\0' s = loadSymFromBlob(g, b, module.info) assert s != nil - strTableAdd(module.tab, s) + if s.kind != skField: + strTableAdd(module.tab, s) if sfSystemModule in module.flags: g.systemModule = module |