tccgen.c: local extern decls: copy s->ref for VT_PTR too

This fixes the issue int main() { extern char *x; } void main1() { extern char *x; } t2.c:5: error: incompatible types for redefinition of 'x' (reported by Giovanni Mascellani 2019/07/16)

grischka committed 7 years ago

Commit 7b8799e1 parent 92985554 files · +42 −14Browse files

Unified · Split

4 files

Makefile +1 −1
tccgen.c +17 −13
tests/tests2/60_errors_and_warnings.c +22 −0
tests/tests2/60_errors_and_warnings.expect +2 −0

Makefile+1−1

@@ -98,7 +98,7 @@ TCC_X += riscv64 · 97 unmodified lines
98		98
99	# cross libtcc1.a targets to build	99	# cross libtcc1.a targets to build
100	LIBTCC1_X = i386 x86_64 i386-win32 x86_64-win32 x86_64-osx arm arm64 arm-wince	100	LIBTCC1_X = i386 x86_64 i386-win32 x86_64-win32 x86_64-osx arm arm64 arm-wince
101	LIBTCC1_X = riscv64	101	LIBTCC1_X += riscv64
102		102
103	PROGS_CROSS = $(foreach X,$(TCC_X),$X-tcc$(EXESUF))	103	PROGS_CROSS = $(foreach X,$(TCC_X),$X-tcc$(EXESUF))
104	LIBTCC1_CROSS = $(foreach X,$(LIBTCC1_X),$X-libtcc1.a)	104	LIBTCC1_CROSS = $(foreach X,$(LIBTCC1_X),$X-libtcc1.a)

tccgen.c+17−13

     return s;
 }
-/* copy a list of syms */
+/* copy s->type.ref to stack 'ps' for VT_FUNC and VT_PTR */
-static void sym_copy_ref(Sym *s0, Sym **ps)
+static void sym_copy_ref(Sym *s, Sym **ps)
 {
-    Sym *s, **sp = &s0->type.ref;
+    int bt = s->type.t & VT_BTYPE;
-    for (s = *sp, *sp = NULL; s; s = s->next)
+    if (bt == VT_FUNC || bt == VT_PTR) {
-        sp = &(*sp = sym_copy(s, ps))->next;
+        Sym **sp = &s->type.ref;
+        for (s = *sp, *sp = NULL; s; s = s->next) {
+            Sym *s2 = sym_copy(s, ps);
+            sp = &(*sp = s2)->next;
+            sym_copy_ref(s2, ps);
+        }
+    }
 }
 /* define a new external reference to a symbol 'v' */
 static Sym *external_sym(int v, CType *type, int r, AttributeDef *ad)
 {
-    Sym *s; int bt;
+    Sym *s;
     /* look for global symbol */
     s = sym_find(v);
         s->a = ad->a;
         s->asm_label = ad->asm_label;
         s->type.ref = type->ref;
-        bt = s->type.t & (VT_BTYPE|VT_ARRAY);
+        /* copy type to the global stack */
-        /* copy type to the global stack also */
+        if (local_stack)
-        if (local_scope && (bt == VT_FUNC || (bt & VT_ARRAY)))
             sym_copy_ref(s, &global_stack);
     } else {
         patch_storage(s, ad, type);
-        bt = s->type.t & VT_BTYPE;
     }
-    /* push variables to local scope if any */
+    /* push variables on local_stack if any */
-    if (local_stack && bt != VT_FUNC)
+    if (local_stack && (s->type.t & VT_BTYPE) != VT_FUNC)
         s = sym_copy(s, &local_stack);
     return s;
 }

tests/tests2/60_errors_and_warnings.c+22−0

@@ -273,5 +273,27 @@ int main () · 272 unmodified lines
273	int xxx[1] = {1};	273	int xxx[1] = {1};
274	int bar() { P(3, xxx[0]); return 0; }	274	int bar() { P(3, xxx[0]); return 0; }
275		275
		276	#elif defined test_var_4
		277	struct yyy { int y; };
		278	struct zzz;
		279	void f1() {
		280	extern char *x;
		281	extern char **xx;
		282	extern struct yyy y;
		283	extern struct yyy *yy;
		284	extern struct zzz z;
		285	extern struct zzz *zz;
		286	}
		287	void f2() {
		288	extern char *x;
		289	extern char **xx;
		290	extern struct yyy y;
		291	extern struct yyy *yy;
		292	extern struct zzz z;
		293	extern struct zzz *zz;
		294	}
		295	struct yyy y, *yy;
		296	struct zzz { int z; } z, *zz;
		297
276	/******************************************************************/	298	/******************************************************************/
277	#endif	299	#endif

tests/tests2/60_errors_and_warnings.expect+2−0

@@ -132,3 +132,5 @@ bar : 3 ; 3 · 131 unmodified lines
132		132
133	[test_var_3]	133	[test_var_3]
134	60_errors_and_warnings.c:273: error: incompatible types for redefinition of 'xxx'	134	60_errors_and_warnings.c:273: error: incompatible types for redefinition of 'xxx'
		135
		136	[test_var_4]

tccgen.c: local extern decls: copy s->ref for VT_PTR too

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code