progress

compiler/closureiters.nim

@@ -727,7 +727,7 @@ proc lowerStmtListExprs(ctx: var Ctx, n: PNode, needsSplit: var bool): PNode =
       n[0] = ex
       result.add(n)
 
-  of nkCast, nkHiddenStdConv, nkHiddenSubConv, nkConv, nkObjDownConv, nkObjUpConv,
+  of nkCast, nkHiddenStdConv, nkHiddenSubConv, nkConv, nkObjDownConv,
       nkDerefExpr, nkHiddenDeref:
     var ns = false
     for i in ord(n.kind == nkCast)..<n.len:

compiler/injectdestructors.nim

@@ -457,10 +457,10 @@ proc isCapturedVar(n: PNode): bool =
   else: result = false
 
 proc passCopyToSink(n: PNode; c: var Con; s: var Scope): PNode =
+  result = newNodeIT(nkStmtListExpr, n.info, n.typ)
   let nTyp = n.typ.skipTypes(tyUserTypeClasses)
+  let tmp = c.getTemp(s, nTyp, n.info)
   if hasDestructorOrAsgn(c, nTyp):
-    result = newNodeIT(nkStmtListExpr, n.info, n.typ)
-    let tmp = c.getTemp(s, nTyp, n.info)
     let typ = nTyp.skipTypes({tyGenericInst, tyAlias, tySink})
     let op = getAttachedOp(c.graph, typ, attachedDup)
     if op != nil and tfHasOwned notin typ.flags:
@@ -494,15 +494,15 @@ proc passCopyToSink(n: PNode; c: var Con; s: var Scope): PNode =
     if c.inEnsureMove > 0:
       localError(c.graph.config, n.info, errFailedMove,
         ("cannot move '$1', passing '$1' to a sink parameter introduces an implicit copy") % $n)
-    # Since we know somebody will take over the produced copy, there is
-    # no need to destroy it.
-    result.add tmp
   else:
     if c.graph.config.selectedGC in {gcArc, gcOrc, gcYrc, gcAtomicArc}:
       assert(not containsManagedMemory(nTyp))
     if nTyp.skipTypes(abstractInst).kind in {tyOpenArray, tyVarargs}:
       localError(c.graph.config, n.info, "cannot create an implicit openArray copy to be passed to a sink parameter")
-    result = p(n, c, s, normal)
+    result.add newTree(nkAsgn, tmp, p(n, c, s, normal))
+  # Since we know somebody will take over the produced copy, there is
+  # no need to destroy it.
+  result.add tmp
 
 proc isDangerousSeq(t: PType): bool {.inline.} =
   let t = t.skipTypes(abstractInst)

doc/manual.md

@@ -7906,7 +7906,7 @@ alignment requirement of the type are ignored.
   main()
   ```
 
-This pragma has no effect on the JavaScript backend and may significantly increase memory usage with the `--mm:refc` option.
+This pragma has no effect on the JS backend.
 
 
 Noalias pragma

lib/system/alloc.nim

@@ -856,7 +856,7 @@ proc bigChunkAlignOffset(alignment: int): int {.inline.} =
   if alignment == 0:
     result = 0
   else:
-    result = align(sizeof(BigChunk) + sizeof(FreeCell), alignment) - sizeof(BigChunk) - sizeof(FreeCell)
+    result = align(sizeof(BigChunk) + sizeof(Cell), alignment) - sizeof(BigChunk) - sizeof(Cell)
 
 proc rawAlloc(a: var MemRegion, requestedSize: int, alignment: int = 0): pointer =
   when defined(nimTypeNames):

lib/system/cellsets.nim

@@ -59,9 +59,9 @@ else:
       when trackAllocationSource:
         filename: cstring
         line: int
-      when useCellIds:
+      elif useCellIds:
         id: int
-      when (not trackAllocationSource) and (not useCellIds) and sizeof(int) == 4:  # 32-bit only
+      elif defined(cpu32):
         headerAlignPad: array[8, byte]  # so addr(data) ≡ 8 (mod 16)
 
     PCell = ptr Cell

lib/system/gc.nim

@@ -460,7 +460,7 @@ proc rawNewObj(typ: PNimType, size: int, gch: var GcHeap): pointer =
   collectCT(gch)
   # Use alignment from typ.base if available, otherwise use MemAlign
   let alignment = if typ.kind == tyRef and typ.base != nil and
-        typ.base.align > 16: typ.base.align else: 0
+        typ.base.align >= MemAlign: typ.base.align else: 0
   var res = cast[PCell](rawAlloc(gch.region, size + sizeof(Cell), alignment))
   #gcAssert typ.kind in {tyString, tySequence} or size >= typ.base.size, "size too small"
   # Check that the user data (after the Cell header) is properly aligned
@@ -517,7 +517,7 @@ proc newObjRC1(typ: PNimType, size: int): pointer {.compilerRtl, noinline, raise
 
   # Use alignment from typ.base if available, otherwise use MemAlign
   let alignment = if typ.kind == tyRef and typ.base != nil and
-        typ.base.align > 16: typ.base.align else: 0
+        typ.base.align >= MemAlign: typ.base.align else: 0
   var res = cast[PCell](rawAlloc(gch.region, size + sizeof(Cell), alignment))
   sysAssert(allocInv(gch.region), "newObjRC1 after rawAlloc")
   # Check that the user data (after the Cell header) is properly aligned

tests/align/talign.nim

@@ -168,3 +168,4 @@ for q in 0..100:
     new topArr[i]
     topArr[i].m.di.b = q
     doAssert(cast[uint](addr topArr[i].m.di) mod uint(alignof(DeepInner)) == 0)
+

tests/align/talign2.nim

@@ -1,10 +0,0 @@
-discard """
-  matrix: "--mm:refc -d:useGcAssert -d:useSysAssert; --mm:orc"
-"""
-
-block:
-  type U = object
-    d {.align: 16.}: int8
-  var e: seq[ref U]
-  for i in 0 ..< 10000: e.add(new U)
-  doAssert getTotalMem() <= 1052672 * 2

tests/iter/tclosureiter_objupconv_methodawait.nim

@@ -1,12 +0,0 @@
-discard """
-  cmd: "nim c $file"
-"""
-
-import std/asyncdispatch
-
-type
-  A {.inheritable.} = ref object
-  B = ref object of A
-
-method a(x: A): Future[A] {.async, base.} =
-  B(await a(B()))