From 6238f2ee1e83c83f6e5d3f923c118ddd536ef96d Mon Sep 17 00:00:00 2001 From: narimiran Date: Tue, 13 Apr 2021 09:59:53 +0200 Subject: [PATCH] Revert "fixes #11225; generic sandwich problems; [backport:1.2] (#17255)" This reverts commit d85b7dde7b0aabe64b51baf7e3c23506fa533f8a. --- compiler/ccgexprs.nim | 1 - compiler/cgen.nim | 3 +- compiler/closureiters.nim | 2 +- compiler/injectdestructors.nim | 3 +- compiler/jsgen.nim | 3 +- compiler/lambdalifting.nim | 5 +-- compiler/liftlocals.nim | 2 +- compiler/reorder.nim | 1 - compiler/semdata.nim | 1 - compiler/semexprs.nim | 7 --- compiler/seminst.nim | 13 ------ compiler/semparallel.nim | 3 +- compiler/semstmts.nim | 4 +- compiler/semtempl.nim | 10 ++--- compiler/transf.nim | 2 +- compiler/vmgen.nim | 3 +- doc/manual.rst | 44 ------------------- tests/sandwich/generic_library.nim | 6 --- tests/sandwich/helper_module.nim | 3 -- .../sandwich/module_using_generic_library.nim | 12 ----- tests/sandwich/tmain.nim | 9 ---- 21 files changed, 15 insertions(+), 122 deletions(-) delete mode 100644 tests/sandwich/generic_library.nim delete mode 100644 tests/sandwich/helper_module.nim delete mode 100644 tests/sandwich/module_using_generic_library.nim delete mode 100644 tests/sandwich/tmain.nim diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim index 55a410f268f6..ec018d588d77 100644 --- a/compiler/ccgexprs.nim +++ b/compiler/ccgexprs.nim @@ -2741,7 +2741,6 @@ proc expr(p: BProc, n: PNode, d: var TLoc) = inc p.splitDecls genGotoState(p, n) of nkBreakState: genBreakState(p, n, d) - of nkMixinStmt, nkBindStmt: discard else: internalError(p.config, n.info, "expr(" & $n.kind & "); unknown node kind") proc genNamedConstExpr(p: BProc, n: PNode; isConst: bool): Rope = diff --git a/compiler/cgen.nim b/compiler/cgen.nim index 4d9b662ed998..e046d1298ecf 100644 --- a/compiler/cgen.nim +++ b/compiler/cgen.nim @@ -838,8 +838,7 @@ proc containsResult(n: PNode): bool = for i in 0..