summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBung <crc32@qq.com>2022-12-28 15:28:48 +0800
committerGitHub <noreply@github.com>2022-12-28 08:28:48 +0100
commit7a74c2dc3a82488671237555faa95fb38ef31bd5 (patch)
tree2ab49329eadc711890de1837848b350a425c5402
parent3d5dbf8f96a5106a3b817a45a926303bc5623786 (diff)
downloadNim-7a74c2dc3a82488671237555faa95fb38ef31bd5.tar.gz
fix #14667 (#21190)
-rw-r--r--compiler/ccgexprs.nim4
-rw-r--r--compiler/cgendata.nim1
-rw-r--r--tests/misc/t14667.nim12
3 files changed, 17 insertions, 0 deletions
diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
index d7ef024b1..e2885a294 100644
--- a/compiler/ccgexprs.nim
+++ b/compiler/ccgexprs.nim
@@ -3200,6 +3200,8 @@ proc getDefaultValue(p: BProc; typ: PType; info: TLineInfo; result: var Rope) =
     result.add "}"
   of tyTuple:
     result.add "{"
+    if p.vccAndC and t.len == 0:
+      result.add "0"
     for i in 0..<t.len:
       if i > 0: result.add ", "
       getDefaultValue(p, t[i], info, result)
@@ -3338,6 +3340,8 @@ proc genConstSimpleList(p: BProc, n: PNode; isConst: bool; result: var Rope) =
 
 proc genConstTuple(p: BProc, n: PNode; isConst: bool; tup: PType; result: var Rope) =
   result.add "{"
+  if p.vccAndC and n.len == 0:
+    result.add "0"
   for i in 0..<n.len:
     let it = n[i]
     if i > 0: result.add ",\n"
diff --git a/compiler/cgendata.nim b/compiler/cgendata.nim
index 2daa8da7c..f75598652 100644
--- a/compiler/cgendata.nim
+++ b/compiler/cgendata.nim
@@ -172,6 +172,7 @@ type
 
 template config*(m: BModule): ConfigRef = m.g.config
 template config*(p: BProc): ConfigRef = p.module.g.config
+template vccAndC*(p: BProc): bool = p.module.config.cCompiler == ccVcc and p.module.config.backend == backendC
 
 proc includeHeader*(this: BModule; header: string) =
   if not this.headerFiles.contains header:
diff --git a/tests/misc/t14667.nim b/tests/misc/t14667.nim
new file mode 100644
index 000000000..3034e2841
--- /dev/null
+++ b/tests/misc/t14667.nim
@@ -0,0 +1,12 @@
+discard """
+  matrix: "--cc:vcc"
+  disabled: "linux"
+  disabled: "bsd"
+  disabled: "osx"
+  disabled: "unix"
+  disabled: "posix"
+"""
+
+type A = tuple
+discard ()
+discard default(A)