From 9526009e0eb89b3ce2b881cb35384f9b3ef1e02c Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Sun, 16 Dec 2018 20:34:07 +0100
Subject: [PATCH] fixes #9120

---
 compiler/cmdlinehelper.nim | 10 ----------
 lib/pure/parseopt.nim      |  2 +-
 lib/system.nim             |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/compiler/cmdlinehelper.nim b/compiler/cmdlinehelper.nim
index a15d622a02..e1824316a3 100644
--- a/compiler/cmdlinehelper.nim
+++ b/compiler/cmdlinehelper.nim
@@ -48,16 +48,6 @@ proc loadConfigsAndRunMainCommand*(self: NimProg, cache: IdentCache; conf: Confi
   if self.suggestMode:
     conf.command = "nimsuggest"
 
-  when false:
-    # These defines/options should not be enabled while processing nimscript
-    # bug #9420
-    undefSymbol(conf.symbols, "profiler")
-    undefSymbol(conf.symbols, "memProfiler")
-    undefSymbol(conf.symbols, "nodejs")
-
-    # bug #9120
-    conf.globalOptions.excl(optTaintMode)
-
   template runNimScriptIfExists(path: AbsoluteFile) =
     let p = path # eval once
     if fileExists(p):
diff --git a/lib/pure/parseopt.nim b/lib/pure/parseopt.nim
index 8071fac936..eba915604e 100644
--- a/lib/pure/parseopt.nim
+++ b/lib/pure/parseopt.nim
@@ -237,7 +237,7 @@ when declared(os.paramCount):
   proc remainingArgs*(p: OptParser): seq[TaintedString] {.rtl, extern: "npo$1".} =
     ## retrieves the rest of the command line that has not been parsed yet.
     result = @[]
-    for i in p.idx..<p.cmds.len: result.add p.cmds[i]
+    for i in p.idx..<p.cmds.len: result.add TaintedString(p.cmds[i])
 
 iterator getopt*(p: var OptParser): tuple[kind: CmdLineKind, key, val: TaintedString] =
   ## This is an convenience iterator for iterating over the given OptParser object.
diff --git a/lib/system.nim b/lib/system.nim
index 2497d39a61..32a24323ea 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -3147,7 +3147,7 @@ when not defined(JS): #and not defined(nimscript):
         result = x.len - y.len
 
   when defined(nimscript):
-    proc readFile*(filename: string): string {.tags: [ReadIOEffect], benign.}
+    proc readFile*(filename: string): TaintedString {.tags: [ReadIOEffect], benign.}
       ## Opens a file named `filename` for reading, calls `readAll
       ## <#readAll>`_ and closes the file afterwards. Returns the string.
       ## Raises an IO exception in case of an error. If # you need to call