From fd09ace55796ae6605f34dafecab24cc0d6ac9fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Derek=20=E5=91=86?=
 <116649+derekdai@users.noreply.github.com>
Date: Sun, 21 Mar 2021 21:29:39 +0800
Subject: [PATCH] prevent bitmasks double included in mmdist if -d:nimArcDebug
 added (#17436)

---
 lib/system/cellsets.nim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/system/cellsets.nim b/lib/system/cellsets.nim
index ea00176b5..779f1a91f 100644
--- a/lib/system/cellsets.nim
+++ b/lib/system/cellsets.nim
@@ -13,7 +13,8 @@ when defined(gcOrc) or defined(gcArc):
   type
     PCell = Cell
 
-  include bitmasks
+  when not declaredInScope(PageShift):
+    include bitmasks
 
 else:
   type