jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #8991, fixes #4446

Browse source
This commit is contained in:
Araq 2018-12-16 19:22:49 +01:00
commit d66eb04ce9
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/cmdlinehelper.nim
View file

@ -50,7 +50,7 @@ proc loadConfigsAndRunMainCommand*(self: NimProg, cache: IdentCache; conf: Confi
when false: when false:
# These defines/options should not be enabled while processing nimscript # These defines/options should not be enabled while processing nimscript
# bug #4446, #9420, #8991, #9589, #9153 # bug #4446, #9420, #8991
undefSymbol(conf.symbols, "profiler") undefSymbol(conf.symbols, "profiler")
undefSymbol(conf.symbols, "memProfiler") undefSymbol(conf.symbols, "memProfiler")
undefSymbol(conf.symbols, "nodejs") undefSymbol(conf.symbols, "nodejs")

4
lib/system.nim
View file

@ -1539,7 +1539,7 @@ else:
## ``string`` if the taint mode is not ## ``string`` if the taint mode is not
## turned on. ## turned on.
when defined(profiler): when defined(profiler) and not defined(nimscript):
proc nimProfile() {.compilerProc, noinline.} proc nimProfile() {.compilerProc, noinline.}
when hasThreadSupport: when hasThreadSupport:
{.pragma: rtlThreadVar, threadvar.} {.pragma: rtlThreadVar, threadvar.}
@ -3569,7 +3569,7 @@ when not defined(JS): #and not defined(nimscript):
when defined(endb) and not defined(nimscript): when defined(endb) and not defined(nimscript):
include "system/debugger" include "system/debugger"
when defined(profiler) or defined(memProfiler): when (defined(profiler) or defined(memProfiler)) and not defined(nimscript):
include "system/profiler" include "system/profiler"
{.pop.} # stacktrace {.pop.} # stacktrace