summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--compiler/semdata.nim2
-rw-r--r--compiler/semstmts.nim2
-rw-r--r--lib/system/alloc.nim2
3 files changed, 1 insertions, 5 deletions
diff --git a/compiler/semdata.nim b/compiler/semdata.nim
index 082a4813e..d26e57320 100644
--- a/compiler/semdata.nim
+++ b/compiler/semdata.nim
@@ -36,8 +36,6 @@ type
     selfSym*: PSym            # the 'self' symbol (if available)
     nestedLoopCounter*: int   # whether we are in a loop or not
     nestedBlockCounter*: int  # whether we are in a block or not
-    inTryStmt*: int           # whether we are in a try statement; works also
-                              # in standalone ``except`` and ``finally``
     next*: PProcCon           # used for stacking procedure contexts
     mappingExists*: bool
     mapping*: TIdTable
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index d56c1c1bd..b4630294b 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -198,7 +198,6 @@ proc semTry(c: PContext, n: PNode; flags: TExprFlags): PNode =
     isImported
 
   result = n
-  inc c.p.inTryStmt
   checkMinSonsLen(n, 2, c.config)
 
   var typ = commonTypeBegin
@@ -265,7 +264,6 @@ proc semTry(c: PContext, n: PNode; flags: TExprFlags): PNode =
     else: dec last
     closeScope(c)
 
-  dec c.p.inTryStmt
   if isEmptyType(typ) or typ.kind in {tyNil, tyUntyped}:
     discardCheck(c, n[0], flags)
     for i in 1..<n.len: discardCheck(c, n[i].lastSon, flags)
diff --git a/lib/system/alloc.nim b/lib/system/alloc.nim
index 76c744f59..c598b8250 100644
--- a/lib/system/alloc.nim
+++ b/lib/system/alloc.nim
@@ -373,7 +373,7 @@ iterator elements(t: IntSet): int {.inline.} =
       r = r.next
 
 proc isSmallChunk(c: PChunk): bool {.inline.} =
-  return c.size <= SmallChunkSize-smallChunkOverhead()
+  result = c.size <= SmallChunkSize-smallChunkOverhead()
 
 proc chunkUnused(c: PChunk): bool {.inline.} =
   result = (c.prevSize and 1) == 0