Skip to content

Commit 927fa89

Browse files
authored
enable weave (#19363) [backport:1.6]
* enable weave * workaround CI
1 parent 851e515 commit 927fa89

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

compiler/cgen.nim

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,13 @@ proc addForwardedProc(m: BModule, prc: PSym) =
4848
m.g.forwardedProcs.add(prc)
4949

5050
proc findPendingModule(m: BModule, s: PSym): BModule =
51-
let ms = s.itemId.module #getModule(s)
52-
result = m.g.modules[ms]
51+
# TODO fixme
52+
if m.config.symbolFiles == v2Sf:
53+
let ms = s.itemId.module #getModule(s)
54+
result = m.g.modules[ms]
55+
else:
56+
var ms = getModule(s)
57+
result = m.g.modules[ms.position]
5358

5459
proc initLoc(result: var TLoc, k: TLocKind, lode: PNode, s: TStorageLoc) =
5560
result.k = k

testament/important_packages.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ pkg "tiny_sqlite"
157157
pkg "unicodedb", "nim c -d:release -r tests/tests.nim"
158158
pkg "unicodeplus", "nim c -d:release -r tests/tests.nim"
159159
pkg "unpack"
160-
pkg "weave", "nimble test_gc_arc", allowFailure = true
160+
pkg "weave", "nimble test_gc_arc"
161161
pkg "websocket", "nim c websocket.nim"
162162
pkg "winim", "nim c winim.nim"
163163
pkg "with"

0 commit comments

Comments
 (0)