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

[modules] Handle merged fields in designated initializers. 

llvm-svn: 265838
This commit is contained in:
Richard Smith 2016-04-08 19:57:40 +00:00
parent fec5c64b63
commit fe1bc708b5
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Sema/SemaInit.cpp
View File

@ -2227,8 +2227,10 @@ InitListChecker::CheckDesignatedInitializer(const InitializedEntity &Entity,
for (auto *FI : RT->getDecl()->fields()) { for (auto *FI : RT->getDecl()->fields()) {
if (FI->isUnnamedBitfield()) if (FI->isUnnamedBitfield())
continue; continue;
if (KnownField == FI) if (declaresSameEntity(KnownField, FI)) {
KnownField = FI;
break; break;
}
++FieldIndex; ++FieldIndex;
} }
@ -2241,11 +2243,11 @@ InitListChecker::CheckDesignatedInitializer(const InitializedEntity &Entity,
FieldIndex = 0; FieldIndex = 0;
if (!VerifyOnly) { if (!VerifyOnly) {
FieldDecl *CurrentField = StructuredList->getInitializedFieldInUnion(); FieldDecl *CurrentField = StructuredList->getInitializedFieldInUnion();
if (CurrentField && CurrentField != *Field) { if (CurrentField && !declaresSameEntity(CurrentField, *Field)) {
assert(StructuredList->getNumInits() == 1 assert(StructuredList->getNumInits() == 1
&& "A union should never have more than one initializer!"); && "A union should never have more than one initializer!");
// we're about to throw away an initializer, emit warning // We're about to throw away an initializer, emit warning.
SemaRef.Diag(D->getFieldLoc(), SemaRef.Diag(D->getFieldLoc(),
diag::warn_initializer_overrides) diag::warn_initializer_overrides)
<< D->getSourceRange(); << D->getSourceRange();

4
clang/test/Modules/Inputs/merge-decl-context/a.h
View File

@ -21,4 +21,8 @@ inline A<int> ff(int i) {
return fff<A<int>>(&i); return fff<A<int>>(&i);
} }
struct Aggregate {
int member;
};
#endif #endif

8
clang/test/Modules/merge-decl-context.cpp
View File

@ -18,7 +18,13 @@
// RUN: -fmodule-map-file=%S/Inputs/merge-decl-context/merge-decl-context.modulemap -I%S/Inputs \ // RUN: -fmodule-map-file=%S/Inputs/merge-decl-context/merge-decl-context.modulemap -I%S/Inputs \
// RUN: -emit-llvm -o %t/test.o %s // RUN: -emit-llvm -o %t/test.o %s
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules -fmodules-cache-path=%t \
// RUN: -fmodule-map-file=%S/Inputs/merge-decl-context/merge-decl-context.modulemap -I%S/Inputs \
// RUN: -emit-llvm -o %t/test.o -DNO_TEXTUAL_INCLUSION %s
#ifndef NO_TEXTUAL_INCLUSION
#include "Inputs/merge-decl-context/a.h" #include "Inputs/merge-decl-context/a.h"
#endif
#include "Inputs/merge-decl-context/b.h" #include "Inputs/merge-decl-context/b.h"
#include "Inputs/merge-decl-context/c.h" #include "Inputs/merge-decl-context/c.h"
#include "Inputs/merge-decl-context/d.h" #include "Inputs/merge-decl-context/d.h"
@ -26,3 +32,5 @@
void t() { void t() {
ff(42); ff(42);
} }
static_assert(Aggregate{.member = 1}.member == 1, "");