diff options
author | Nico Rieck <nico.rieck@gmail.com> | 2014-05-25 10:34:16 +0000 |
---|---|---|
committer | Nico Rieck <nico.rieck@gmail.com> | 2014-05-25 10:34:16 +0000 |
commit | 755a36f593c0fe44f8a334c5690e99268d60ddaa (patch) | |
tree | 00fb89ea514c9a5f7da7d080f7e81472df0d34f7 /clang/lib/Sema/SemaDecl.cpp | |
parent | 0a4376190fe29f6edf37e303e64da4ebc1ba01a5 (diff) | |
download | bcm5719-llvm-755a36f593c0fe44f8a334c5690e99268d60ddaa.tar.gz bcm5719-llvm-755a36f593c0fe44f8a334c5690e99268d60ddaa.zip |
IRGen: Add more tests for dll attributes
llvm-svn: 209596
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
-rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index d7b5ba427d6..1501be88be0 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -5056,7 +5056,8 @@ Sema::ActOnVariableDeclarator(Scope *S, Declarator &D, DeclContext *DC, // dllimport globals without explicit storage class are treated as extern. We // have to change the storage class this early to get the right DeclContext. if (SC == SC_None && !DC->isRecord() && - hasParsedAttr(S, D, AttributeList::AT_DLLImport)) + hasParsedAttr(S, D, AttributeList::AT_DLLImport) && + !hasParsedAttr(S, D, AttributeList::AT_DLLExport)) SC = SC_Extern; DeclContext *OriginalDC = DC; |