From 99a2262d61c20019b2a4ce5321df48a9d5d43864 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Mon, 1 Mar 2021 09:41:29 -0800
Subject: Use scope in router1/2 and placer1.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 common/router1.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'common/router1.cc')

diff --git a/common/router1.cc b/common/router1.cc
index efc06b06..bffbc9f9 100644
--- a/common/router1.cc
+++ b/common/router1.cc
@@ -23,6 +23,7 @@
 
 #include "log.h"
 #include "router1.h"
+#include "scope_lock.h"
 #include "timing.h"
 
 namespace {
@@ -805,7 +806,7 @@ bool router1(Context *ctx, const Router1Cfg &cfg)
     try {
         log_break();
         log_info("Routing..\n");
-        ctx->lock();
+        nextpnr::ScopeLock<Context> lock(ctx);
         auto rstart = std::chrono::high_resolution_clock::now();
 
         log_info("Setting up routing queue.\n");
@@ -854,7 +855,6 @@ bool router1(Context *ctx, const Router1Cfg &cfg)
                 router.check();
                 ctx->check();
 #endif
-                ctx->unlock();
                 return false;
             }
         }
@@ -878,13 +878,13 @@ bool router1(Context *ctx, const Router1Cfg &cfg)
         timing_analysis(ctx, true /* slack_histogram */, true /* print_fmax */, true /* print_path */,
                         true /* warn_on_failure */);
 
-        ctx->unlock();
         return true;
     } catch (log_execution_error_exception) {
 #ifndef NDEBUG
+        ctx->lock();
         ctx->check();
-#endif
         ctx->unlock();
+#endif
         return false;
     }
 }
-- 
cgit v1.2.3