Fix the fix on type combining (e0012c2)

char **argv; _Generic(argv, char**: (void)0); _Generic(0?(char const*)0:argv[0], char const*: (void)0); _Generic(argv, char**: (void)0); would fail because the type of argv would get modified by the ternary. Now allocate a separate type on the value stack to prevent this error.

Petr Skocik committed 7 years ago

Commit 9d44b021 parent e0012c22 files · +13 −0Browse files

Unified · Split

2 files

tccgen.c +6 −0
tests/tests2/94_generic.c +7 −0

tccgen.c+6−0

                         if(!compare_types(pointed_type(&type1), pointed_type(&type2),1/*unqualif*/))
                             tcc_warning("pointer type mismatch in conditional expression\n");
                     }
+                    {   /*copy the pointer target symbol*/
+                        Sym *s;
+                        s = sym_push(SYM_FIELD, pointed_type(&type), 0, -1);
+                        type.t = VT_PTR | (type.t & VT_STORAGE);
+                        type.ref = s;
+                    }
                     /*qualifs combine*/
                     pointed_type(&type)->t |= 0
                           |(pointed_type(&type1)->t&(VT_CONSTANT|VT_VOLATILE))

tests/tests2/94_generic.c+7−0

@@ -95,5 +95,12 @@ int main() · 94 unmodified lines
95	(void)(sizeof(struct { int x:_Generic( 0?(int ()[4])0 : (int ()[])0, int ()[4]:+1, int ()[5]:(void)0); }));	95	(void)(sizeof(struct { int x:_Generic( 0?(int ()[4])0 : (int ()[])0, int ()[4]:+1, int ()[5]:(void)0); }));
96	(void)(sizeof(struct { int x:_Generic( 0?(int ()[])0 : (int ()[4])0, int ()[4]:+1, int ()[5]:(void)0); }));	96	(void)(sizeof(struct { int x:_Generic( 0?(int ()[])0 : (int ()[4])0, int ()[4]:+1, int ()[5]:(void)0); }));
97		97
		98	{
		99	char **argv;
		100	_Generic(argv, char**: (void)0);
		101	_Generic(0?(char const)0:argv[0], char const: (void)0);
		102	_Generic(argv, char**: (void)0);
		103	}
		104
98	return 0;	105	return 0;
99	}	106	}

Fix the fix on type combining (e0012c2)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code