Skip to content

Commit

Permalink
fix rtti sizeof for varargs in global scope (#13125) [backport]
Browse files Browse the repository at this point in the history
  • Loading branch information
Jasper Jenkins authored and Araq committed Jan 13, 2020
1 parent 1f27a2f commit bf2e052
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
4 changes: 2 additions & 2 deletions compiler/ast.nim
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ type
nfExecuteOnReload # A top-level statement that will be executed during reloads

TNodeFlags* = set[TNodeFlag]
TTypeFlag* = enum # keep below 32 for efficiency reasons (now: ~39)
TTypeFlag* = enum # keep below 32 for efficiency reasons (now: ~40)
tfVarargs, # procedure has C styled varargs
# tyArray type represeting a varargs list
tfNoSideEffect, # procedure type does not allow side effects
Expand Down Expand Up @@ -539,6 +539,7 @@ type
tfCheckedForDestructor # type was checked for having a destructor.
# If it has one, t.destructor is not nil.
tfAcyclic # object type was annotated as .acyclic
tfIncompleteStruct # treat this type as if it had sizeof(pointer)

TTypeFlags* = set[TTypeFlag]

Expand Down Expand Up @@ -580,7 +581,6 @@ type
const
routineKinds* = {skProc, skFunc, skMethod, skIterator,
skConverter, skMacro, skTemplate}
tfIncompleteStruct* = tfVarargs
tfUnion* = tfNoSideEffect
tfGcSafe* = tfThread
tfObjHasKids* = tfEnumHasHoles
Expand Down
9 changes: 9 additions & 0 deletions tests/assign/tassign.nim
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ TEMP=C:\Programs\xyz\bin
8 5 0 0
pre test a:test b:1 c:2 haha:3
assignment test a:test b:1 c:2 haha:3
abc123
'''
"""

Expand Down Expand Up @@ -207,3 +208,11 @@ when false:
var
a, b: Foo
a = b

block tgeneric_assign_varargs:
template fatal(msgs: varargs[string]) =
for msg in msgs:
stdout.write(msg)
stdout.write('\n')

fatal "abc", "123"

0 comments on commit bf2e052

Please sign in to comment.