the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2112 from bbbradsmith/extern-static-conflict-error

Browse Source 
Error/warning for extern/static linkage declaration conflict
This commit is contained in:
Bob Andrews
2023-05-12 11:22:59 +02:00
committed by GitHub
parent 79018fd424 5a30d746b4
commit 55723f4977
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cc65/symtab.c
View File

@@ -1340,15 +1340,14 @@ SymEntry* AddGlobalSym (const char* Name, const Type* T, unsigned Flags)
Name); Name);
Entry = 0; Entry = 0;
} else if ((Flags & SC_ESUTYPEMASK) != SC_TYPEDEF) { } else if ((Flags & SC_ESUTYPEMASK) != SC_TYPEDEF) {
/* If a static declaration follows a non-static declaration, then /* If a static declaration follows a non-static declaration, then the result is undefined.
** diagnose the conflict. It will warn and compile an extern ** Most compilers choose to either give an error at compile time,
** declaration if both declarations are global, otherwise give an ** or remove the extern property for a link time error if used.
** error.
*/ */
if (SymTab == SymTab0 && if (SymTab == SymTab0 &&
(Flags & SC_EXTERN) == 0 && (Flags & SC_EXTERN) == 0 &&
(Entry->Flags & SC_EXTERN) != 0) { (Entry->Flags & SC_EXTERN) != 0) {
Warning ("Static declaration of '%s' follows non-static declaration", Name); Error ("Static declaration of '%s' follows non-static declaration", Name);
} else if ((Flags & SC_EXTERN) != 0 && } else if ((Flags & SC_EXTERN) != 0 &&
(Entry->Owner == SymTab0 || (Entry->Flags & SC_DEF) != 0) && (Entry->Owner == SymTab0 || (Entry->Flags & SC_DEF) != 0) &&
(Entry->Flags & SC_EXTERN) == 0) { (Entry->Flags & SC_EXTERN) == 0) {
@@ -1360,8 +1359,12 @@ SymEntry* AddGlobalSym (const char* Name, const Type* T, unsigned Flags)
*/ */
if (Entry->Owner == SymTab0) { if (Entry->Owner == SymTab0) {
if ((Flags & SC_STORAGE) == 0) { if ((Flags & SC_STORAGE) == 0) {
/* Linkage must be unchanged */ /* Linkage must be unchanged.
** The C standard specifies that a later extern declaration will be ignored,
** and will use the previous linkage instead. Giving a warning for this case.
*/
Flags &= ~SC_EXTERN; Flags &= ~SC_EXTERN;
Warning ("Extern declaration of '%s' follows static declaration, extern ignored", Name);
} else { } else {
Error ("Non-static declaration of '%s' follows static declaration", Name); Error ("Non-static declaration of '%s' follows static declaration", Name);
} }

7
test/val/decl-static-extern.c
View File

@@ -7,13 +7,12 @@
/* /*
see: https://github.com/cc65/cc65/issues/191 see: https://github.com/cc65/cc65/issues/191
https://github.com/cc65/cc65/issues/2111
*/ */
#pragma warn(error, on)
static int n = 0; static int n = 0;
extern int n; /* should not give an error */ extern int n; /* extern is ignored, gives a warning but keeps previous static definiton */
static int n; /* should not give an error */ static int n; /* no error or warning, the previous static is still in effect */
int main(void) int main(void)
{ {