fixes #13122 (#13126)

* fixes #13122 * moved tests to where they belong
nim-lang · Jan 13, 2020 · abea803 · abea803
1 parent bf2e052
commit abea803
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/compiler/ast.nim b/compiler/ast.nim
@@ -826,7 +826,7 @@ type
     of skLet, skVar, skField, skForVar:
       guard*: PSym
       bitsize*: int
-      alignment*: int # for alignas(X) expressions
+      alignment*: int # for alignment
     else: nil
     magic*: TMagic
     typ*: PType
@@ -1398,6 +1398,8 @@ proc copySym*(s: PSym): PSym =
   result.annex = s.annex      # BUGFIX
   if result.kind in {skVar, skLet, skField}:
     result.guard = s.guard
+    result.bitsize = s.bitsize
+    result.alignment = s.alignment
 
 proc createModuleAlias*(s: PSym, newIdent: PIdent, info: TLineInfo;
                         options: TOptions): PSym =

diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim
@@ -819,12 +819,10 @@ proc singlePragma(c: PContext, sym: PSym, n: PNode, i: var int,
           localError(c.config, it.info, "size may only be 1, 2, 4 or 8")
       of wAlign:
         let alignment = expectIntLit(c, it)
-        if alignment == 0:
-          discard
-        elif isPowerOfTwo(alignment):
+        if isPowerOfTwo(alignment) and alignment > 0:
           sym.alignment = max(sym.alignment, alignment)
         else:
-          localError(c.config, it.info, "power of two or 0 expected")
+          localError(c.config, it.info, "power of two expected")
       of wNodecl:
         noVal(c, it)
         incl(sym.loc.flags, lfNoDecl)

diff --git a/tests/misc/globalalignas.nim → tests/align/globalalignas.nim b/tests/misc/globalalignas.nim → tests/align/globalalignas.nim
diff --git a/tests/misc/talignas.nim → tests/align/talign.nim b/tests/misc/talignas.nim → tests/align/talign.nim
@@ -31,9 +31,9 @@ proc foobar() =
   doAssert (cast[uint](addr(toplevel3)) and 31) == 0
 
   # test multiple align expressions
-  var mylocal1 {.align(0), align(128), align(32).}: int = 123
-  var mylocal2 {.align(128), align(0), align(32).}: int = 123
-  var mylocal3 {.align(0), align(32), align(128).}: int = 123
+  var mylocal1 {.align(128), align(32).}: int = 123
+  var mylocal2 {.align(128), align(32).}: int = 123
+  var mylocal3 {.align(32), align(128).}: int = 123
 
   doAssert (cast[uint](addr(mylocal1)) and 127) == 0
   doAssert (cast[uint](addr(mylocal2)) and 127) == 0
@@ -42,3 +42,12 @@ proc foobar() =
   echo "align ok"
 
 foobar()
+
+# bug #13122
+
+type Bug[T] = object
+  bug{.align:64.}: T
+  sideffect{.align:64.}: int
+
+var bug: Bug[int]
+doAssert sizeof(bug) == 128, "Oops my size is " & $sizeof(bug) # 16
diff --git a/tests/misc/tillegalalignas.nim → tests/align/tillegalalign.nim b/tests/misc/tillegalalignas.nim → tests/align/tillegalalign.nim
@@ -1,6 +1,6 @@
 discard """
 cmd: "nim check $options $file"
-errormsg: "power of two or 0 expected"
+errormsg: "power of two expected"
 """
 
 proc foobar() =