From e46a735bb5a6720851fef4630cea1adeff9ae1fd Mon Sep 17 00:00:00 2001 From: Clay Sweetser Date: Sat, 9 Aug 2014 16:40:35 -0400 Subject: [PATCH 1/2] Fixes #1435 --- compiler/semexprs.nim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index d040675fa1..bf13727e59 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -199,6 +199,8 @@ proc isCastable(dst, src: PType): bool = result = (dstSize >= srcSize) or (skipTypes(dst, abstractInst).kind in IntegralTypes) or (skipTypes(src, abstractInst-{tyTypeDesc}).kind in IntegralTypes) + if result and src.kind == tyNil: + result = dst.size <= platform.ptrSize proc isSymChoice(n: PNode): bool {.inline.} = result = n.kind in nkSymChoices From f8ea5f1a37de1d86e494477a8ac95165a3c81310 Mon Sep 17 00:00:00 2001 From: Clay Sweetser Date: Sat, 9 Aug 2014 16:40:58 -0400 Subject: [PATCH 2/2] Adds documentation on skipTypes and mapType --- compiler/ast.nim | 4 ++++ compiler/ccgtypes.nim | 1 + 2 files changed, 5 insertions(+) diff --git a/compiler/ast.nim b/compiler/ast.nim index 51319127c5..7ad2946957 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -1313,6 +1313,10 @@ proc newSons(father: PNode, length: int) = setLen(father.sons, length) proc skipTypes*(t: PType, kinds: TTypeKinds): PType = + ## Used throughout the compiler code to test whether a type tree contains or + ## doesn't contain a specific type/types - it is often the case that only the + ## last child nodes of a type tree need to be searched. This is a really hot + ## path within the compiler! result = t while result.kind in kinds: result = lastSon(result) diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim index 4c71c6ff79..86142995cc 100644 --- a/compiler/ccgtypes.nim +++ b/compiler/ccgtypes.nim @@ -122,6 +122,7 @@ proc mapSetType(typ: PType): TCTypeKind = else: result = ctArray proc mapType(typ: PType): TCTypeKind = + ## Maps a nimrod type to a C type case typ.kind of tyNone, tyStmt: result = ctVoid of tyBool: result = ctBool