Fix tests in r204576

Proper redeclaration warnings for dllimport are not implemented yet.

llvm-svn: 204577
This commit is contained in:
Nico Rieck 2014-03-23 22:07:53 +00:00
parent e84f8db709
commit 0854e59281
2 changed files with 8 additions and 8 deletions

View File

@ -37,11 +37,11 @@ int ExternGlobalDeclInit = 1; // expected-error{{definition of dllimport data}}
__declspec(dllimport) int GlobalDeclInit;
int GlobalDeclInit = 1; // expected-error{{definition of dllimport data}}
int *__attribute__((dllimport)) GlobalDeclChunkAttrInit; // expected-note{{previous declaration is here}} expected-note{{previous attribute is here}}
int *GlobalDeclChunkAttrInit = 0; // expected-warning{{'GlobalDeclChunkAttrInit' redeclared without 'dllimport' attribute: previous 'dllimport' ignored}}
int *__attribute__((dllimport)) GlobalDeclChunkAttrInit;
int *GlobalDeclChunkAttrInit = 0; // expected-error{{definition of dllimport data}}
int GlobalDeclAttrInit __attribute__((dllimport)); // expected-note{{previous declaration is here}} expected-note{{previous attribute is here}}
int GlobalDeclAttrInit = 1; // expected-warning{{'GlobalDeclAttrInit' redeclared without 'dllimport' attribute: previous 'dllimport' ignored}}
int GlobalDeclAttrInit __attribute__((dllimport));
int GlobalDeclAttrInit = 1; // expected-error{{definition of dllimport data}}
// Redeclarations
__declspec(dllimport) extern int GlobalRedecl1;

View File

@ -49,11 +49,11 @@ int ExternGlobalDeclInit = 1; // expected-error{{definition of dllimport data}}
__declspec(dllimport) int GlobalDeclInit;
int GlobalDeclInit = 1; // expected-error{{definition of dllimport data}}
int *__attribute__((dllimport)) GlobalDeclChunkAttrInit; // expected-note{{previous declaration is here}} expected-note{{previous attribute is here}}
int *GlobalDeclChunkAttrInit = 0; // expected-warning{{'GlobalDeclChunkAttrInit' redeclared without 'dllimport' attribute: previous 'dllimport' ignored}}
int *__attribute__((dllimport)) GlobalDeclChunkAttrInit;
int *GlobalDeclChunkAttrInit = 0; // expected-error{{definition of dllimport data}}
int GlobalDeclAttrInit __attribute__((dllimport)); // expected-note{{previous declaration is here}} expected-note{{previous attribute is here}}
int GlobalDeclAttrInit = 1; // expected-warning{{'GlobalDeclAttrInit' redeclared without 'dllimport' attribute: previous 'dllimport' ignored}}
int GlobalDeclAttrInit __attribute__((dllimport));
int GlobalDeclAttrInit = 1; // expected-error{{definition of dllimport data}}
// Redeclarations
__declspec(dllimport) extern int GlobalRedecl1;