diff options
| -rw-r--r-- | compiler/cgen.nim | 2 | ||||
| -rw-r--r-- | compiler/commands.nim | 4 | ||||
| -rw-r--r-- | compiler/options.nim | 6 | ||||
| -rw-r--r-- | compiler/pragmas.nim | 1 | ||||
| -rw-r--r-- | doc/advopt.txt | 1 |
5 files changed, 5 insertions, 9 deletions
diff --git a/compiler/cgen.nim b/compiler/cgen.nim index a8045e054..7fe33fc59 100644 --- a/compiler/cgen.nim +++ b/compiler/cgen.nim @@ -406,8 +406,6 @@ 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(p.config, loc)]) if loc.storage != OnStack and containsGcRef: linefmt(p, cpsStmts, "#genericReset((void*)$1, $2);$n", [addrLoc(p.config, loc), genTypeInfo(p.module, loc.t, loc.lode.info)]) diff --git a/compiler/commands.nim b/compiler/commands.nim index 47dbcfa90..949d6cae1 100644 --- a/compiler/commands.nim +++ b/compiler/commands.nim @@ -297,7 +297,7 @@ proc testCompileOption*(conf: ConfigRef; switch: string, info: TLineInfo): bool result = conf.options * {optNaNCheck, optInfCheck} == {optNaNCheck, optInfCheck} of "infchecks": result = contains(conf.options, optInfCheck) of "nanchecks": result = contains(conf.options, optNaNCheck) - of "nilchecks": result = contains(conf.options, optNilCheck) + of "nilchecks": result = false # not a thing of "objchecks": result = contains(conf.options, optObjCheck) of "fieldchecks": result = contains(conf.options, optFieldCheck) of "rangechecks": result = contains(conf.options, optRangeCheck) @@ -594,7 +594,7 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo; processOnOffSwitch(conf, {optNaNCheck, optInfCheck}, arg, pass, info) of "infchecks": processOnOffSwitch(conf, {optInfCheck}, arg, pass, info) of "nanchecks": processOnOffSwitch(conf, {optNaNCheck}, arg, pass, info) - of "nilchecks": processOnOffSwitch(conf, {optNilCheck}, arg, pass, info) + of "nilchecks": discard "no such thing anymore" of "objchecks": processOnOffSwitch(conf, {optObjCheck}, arg, pass, info) of "fieldchecks": processOnOffSwitch(conf, {optFieldCheck}, arg, pass, info) of "rangechecks": processOnOffSwitch(conf, {optRangeCheck}, arg, pass, info) diff --git a/compiler/options.nim b/compiler/options.nim index b9aca23a1..6105fcdb3 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -25,7 +25,7 @@ type # please make sure we have under 32 options # (improves code efficiency a lot!) TOption* = enum # **keep binary compatible** optNone, optObjCheck, optFieldCheck, optRangeCheck, optBoundsCheck, - optOverflowCheck, optNilCheck, optRefCheck, + optOverflowCheck, optRefCheck, optNaNCheck, optInfCheck, optStaticBoundsCheck, optStyleCheck, optAssert, optLineDir, optWarns, optHints, optOptimizeSpeed, optOptimizeSize, @@ -325,14 +325,14 @@ template depConfigFields*(fn) {.dirty.} = const oldExperimentalFeatures* = {implicitDeref, dotOperators, callOperator, parallel} const - ChecksOptions* = {optObjCheck, optFieldCheck, optRangeCheck, optNilCheck, + ChecksOptions* = {optObjCheck, optFieldCheck, optRangeCheck, optOverflowCheck, optBoundsCheck, optAssert, optNaNCheck, optInfCheck, optStyleCheck} DefaultOptions* = {optObjCheck, optFieldCheck, optRangeCheck, optBoundsCheck, optOverflowCheck, optAssert, optWarns, optRefCheck, optHints, optStackTrace, optLineTrace, # consider adding `optStackTraceMsgs` - optTrMacros, optNilCheck, optStyleCheck, optSinkInference} + optTrMacros, optStyleCheck, optSinkInference} DefaultGlobalOptions* = {optThreadAnalysis, optExcessiveStackTrace, optListFullPaths} diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim index 1a9f5a991..ffe93a9f3 100644 --- a/compiler/pragmas.nim +++ b/compiler/pragmas.nim @@ -361,7 +361,6 @@ proc pragmaToOptions(w: TSpecialWord): TOptions {.inline.} = of wRangeChecks: {optRangeCheck} of wBoundChecks: {optBoundsCheck} of wOverflowChecks: {optOverflowCheck} - of wNilChecks: {optNilCheck} of wFloatChecks: {optNaNCheck, optInfCheck} of wNanChecks: {optNaNCheck} of wInfChecks: {optInfCheck} diff --git a/doc/advopt.txt b/doc/advopt.txt index bc5f9948c..c877b02e9 100644 --- a/doc/advopt.txt +++ b/doc/advopt.txt @@ -24,7 +24,6 @@ Runtime checks (see -x): --floatChecks:on|off turn all floating point (NaN/Inf) checks on|off --nanChecks:on|off turn NaN checks on|off --infChecks:on|off turn Inf checks on|off - --nilChecks:on|off turn nil checks on|off --refChecks:on|off turn ref checks on|off (only for --newruntime) Advanced options: |