maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

We already reported an error for 

extern "C" {
  void test5_f() {
    extern int test5_b;
  }
}
static float test5_b;

This patch makes us report one for

extern "C" {
  void test6_f() {
    extern int test6_b;
  }
}
extern "C" {
  static float test6_b;
}

Not because we think the declaration would be extern C, but because of the rule:

An entity with C language linkage shall not be declared with the same name as an entity in global scope...

We were just not looking past the extern "C" to see if the decl was in global
scope.

llvm-svn: 176875
This commit is contained in:
Rafael Espindola 2013-03-12 16:45:13 +00:00
parent a5151271e6
commit cfd2528a46
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Sema/SemaDecl.cpp
View File

@ -5004,7 +5004,8 @@ void Sema::CheckShadow(Scope *S, VarDecl *D) {
template<typename T>
static bool mayConflictWithNonVisibleExternC(const T *ND) {
return ND->isExternC() || ND->getDeclContext()->isTranslationUnit();
return ND->isExternC() ||
ND->getDeclContext()->getRedeclContext()->isTranslationUnit();
}
/// \brief Perform semantic checking on a newly-created variable

16
clang/test/SemaCXX/function-redecl.cpp
View File

@ -145,3 +145,19 @@ namespace test4 {
float b; // expected-error {{redefinition of 'b' with a different type: 'float' vs 'int'}}
}
}
extern "C" {
void test5_f() {
extern int test5_b; // expected-note {{previous definition is here}}
}
}
static float test5_b; // expected-error {{redefinition of 'test5_b' with a different type: 'float' vs 'int'}}
extern "C" {
void test6_f() {
extern int test6_b; // expected-note {{previous definition is here}}
}
}
extern "C" {
static float test6_b; // expected-error {{redefinition of 'test6_b' with a different type: 'float' vs 'int'}}
}