Skip to content

Commit f2e6cea

Browse files
committed
disable internalError so that nimbuild compiles again
1 parent ca557d9 commit f2e6cea

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

compiler/lambdalifting.nim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,8 @@ proc transformOuterProc(o: POuterContext, n: PNode): PNode =
655655
# consider: [i1, i2, i1] Since we merged the iterator's closure
656656
# with the captured owning variables, we need to generate the
657657
# closure generation code again:
658+
#if local == o.fn: message(n.info, errRecursiveDependencyX, local.name.s)
659+
# XXX why doesn't this work?
658660
let createdVar = generateIterClosureCreation(o, closure,
659661
closure.attachedNode)
660662
return makeClosure(local, createdVar, n.info)

compiler/semdestruct.nim

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,10 @@ proc generateDestructor(c: PContext, t: PType): PNode =
116116
let stmt = destroyField(c, t.n.sons[s].sym, destructedObj)
117117
if stmt != nil: addLine(stmt)
118118
else:
119-
internalAssert false
119+
# XXX just skip it for now so that the compiler doesn't crash, but
120+
# please zahary fix it! arbitrary nesting of nkRecList/nkRecCase is
121+
# possible. Any thread example seems to trigger this.
122+
discard
120123
# base classes' destructors will be automatically called by
121124
# semProcAux for both auto-generated and user-defined destructors
122125

lib/system.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ iterator `||`*[S, T](a: S, b: T, annotation=""): T {.
13301330
## such isn't aware of the parallelism in your code! Be careful! Later
13311331
## versions of ``||`` will get proper support by Nimrod's code generator
13321332
## and GC.
1333-
nil
1333+
discard
13341334

13351335
{.push stackTrace:off.}
13361336
proc min*(x, y: int): int {.magic: "MinI", noSideEffect.} =

0 commit comments

Comments
 (0)