From 927fa890ec91cf13d7e3aa87267b994c2812bdc8 Mon Sep 17 00:00:00 2001
From: flywind <xzsflywind@gmail.com>
Date: Thu, 20 Jan 2022 20:59:36 +0800
Subject: [PATCH] enable weave (#19363) [backport:1.6]

* enable weave
* workaround CI
---
 compiler/cgen.nim                | 9 +++++++--
 testament/important_packages.nim | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 032c22ec06..246b8c0e9e 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -48,8 +48,13 @@ proc addForwardedProc(m: BModule, prc: PSym) =
   m.g.forwardedProcs.add(prc)
 
 proc findPendingModule(m: BModule, s: PSym): BModule =
-  let ms = s.itemId.module  #getModule(s)
-  result = m.g.modules[ms]
+  # TODO fixme
+  if m.config.symbolFiles == v2Sf:
+    let ms = s.itemId.module  #getModule(s)
+    result = m.g.modules[ms]
+  else:
+    var ms = getModule(s)
+    result = m.g.modules[ms.position]
 
 proc initLoc(result: var TLoc, k: TLocKind, lode: PNode, s: TStorageLoc) =
   result.k = k
diff --git a/testament/important_packages.nim b/testament/important_packages.nim
index 853a586982..5f6e19b523 100644
--- a/testament/important_packages.nim
+++ b/testament/important_packages.nim
@@ -157,7 +157,7 @@ pkg "tiny_sqlite"
 pkg "unicodedb", "nim c -d:release -r tests/tests.nim"
 pkg "unicodeplus", "nim c -d:release -r tests/tests.nim"
 pkg "unpack"
-pkg "weave", "nimble test_gc_arc", allowFailure = true
+pkg "weave", "nimble test_gc_arc"
 pkg "websocket", "nim c websocket.nim"
 pkg "winim", "nim c winim.nim"
 pkg "with"