diff options
| -rwxr-xr-x | compiler/ast.nim | 9 | ||||
| -rwxr-xr-x | compiler/semtypinst.nim | 1 | ||||
| -rwxr-xr-x | lib/system/gc.nim | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim index 419c1f2d8..8763e750e 100755 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -603,11 +603,18 @@ type PLib* = ref TLib TSym* = object of TIdObj + # proc and type instantiations are cached in the generic symbol case kind*: TSymKind - of skType: # generic instantiation caches + of skType: typeInstCache*: seq[PType] of routineKinds: procInstCache*: seq[PInstantiation] + of skModule: + # modules keep track of the generic symbols they use from other modules. + # this is because in incremental compilation, when a module is about to + # be replaced with a newer version, we must decrement the usage count + # of all previously used generics. + usedGenerics*: seq[PInstantiation] else: nil magic*: TMagic diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim index 82ebc4b5f..03b6e3961 100755 --- a/compiler/semtypinst.nim +++ b/compiler/semtypinst.nim @@ -41,7 +41,6 @@ proc searchInstTypes(key: PType): PType = return for inst in genericTyp.sym.typeInstCache: - InternalAssert inst.sons.len == key.sons.len + 1 if inst.id == key.id: return inst block MatchType: for j in 1 .. high(key.sons): diff --git a/lib/system/gc.nim b/lib/system/gc.nim index a5cd9a2b0..028d2cc24 100755 --- a/lib/system/gc.nim +++ b/lib/system/gc.nim @@ -31,8 +31,6 @@ when withRealTime and not defined(getTicks): when defined(memProfiler): proc nimProfile(requestedSize: int) -include "system/timers" - const rcShift = 6 # the reference count is shifted so we can use # the least significat bits for additinal flags: |