diff options
| author | Araq <rumpf_a@web.de> | 2016-10-24 20:20:20 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2016-10-24 20:20:20 +0200 |
| commit | 0eb70e64c4dfbe48f6fb5d4873d4c02dca65bc4a (patch) | |
| tree | 1b7ffe69eabd3ec37db7c1f011394cd921e7d855 /compiler/ccgutils.nim | |
| parent | 1d191831c0c41536efc1a57be48f38b0746bd40f (diff) | |
| parent | 6fd27a8a0849e2c1150b5f15b7b61d43b63642b2 (diff) | |
| download | Nim-0eb70e64c4dfbe48f6fb5d4873d4c02dca65bc4a.tar.gz | |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
Diffstat (limited to 'compiler/ccgutils.nim')
| -rw-r--r-- | compiler/ccgutils.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/ccgutils.nim b/compiler/ccgutils.nim index 898c00f73..2216cb4fd 100644 --- a/compiler/ccgutils.nim +++ b/compiler/ccgutils.nim @@ -93,7 +93,7 @@ proc getUniqueType*(key: PType): PType = # produced instead of ``NI``. result = key of tyEmpty, tyNil, tyExpr, tyStmt, tyPointer, tyString, - tyCString, tyNone, tyBigNum, tyVoid: + tyCString, tyNone, tyVoid: result = gCanonicalTypes[k] if result == nil: gCanonicalTypes[k] = key @@ -106,7 +106,7 @@ proc getUniqueType*(key: PType): PType = of tyDistinct: if key.deepCopy != nil: result = key else: result = getUniqueType(lastSon(key)) - of tyGenericInst, tyOrdinal, tyMutable, tyConst, tyStatic: + of tyGenericInst, tyOrdinal, tyStatic: result = getUniqueType(lastSon(key)) #let obj = lastSon(key) #if obj.sym != nil and obj.sym.name.s == "TOption": @@ -153,7 +153,7 @@ proc getUniqueType*(key: PType): PType = else: # ugh, we need the canon here: result = slowSearch(key, k) - of tyUnused: internalError("getUniqueType") + of tyUnused, tyUnused0, tyUnused1, tyUnused2: internalError("getUniqueType") proc tableGetType*(tab: TIdTable, key: PType): RootRef = # returns nil if we need to declare this type |