fixes #5050; fixes #11826 (#12606) [backport]

2019-11-07 13:47:26 +00:00 · 2019-11-07 13:47:26 +00:00 · e1b1759439
commit e1b1759439
parent 94675c2378
5 changed files with 47 additions and 14 deletions
--- a/compiler/importer.nim
+++ b/compiler/importer.nim
@ -153,7 +153,11 @@ proc myImportModule(c: PContext, n: PNode; importStmtResult: PNode): PSym =
        err.add toFullPath(c.config, c.graph.importStack[i]) & " imports " &
                toFullPath(c.config, c.graph.importStack[i+1])
      c.recursiveDep = err
+
+    discard pushOptionEntry(c)
    result = importModuleAs(c, n, c.graph.importModuleCallback(c.graph, c.module, f))
+    popOptionEntry(c)
+
    #echo "set back to ", L
    c.graph.importStack.setLen(L)
    # we cannot perform this check reliably because of