summary refs log tree commit diff stats
path: root/compiler
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2014-10-25 22:01:23 +0200
committerAraq <rumpf_a@web.de>2014-10-25 22:01:23 +0200
commita639824e5e3ec2a6eca97f31f55623254144ca81 (patch)
treebbde13d5df6bc705a70d2b704d22eb1e71291ca6 /compiler
parent2dba3acfa94097937ea9c9d664d89a9d610a0131 (diff)
downloadNim-a639824e5e3ec2a6eca97f31f55623254144ca81.tar.gz
introduced 'benign' pragma
Diffstat (limited to 'compiler')
-rw-r--r--compiler/condsyms.nim3
-rw-r--r--compiler/sempass2.nim2
2 files changed, 4 insertions, 1 deletions
diff --git a/compiler/condsyms.nim b/compiler/condsyms.nim
index 8652844f3..9c07972cf 100644
--- a/compiler/condsyms.nim
+++ b/compiler/condsyms.nim
@@ -41,7 +41,7 @@ proc countDefinedSymbols*(): int =
   for key, val in pairs(gSymbols):
     if val == "true": inc(result)
 
-# For ease of bootstrapping, we keep there here and not in the global config
+# For ease of bootstrapping, we keep them here and not in the global config
 # file for now:
 const
   additionalSymbols = """
@@ -88,6 +88,7 @@ proc initDefines*() =
   defineSymbol("nimrequiresnimframe")
   defineSymbol("nimparsebiggestfloatmagic")
   defineSymbol("nimalias")
+  defineSymbol("nimlocks")
   
   # add platform specific symbols:
   for c in low(CPU)..high(CPU):
diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim
index f9c577977..cbabc755b 100644
--- a/compiler/sempass2.nim
+++ b/compiler/sempass2.nim
@@ -458,6 +458,8 @@ proc assumeTheWorst(tracked: PEffects; n: PNode; op: PType) =
   addTag(tracked, createTag(n))
   let lockLevel = if op.lockLevel == UnspecifiedLockLevel: UnknownLockLevel
                   else: op.lockLevel
+  #if lockLevel == UnknownLockLevel:
+  #  message(n.info, warnUser, "had to assume the worst here")
   mergeLockLevels(tracked, n, lockLevel)
 
 proc trackOperand(tracked: PEffects, n: PNode, paramType: PType) =