Use scope in router1/2 and placer1.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/common/router2.cc b/common/router2.cc
index abe5f302..1b7a6fed 100644
--- a/common/router2.cc
+++ b/common/router2.cc
@@ -36,6 +36,7 @@
 #include "log.h"
 #include "nextpnr.h"
 #include "router1.h"
+#include "scope_lock.h"
 #include "timing.h"
 #include "util.h"
 
@@ -1161,6 +1162,8 @@ struct Router2
         ThreadContext st;
         int iter = 1;
 
+        nextpnr::ScopeLock<Context> lock(ctx);
+
         for (size_t i = 0; i < nets_by_udata.size(); i++)
             route_queue.push_back(i);
 
@@ -1237,6 +1240,8 @@ struct Router2
 
         log_info("Running router1 to check that route is legal...\n");
 
+        lock.unlock_early();
+
         router1(ctx, Router1Cfg(ctx));
     }
 };