cleanups

Author: Araq

compiler/cgen.nim

@@ -1311,9 +1311,8 @@ proc genProcLvl3*(m: BModule, prc: PSym) =
   assert(prc.ast != nil)
 
   var procBody = transformBody(m.g.graph, m.idgen, prc, {})
-  when not defined(nimExperimentalPreLiftDestruct):
-    if sfInjectDestructors in prc.flags:
-      procBody = injectDestructorCalls(m.g.graph, m.idgen, prc, procBody)
+  if sfInjectDestructors in prc.flags:
+    procBody = injectDestructorCalls(m.g.graph, m.idgen, prc, procBody)
 
   let tmpInfo = prc.info
   discard freshLineInfo(p, prc.info)
@@ -2449,9 +2448,8 @@ proc handleProcGlobals(m: BModule) =
     # fixes recursive calls #24997
     swap stmts, m.preInitProc.s(cpsStmts)
     var transformedN = procGlobals[i]
-    when not defined(nimExperimentalPreLiftDestruct):
-      if sfInjectDestructors in m.module.flags:
-        transformedN = injectDestructorCalls(m.g.graph, m.idgen, m.module, transformedN)
+    if sfInjectDestructors in m.module.flags:
+      transformedN = injectDestructorCalls(m.g.graph, m.idgen, m.module, transformedN)
     genStmts(m.preInitProc, transformedN)
     swap stmts, m.preInitProc.s(cpsStmts)
 
@@ -2465,9 +2463,8 @@ proc genTopLevelStmt*(m: BModule; n: PNode) =
   #softRnl = if optLineDir in m.config.options: noRnl else: rnl
   # XXX replicate this logic!
   var transformedN = transformStmt(m.g.graph, m.idgen, m.module, n)
-  when not defined(nimExperimentalPreLiftDestruct):
-    if sfInjectDestructors in m.module.flags:
-      transformedN = injectDestructorCalls(m.g.graph, m.idgen, m.module, transformedN)
+  if sfInjectDestructors in m.module.flags:
+    transformedN = injectDestructorCalls(m.g.graph, m.idgen, m.module, transformedN)
 
   if m.hcrOn:
     addHcrInitGuards(m.initProc, transformedN, m.inHcrInitGuard, m.hcrInitGuard)

compiler/dfa.nim

@@ -26,7 +26,6 @@ import ast, lineinfos, renderer, aliasanalysis
 import std/private/asciitables
 import std/intsets
 import std/tables
-import std/algorithm
 
 when defined(nimPreviewSlimSystem):
   import std/assertions
@@ -296,33 +295,23 @@ proc genCase(c: var Con; n: PNode) =
     traverse(n)
     result = res
   let isStateCase = isStateAccess(n[0])
-  var branchOrder: seq[int] = @[]
-  if isStateCase:
-    var labeled: seq[(int, int)] = @[]
-    var others: seq[int] = @[]
-    var elseIdx = -1
-    for i in 1..<n.len:
-      let it = n[i]
-      if it.len == 1:
-        elseIdx = i
-      else:
-        var stateId = high(int)
-        for j in 0..it.len-2:
-          if it[j].kind == nkIntLit:
-            stateId = it[j].intVal.int
-            break
-        if stateId != high(int):
-          labeled.add (stateId, i)
-        else:
-          others.add i
-    labeled.sort(proc (a, b: (int, int)): int = cmp(a[0], b[0]))
-    for it in labeled: branchOrder.add it[1]
-    for i in others: branchOrder.add i
-    if elseIdx >= 0: branchOrder.add elseIdx
-  else:
-    for i in 1..<n.len: branchOrder.add i
+  # State case branches are already sorted by closureiters.nim, so we can
+  # process them in order without needing to sort here.
+  when defined(debug):
+    if isStateCase:
+      # Verify that state branches are in sorted order
+      var lastStateId = -1
+      for i in 1..<n.len:
+        let it = n[i]
+        if it.len >= 2:
+          for j in 0..it.len-2:
+            if it[j].kind == nkIntLit:
+              let stateId = it[j].intVal.int
+              assert stateId > lastStateId, "State case branches are not sorted: " & $lastStateId & " >= " & $stateId
+              lastStateId = stateId
+              break
 
-  for i in branchOrder:
+  for i in 1..<n.len:
     let it = n[i]
     if isStateCase and it.len >= 2:
       for j in 0..it.len-2:

compiler/jsgen.nim

@@ -2792,9 +2792,8 @@ proc genProc(oldProc: PProc, prc: PSym): Rope =
       returnStmt = "return $#;$n" % [a.res]
 
   var transformedBody = transformBody(p.module.graph, p.module.idgen, prc, {})
-  when not defined(nimExperimentalPreLiftDestruct):
-    if sfInjectDestructors in prc.flags:
-      transformedBody = injectDestructorCalls(p.module.graph, p.module.idgen, prc, transformedBody)
+  if sfInjectDestructors in prc.flags:
+    transformedBody = injectDestructorCalls(p.module.graph, p.module.idgen, prc, transformedBody)
 
   p.nested: genStmt(p, transformedBody)
 
@@ -3141,9 +3140,8 @@ proc genModule(p: PProc, n: PNode) =
         makeJSString("module " & p.module.module.name.s),
         makeJSString(toFilenameOption(p.config, p.module.module.info.fileIndex, foStacktrace))))
   var transformedN = transformStmt(p.module.graph, p.module.idgen, p.module.module, n)
-  when not defined(nimExperimentalPreLiftDestruct):
-    if sfInjectDestructors in p.module.module.flags:
-      transformedN = injectDestructorCalls(p.module.graph, p.module.idgen, p.module.module, transformedN)
+  if sfInjectDestructors in p.module.module.flags:
+    transformedN = injectDestructorCalls(p.module.graph, p.module.idgen, p.module.module, transformedN)
   if p.config.hcrOn and n.kind == nkStmtList:
     let moduleSym = p.module.module
     var moduleLoadedVar = rope(moduleSym.name.s) & "_loaded" &

compiler/transf.nim

@@ -26,9 +26,6 @@ import
   lowerings, liftlocals,
   modulegraphs, lineinfos
 
-when defined(nimExperimentalPreLiftDestruct):
-  import injectdestructors
-
 when defined(nimPreviewSlimSystem):
   import std/assertions
 
@@ -1313,16 +1310,7 @@ proc transformBody*(g: ModuleGraph; idgen: IdGenerator; prc: PSym; flags: Transf
   else:
     prc.transformedBody = newNode(nkEmpty) # protects from recursion
     var c = openTransf(g, prc.getModule, "", idgen, flags)
-
-    when defined(nimExperimentalPreLiftDestruct):
-      # EXPERIMENTAL: Inject destructors BEFORE lambda lifting
-      # This allows DFA to work on pre-lifted AST without closure-specific hacks
-      var body = getBody(g, prc)
-      if sfInjectDestructors in prc.flags:
-        body = injectDestructorCalls(g, idgen, prc, body)
-      result = liftLambdas(g, prc, body, c.tooEarly, c.idgen, flags)
-    else:
-      result = liftLambdas(g, prc, getBody(g, prc), c.tooEarly, c.idgen, flags)
+    result = liftLambdas(g, prc, getBody(g, prc), c.tooEarly, c.idgen, flags)
 
     result = processTransf(c, result, prc)
     liftDefer(c, result)