better error message for subtle nil errors

4 files changed, 8 insertions, 3 deletions

diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 92216d278..7e782fc12 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -346,6 +346,8 @@ proc resetLoc(p: BProc, loc: var TLoc) =
     else:
       linefmt(p, cpsStmts, "$1 = 0;$n", rdLoc(loc))
   else:
+    if optNilCheck in p.options:
+      linefmt(p, cpsStmts, "#chckNil((void*)$1);$n", addrLoc(loc))
     if loc.s != OnStack:
       linefmt(p, cpsStmts, "#genericReset((void*)$1, $2);$n",
               addrLoc(loc), genTypeInfo(p.module, loc.t))
diff --git a/compiler/options.nim b/compiler/options.nim
index f67ded163..6d93048fe 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -92,7 +92,7 @@ var
   gOptions*: TOptions = {optObjCheck, optFieldCheck, optRangeCheck, 
                          optBoundsCheck, optOverflowCheck, optAssert, optWarns, 
                          optHints, optStackTrace, optLineTrace,
-                         optPatterns}
+                         optPatterns, optNilCheck}
   gGlobalOptions*: TGlobalOptions = {optThreadAnalysis}
   gExitcode*: int8
   gCmd*: TCommands = cmdNone  # the command
diff --git a/lib/system/excpt.nim b/lib/system/excpt.nim
index faaefe083..bf0fe4b72 100644
--- a/lib/system/excpt.nim
+++ b/lib/system/excpt.nim
@@ -32,7 +32,7 @@ proc registerSignalHandler()
 proc chckIndx(i, a, b: int): int {.inline, compilerproc.}
 proc chckRange(i, a, b: int): int {.inline, compilerproc.}
 proc chckRangeF(x, a, b: float): float {.inline, compilerproc.}
-proc chckNil(p: pointer) {.inline, compilerproc.}
+proc chckNil(p: pointer) {.noinline, compilerproc.}
 
 var
   framePtr {.rtlThreadVar.}: PFrame
@@ -359,7 +359,9 @@ proc chckRangeF(x, a, b: float): float =
     raise newException(EOutOfRange, "value " & $x & " out of range")
 
 proc chckNil(p: pointer) =
-  if p == nil: c_raise(SIGSEGV)
+  if p == nil:
+    raise newException(EInvalidValue, "attempt to write to a nil address")
+    #c_raise(SIGSEGV)
 
 proc chckObj(obj, subclass: PNimType) {.compilerproc.} =
   # checks if obj is of type subclass:
diff --git a/todo.txt b/todo.txt
index 5214245ae..b59f7502e 100644
--- a/todo.txt
+++ b/todo.txt
@@ -9,6 +9,7 @@ version 0.9.4
   - overloading of ``.``? Special case ``.=``?
 - built-in 'getImpl'
 - macros.gensym still missing?
+- optimize 'genericReset'; 'newException' leads to code bloat
 
 
 Bugs