Author: nrieck
Date: Sun Mar 23 17:07:53 2014
New Revision: 204577
URL: http://llvm.org/viewvc/llvm-project?rev=204577&view=rev
Log:
Fix tests in r204576
Proper redeclaration warnings for dllimport are not implemented yet.
Modified:
cfe/trunk/test/Sema/dllimport.c
cfe/trunk/test/SemaCXX/dllimport.cpp
Modified: cfe/trunk/test/Sema/dllimport.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/dllimport.c?rev=204577&r1=204576&r2=204577&view=diff
==============================================================================
--- cfe/trunk/test/Sema/dllimport.c (original)
+++ cfe/trunk/test/Sema/dllimport.c Sun Mar 23 17:07:53 2014
@@ -37,11 +37,11 @@ int ExternGlobalDeclInit = 1; // expecte
__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;
Modified: cfe/trunk/test/SemaCXX/dllimport.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/dllimport.cpp?rev=204577&r1=204576&r2=204577&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/dllimport.cpp (original)
+++ cfe/trunk/test/SemaCXX/dllimport.cpp Sun Mar 23 17:07:53 2014
@@ -49,11 +49,11 @@ int ExternGlobalDeclInit = 1; // expecte
__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;
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
