dllexport const variables must have external linkage.

[rnk]

This shouldn't be conditional under -fms-compatibility, it's part of dllexport, which is already under -fms-extensions / -fdeclspec-extensions.

I don't think this is the right place to do this. Can it be done as part of processing the dllexport attribute or as part of the main storage class calculation?

[zahiraam]

In D45978#1077051, @rnk wrote:

This shouldn't be conditional under -fms-compatibility, it's part of dllexport, which is already under -fms-extensions / -fdeclspec-extensions.

I don't think this is the right place to do this. Can it be done as part of processing the dllexport attribute or as part of the main storage class calculation?

Is this better? Thanks.

[zahiraam]

[erichkeane]

@rnk and @aaron.ballman, does this look appropriate here?

[aaron.ballman]

lib/Sema/SemaDeclAttr.cpp

6488 ↗

(On Diff #143971)

Formatting and a typo:

C++ mode a const variables defined in namespace scope -> C++ mode, a const variable defined at namespace scope

6490 ↗

(On Diff #143971)

Why handle this here as opposed to within mergeDLLExportAttr()?

test/Sema/dllexport.c

70 ↗

(On Diff #143971)

Can you think of any redeclaration scenarios we should also test? e.g., weird cases like this:

extern int const x;
__declspec(dllexport) int const x = 3;

which brings up an interesting question -- does MSVC truly treat it as though it were extern, or just only-kinda-sorta treat it like it was extern? e.g., can you do this:

__declspec(dllexport) const int j;

Regardless, having some codegen tests demonstrating that the variable has the correct semantics that we're emulating would be nice.

[rnk]

I still feel like there has to be a more uniform way to handle this. Basically anything with __declspec(dllexport) on it is effectively upgraded to external linkage.

lib/Sema/SemaDeclAttr.cpp

6491 ↗

(On Diff #143971)

This still shouldn't be under -fms-compatibility, it's really part of the main dllexport feature and doesn't need to be conditional on anything at this point.

[zahiraam]

Aaron,

Please advise.
Thanks.

test/Sema/dllexport.c

70 ↗

(On Diff #143971)

With MSVC:

ksh-3.2$ cat t2.cpp
__declspec(dllexport) const int j;
ksh-3.2$

ksh-3.2$ cl -c t2.cpp
Microsoft (R) C/C++ Optimizing Compiler Version 19.00.24210 for x64
Copyright (C) Microsoft Corporation. All rights reserved.

t2.cpp
t2.cpp(1): error C2734: 'j': 'const' object must be initialized if not 'extern'

ksh-3.2$ cat t3.cpp
__declspec(dllexport) int const x = 3;
int main ()
{

int y = x + 10;

return y;

}

ksh-3.2$ cl -c t3.cpp
Microsoft (R) C/C++ Optimizing Compiler Version 19.00.24210 for x64
Copyright (C) Microsoft Corporation. All rights reserved.

t3.cpp
ksh-3.2$ dumpbin /symbols t3.obj | grep External
008 00000000 SECT3 notype () External | main
ksh-3.2$
ksh-3.2$ cat t4.cpp
extern int const x = 3;
int main ()
{

int y = x + 10;

return y;

}

ksh-3.2$ cl -c t4.cpp
Microsoft (R) C/C++ Optimizing Compiler Version 19.00.24210 for x64
Copyright (C) Microsoft Corporation. All rights reserved.

t4.cpp
ksh-3.2$ dumpbin /symbols t4.obj | grep External
008 00000000 SECT3 notype External | ?x@@3HB (int const x)
00B 00000000 SECT4 notype () External | main
ksh-3.2$

So we see that with dllexport, the ony symbol marked with "External" is main. With "extern" both main and x are marked as External.

With clang without the patch:
ksh-3.2$ clang -c t2.cpp
t2.cpp:1:33: error: default initialization of an object of const type 'const int'
__declspec(dllexport) const int j;

^
  = 0

t2.cpp:1:33: error: 'j' must have external linkage when declared 'dllexport'
2 errors generated.
ksh-3.2$
ksh-3.2$ clang -c t3.cpp
t3.cpp:1:33: error: 'x' must have external linkage when declared 'dllexport'
__declspec(dllexport) int const x = 3;

^

1 error generated.
ksh-3.2$ clang -c t4.cpp
ksh-3.2$ dumpbin /symbols t4.o | grep External
00F 00000000 SECT1 notype () External | main
010 00000000 SECT5 notype External | ?x@@3HB (int const x)
ksh-3.2$

Clang with patch above at the right place (I am thinking in Sema::AddInitializerToDecl):

ksh-3.2$ clang -c t3.cpp
ksh-3.2$ dumpbin /symbols t3.o | grep External
00E 00000000 SECT1 notype () External | main
00F 00000000 SECT5 notype External | ?x@@3HB (int const x)
ksh-3.2$
ksh-3.2$ clang -c t4.cpp
ksh-3.2$ dumpbin /symbols t4.o | grep External
00C 00000000 SECT1 notype () External | main
00D 00000000 SECT5 notype External | ?x@@3HB (int const x)
ksh-3.2$

Both MSVC and clang have the same behavior with t2.cpp.
With the patch clang will have the same beahvior than MSVC when extern and dllexport are used. That's not quite what MSVC's behavior is!
What are your thoughts?
Thanks.

[aaron.ballman]

test/Sema/dllexport.c

70 ↗

(On Diff #143971)

Neat, so MSVC treats it as sort-of-extern-but-sort-of-not. I can't tell whether this is intentional and we want to be compatible, or whether this is a bug in MSVC (and if so, is it one uses are relying on and we need to emulate). I'm not certain what the best answer is here. Perhaps @rnk or @majnemer have opinions?

[rnk]

I'm still not sure this is the best place to make this change, but the functionality is important. There are still unaddressed comments (no need to check MSVCCompatibility, formatting), and I think once those are fixed we can land this.

test/Sema/dllexport.c

70 ↗

(On Diff #143971)

Yes, we should be compatible in this area, it's an extension that we implement, not invalid C++.

[zahiraam]

In D45978#1379901, @rnk wrote:

I'm still not sure this is the best place to make this change, but the functionality is important. There are still unaddressed comments (no need to check MSVCCompatibility, formatting), and I think once those are fixed we can land this.

Since it needs to fail for this:

__declspec(dllexport) const int j;

and pass for this:

__declspec(dllexport) int const x = 3;

I am proposing to add this code in Sema::AddInitializerToDecl(Decl *RealDecl, Expr *Init, bool DirectInit).

[aaron.ballman]

In D45978#1382292, @zahiraam wrote:

In D45978#1379901, @rnk wrote:

I'm still not sure this is the best place to make this change, but the functionality is important. There are still unaddressed comments (no need to check MSVCCompatibility, formatting), and I think once those are fixed we can land this.

Since it needs to fail for this:

__declspec(dllexport) const int j;

and pass for this:

__declspec(dllexport) int const x = 3;

I am proposing to add this code in Sema::AddInitializerToDecl(Decl *RealDecl, Expr *Init, bool DirectInit).

That seems like a reasonable place to try, to me.

[zahiraam]

That seems like a reasonable place to try, to me.

Ok. Let's see if this does the trick. Thanks.

[aaron.ballman]

Can you add tests for C mode as well, as it seems the behavior differs there. Given:

__declspec(dllexport) int const x = 3;
__declspec(dllexport) const int y;
extern int const z = 4;

int main() {
  int a = x + y + z;
  return a;
}

I get:

C:\Users\aballman.GRAMMATECH\source\repos\ConsoleApplication1\ConsoleApplication1>cl -c ConsoleApplication1.cpp
Microsoft (R) C/C++ Optimizing Compiler Version 19.16.27026.1 for x64
Copyright (C) Microsoft Corporation.  All rights reserved.

ConsoleApplication1.cpp
ConsoleApplication1.cpp(2): error C2734: 'y': 'const' object must be initialized if not 'extern'

C:\Users\aballman.GRAMMATECH\source\repos\ConsoleApplication1\ConsoleApplication1>cl -c /Tc ConsoleApplication1.cpp
Microsoft (R) C/C++ Optimizing Compiler Version 19.16.27026.1 for x64
Copyright (C) Microsoft Corporation.  All rights reserved.

ConsoleApplication1.cpp

C:\Users\aballman.GRAMMATECH\source\repos\ConsoleApplication1\ConsoleApplication1>dumpbin /symbols ConsoleApplication1.obj | grep External
008 00000000 SECT3  notype       External     | x
009 00000004 UNDEF  notype       External     | y
00A 00000004 SECT3  notype       External     | z
00D 00000000 SECT4  notype ()    External     | main

After commenting out the declaration and use of y and recompiling in C++ mode:

C:\Users\aballman.GRAMMATECH\source\repos\ConsoleApplication1\ConsoleApplication1>dumpbin /symbols ConsoleApplication1.obj | grep External
008 00000000 SECT3  notype       External     | ?z@@3HB (int const z)
00B 00000000 SECT4  notype ()    External     | main

test/Sema/dllexport-1.cpp

3

Can remove some extra whitespace before -fsyntax-only (same is true in the other test as well).

[zahiraam]

In D45978#1387385, @aaron.ballman wrote:

Can you add tests for C mode as well, as it seems the behavior differs there.

Aaron,

Let me know if that is enough. Thanks.

[aaron.ballman]

It looks like the patch got mucked up somehow, I only see three testing files in the patch now?

test/Sema/dllexport.c

168 ↗

(On Diff #185920)

Nothing runs FileCheck in this test, so this isn't checking anything. That should be tested within CodeGen instead.

[zahiraam]

In D45978#1392855, @aaron.ballman wrote:

It looks like the patch got mucked up somehow, I only see three testing files in the patch now?

Oops! Sorry about that.

[aaron.ballman]

test/Sema/dllexport-1.c

1–4 ↗

(On Diff #186275)

This test should live in CodeGen not Sema.

8 ↗

(On Diff #186275)

Are x and z also exported as expected?

test/Sema/dllexport-1.cpp

5

This test has no FileCheck line.

The goal here is for the tests in Sema to test the semantic behavior (that warnings are issued when expected and not issued when not expected) and to add tests in CodeGen to test the generated code (are things properly exported, are things we don't expect to be exported not exported, etc). I think you should split your tests accordingly rather than try to verify too much at once.

[zahiraam]

test/Sema/dllexport-1.c

8 ↗

(On Diff #186275)

Only x and y are exported.

@x = dso_local dllexport constant i32 3, align 4
@z = dso_local constant i32 4, align 4
@y = common dso_local dllexport global i32 0, align 4

But then if I take this simple case:
extern int const z = 4;

int main() {

int a = z + 2;
return a;

}
ksh-3.2$ clang -c test3.c
test3.c:1:18: warning: 'extern' variable has an initializer [-Wextern-initializer]
extern int const z = 4;

^

1 warning generated.
ksh-3.2$ dumpbin /symbols test3.o | grep External
00F 00000000 SECT1 notype () External | main
010 00000000 SECT5 notype External | z
ksh-3.2$
When emitting the IR, z is declared as a local constant (not exported):
@z = dso_local constant i32 4, align 4

[aaron.ballman]

test/Sema/dllexport-1.c

1 ↗

(On Diff #186275)

Do we need this many RUN lines? Also, why the different language modes? Also, do you need to use < in the command?

8 ↗

(On Diff #186275)

Okay, please add the expected CHECK lines for x and z to the test. Thank you for clarifying!

test/Sema/dllexport-1.cpp

3

I don't think we need this RUN line. I don't know if we need the triple in the previous RUN line either.

5

This CHECK line still has no impact; I think it should be removed from the test.

test/Sema/dllexport-2.cpp

3

I don't think we need this RUN line. I don't know if we need the triple in the previous RUN line either.

[aaron.ballman]

Oops, sorry, I think I added some comments to a previous revision of the review. To recap:

1. Remove the CHECK line from test/Sema/dllexport-1.cpp
2. Remove the second RUN line from test/Sema/dllexport-1.cpp and test/Sema/dllexport-2.cpp
3. Possibly remove the triples from the RUN line in test/Sema/dllexport-1.cpp and test/Sema/dllexport-2.cpp

[zahiraam]

[aaron.ballman]

LGTM!

[thakis]

lib/Sema/SemaDecl.cpp

11393

Even in unnamed namespaces?

[aaron.ballman]

lib/Sema/SemaDecl.cpp

11393

That would definitely be good to test.

[zahiraam]

lib/Sema/SemaDecl.cpp

11393

It looks like not.

ksh-3.2$ cat test4.cpp
namespace {
__declspec(dllexport) int const x = 3;
}

int main ()
{

int y = x + 10;

return y;

}

ksh-3.2$ cl -c test4.cpp
Microsoft (R) C/C++ Optimizing Compiler Version 19.00.24210 for x64
Copyright (C) Microsoft Corporation. All rights reserved.

test4.cpp
ksh-3.2$ dumpbin /symbols test4.obj | grep External
008 00000000 SECT3 notype () External | main
ksh-3.2$

ksh-3.2$ clang -c test4.cpp
test4.cpp:2:33: error: '(anonymous namespace)::x' must have external linkage when declared 'dllexport'
__declspec(dllexport) int const x = 3;

^

1 error generated.
ksh-3.2$

So the diag shouldn't go off when the variable is in an anonymous namespace? Do you agree?

[aaron.ballman]

lib/Sema/SemaDecl.cpp

11393

So the diag shouldn't go off when the variable is in an anonymous namespace? Do you agree?

Correct.

test/Sema/dllexport-2.cpp

6

Another test I'd like to see is using a typedef to apply the const qualification. e.g.,

typedef const int CInt;
__declspec(dllexport) CInt j2;
__declspec(dllexport) CInt j3 = 3;

We should match the MSVC behavior here as well (I wonder if your use of isLocalConstQualified() should actually be isConstQualified() instead).

[zahiraam]

Let's see if I have included every thing mentioned. Thanks.

[aaron.ballman]

lib/Sema/SemaDecl.cpp

5979–5984

s/NULL/nullptr

Also, I think this should be const NamespaceDecl *.

5981

Does only the immediate declaration context matter? How is this handled?

namespace {
namespace named {
  __declspec(dllexport) int const x = 3; 
}
}

5983–5985

This used to unconditionally warn, but now has predicates -- should this still warn when not in MSVC mode?

[aaron.ballman]

lib/Sema/SemaDecl.cpp

5979–5984

This can be lowered into the below if statement.

5980–5981

is -> Is per our naming convention rules.

5986

No need to test that NS is nonnull here; already done as part of the while loop predicate. Also, you can call NamespaceDecl::isAnonymousNamespace() rather than manually try to test the declared identifier.

I think a more clear way to write this is:

if (VD) {
  const NamespaceDecl *NS = dyn_cast<NamespaceDecl>(VD->getDeclContext());
  while (NS && !IsAnonymousNS) {
    IsAnonymousNS = NS->isAnonymousNamespace();
    NS = dyn_cast<NamespaceDecl>(NS->getParent());
  }
  ...
}

5991–5993

This is a pretty complicated predicate; I'd simplify it a bit and then add some comments to explain it further. The comments from line 5967 could move down here (with modification), in fact. Untested:

bool AnonNSInMicrosoftMode = IsAnonymous && IsMicrosoft;
if ((ND.isExternallyVisible() && AnonNSInMicrosoftMode) ||
    (!AnonNSInMicrosoftMode &&
     (!ND.isExternallyVisible() || VD->isStaticLocal()))) {
  ...
}

test/Sema/dllexport-1.cpp

8

I am almost certain that expected-no-diagnostics applies to the entire file, so the @ doesn't make sense. I think you just need one of these for the entire file:

#ifdef MSVC
// expected-no-diagnostics
#endif

(Note, I switched it to use #ifdef as well.)

test/Sema/dllexport-2.cpp

7

Please switch to #ifdef rather than #if.

29

This isn't correct -- had the typo not been there, then the test would have failed because the file has diagnostics in MSVC mode. This should read:

#ifndef MSVC
// expected-warning@+2 {{__declspec attribute 'dllexport' is not supported}}
#endif

test/SemaCXX/dllexport.cpp

74

Typo, but this is the wrong construct. Should be:

#ifndef MS
namespace {
  __declspec(dllexport) int InternalGlobal; // expected-error{{anonymous namespace)::InternalGlobal' must have external linkage when declared 'dllexport'}}
}
#endif

131

Similar here as above.

test/SemaCXX/dllimport.cpp

126

Here too.

220

And here.

[zahiraam]

lib/Sema/SemaDecl.cpp

5983–5985

Please see new version of code.

[aaron.ballman]

I think we're pretty close! Some of the testing code can be cleaned up, but I could also use some help verifying that we're correctly matching the behavior of GCC as well.

test/Sema/dllexport-2.cpp

11

I think the pattern to be used here is:

#ifdef MSVC
// expected-error@+4 {{'j' must have external linkage when declared 'dllexport'}}
#else
// expected-warning@+2 {{__declspec attribute 'dllexport' is not supported}}
#endif
__declspec(dllexport) int const j; // expected-error {{default initialization of an object of const type 'const int'}}

25

Same here as above.

test/SemaCXX/dllexport.cpp

72–74

I don't have a copy of mingw handy -- can you test that this behavior matches the behavior when targeting mingw32 with GCC? Might also be a good idea to test cygwin as a target as well. I would have thought that they would behave the same as MSVC, but I can't easily test it myself.

129

Same question here as above.

test/SemaCXX/dllimport.cpp

124

Likewise here.

218

and here

[zahiraam]

test/SemaCXX/dllexport.cpp

72–74

Tested it with a set of combinations. The test is passing...

[aaron.ballman]

LGTM!

[zahiraam]

In D45978#1431057, @aaron.ballman wrote:

LGTM!

Would you mind committing the changes please? Thanks.

[aaron.ballman]

Would you mind committing the changes please? Thanks.

Happy to do so! I've committed in r356458.

lib/Sema/SemaDecl.cpp

if (SelectAnyAttr *Attr = ND.getAttr<SelectAnyAttr>()) {
     if (isa<FunctionDecl>(ND) || !ND.isExternallyVisible()) {
       S.Diag(Attr->getLocation(),
              diag::err_attribute_selectany_non_extern_data);
       ND.dropAttr<SelectAnyAttr>();
     }
   }
 
   if (const InheritableAttr *Attr = getDLLAttr(&ND)) {
+    auto *VD = dyn_cast<VarDecl>(&ND);
+    bool IsAnonymousNS = false;
+    bool IsMicrosoft = S.Context.getTargetInfo().getCXXABI().isMicrosoft();
+    if (VD) {
+      const NamespaceDecl *NS = dyn_cast<NamespaceDecl>(VD->getDeclContext());
+      while (NS && !IsAnonymousNS) {
+        IsAnonymousNS = NS->isAnonymousNamespace();
+        NS = dyn_cast<NamespaceDecl>(NS->getParent());
+      }
+    }
     // dll attributes require external linkage. Static locals may have external
     // linkage but still cannot be explicitly imported or exported.
-    auto *VD = dyn_cast<VarDecl>(&ND);
-    if (!ND.isExternallyVisible() || (VD && VD->isStaticLocal())) {
+    // In Microsoft mode, a variable defined in anonymous namespace must have
+    // external linkage in order to be exported.
+    bool AnonNSInMicrosoftMode = IsAnonymousNS && IsMicrosoft;
+    if ((ND.isExternallyVisible() && AnonNSInMicrosoftMode) ||
+        (!AnonNSInMicrosoftMode &&
+         (!ND.isExternallyVisible() || (VD && VD->isStaticLocal())))) {
       S.Diag(ND.getLocation(), diag::err_attribute_dll_not_extern)
         << &ND << Attr;
       ND.setInvalidDecl();
     }
   }
 
   // Virtual functions cannot be marked as 'notail'.
   if (auto *Attr = ND.getAttr<NotTailCalledAttr>())
     if (auto *MD = dyn_cast<CXXMethodDecl>(&ND))
       if (MD->isVirtual()) {
         S.Diag(ND.getLocation(),
                diag::err_invalid_attribute_on_virtual_function)
             << Attr;
         ND.dropAttr<NotTailCalledAttr>();
       }
 
   // Check the attributes on the function type, if any.
if (VDecl->isLocalVarDecl()) {
     // C++ rules.
     if (VDecl->getStorageClass() == SC_Extern &&
         ((!getLangOpts().CPlusPlus && !VDecl->hasAttr<SelectAnyAttr>()) ||
          !Context.getBaseElementType(VDecl->getType()).isConstQualified()) &&
         !(getLangOpts().CPlusPlus && VDecl->isExternC()) &&
         !isTemplateInstantiation(VDecl->getTemplateSpecializationKind()))
       Diag(VDecl->getLocation(), diag::warn_extern_init);
 
+    // In Microsoft C++ mode, a const variable defined in namespace scope has
+    // external linkage by default if the variable is declared with
+    // __declspec(dllexport).
+    if (Context.getTargetInfo().getCXXABI().isMicrosoft() &&
+        getLangOpts().CPlusPlus && VDecl->getType().isConstQualified() &&
+        VDecl->hasAttr<DLLExportAttr>() && VDecl->getDefinition())
+      VDecl->setStorageClass(SC_Extern);
+
     // C99 6.7.8p4. All file scoped initializers need to be constant.
     if (!getLangOpts().CPlusPlus && !VDecl->isInvalidDecl())
       CheckForConstantInitializer(Init, DclT);
   }
 
   // We will represent direct-initialization similarly to copy-initialization:
   //    int x(1);  -as-> int x = 1;
   //    ClassType x(a,b,c); -as-> ClassType x = ClassType(a,b,c);

test/CodeGen/dllexport-1.c

+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -emit-llvm -fms-extensions -Wno-ignored-attributes -Wno-extern-initializer -o - %s | FileCheck %s -check-prefix CHECK-LNX
+// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -emit-llvm -fms-extensions -o - -DMSVC %s | FileCheck %s -check-prefix CHECK-MSVC
+
+// Export const variable.
+
+// CHECK-MSVC: @x = dso_local dllexport constant i32 3, align 4
+// CHECK-LNX: @x = constant i32 3, align 4
+
+// CHECK-MSVC: @z = dso_local constant i32 4, align 4
+// CHECK-LNX: @z = constant i32 4, align 4
+
+// CHECK-MSVC: @y = common dso_local dllexport global i32 0, align 4
+// CHECK-LNX: @y = common global i32 0, align 4
+
+__declspec(dllexport) int const x = 3;
+__declspec(dllexport) const int y;
+
+// expected-warning@+1 {{'extern' variable has an initializer}}
+extern int const z = 4;
+
+int main() {
+  int a = x + y + z;
+  return a;
+}

test/Sema/dllexport-1.cpp

+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fsyntax-only -fms-extensions -verify %s
+// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -fsyntax-only -fms-extensions -verify %s  -DMSVC
+
+// Export const variable initialization.
+
+#ifdef MSVC
+// expected-no-diagnostics
+#endif
+
+#ifndef MSVC
+// expected-warning@+2 {{__declspec attribute 'dllexport' is not supported}}
+#endif
+__declspec(dllexport) int const x = 3;
+
+namespace {
+namespace named {
+#ifndef MSVC
+// expected-warning@+2 {{__declspec attribute 'dllexport' is not supported}}
+#endif
+__declspec(dllexport) int const x = 3;
+}
+} // namespace
+
+namespace named1 {
+namespace {
+namespace named {
+#ifndef MSVC
+// expected-warning@+2 {{__declspec attribute 'dllexport' is not supported}}
+#endif
+__declspec(dllexport) int const x = 3;
+}
+} // namespace
+} // namespace named1

test/Sema/dllexport-2.cpp

+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fsyntax-only -fms-extensions -verify %s
+// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -fsyntax-only -fms-extensions -verify %s -DMSVC
+
+// Export const variable.
+
+#ifdef MSVC
+// expected-error@+6 {{default initialization of an object of const type 'const int'}}
+// expected-error@+5 {{'j' must have external linkage when declared 'dllexport'}}
+#else
+// expected-warning@+3 {{__declspec attribute 'dllexport' is not supported}}
+// expected-error@+2 {{default initialization of an object of const type}}
+#endif
+__declspec(dllexport) int const j;
+
+// With typedef
+typedef const int CInt;
+
+#ifdef MSVC
+// expected-error@+6 {{default initialization of an object of const type 'CInt' (aka 'const int')}}
+// expected-error@+5 {{'j2' must have external linkage when declared 'dllexport'}}
+#else
+// expected-warning@+3 {{__declspec attribute 'dllexport' is not supported}}
+// expected-error@+2 {{default initialization of an object of const type 'CInt'}}
+#endif
+__declspec(dllexport) CInt j2;
+
+#ifndef MSVC
+// expected-warning@+2 {{__declspec attribute 'dllexport' is not supported}}
+#endif
+__declspec(dllexport) CInt j3 = 3;

test/SemaCXX/dllexport.cpp

 extern "C" {
                       extern int GlobalRedecl4; // expected-note{{previous declaration is here}}
 __declspec(dllexport) extern int GlobalRedecl4; // expected-warning{{redeclaration of 'GlobalRedecl4' should not add 'dllexport' attribute}}
 }
 
 // External linkage is required.
 __declspec(dllexport) static int StaticGlobal; // expected-error{{'StaticGlobal' must have external linkage when declared 'dllexport'}}
 __declspec(dllexport) Internal InternalTypeGlobal; // expected-error{{'InternalTypeGlobal' must have external linkage when declared 'dllexport'}}
+#ifndef MS
 namespace    { __declspec(dllexport) int InternalGlobal; } // expected-error{{'(anonymous namespace)::InternalGlobal' must have external linkage when declared 'dllexport'}}
+#endif
 namespace ns { __declspec(dllexport) int ExternalGlobal; }
 
 __declspec(dllexport) auto InternalAutoTypeGlobal = Internal(); // expected-error{{'InternalAutoTypeGlobal' must have external linkage when declared 'dllexport'}}
 __declspec(dllexport) auto ExternalAutoTypeGlobal = External();
 
 // Thread local variables are invalid.
 __declspec(dllexport) __thread int ThreadLocalGlobal; // expected-error{{'ThreadLocalGlobal' cannot be thread local when declared 'dllexport'}}
 // But a static local TLS var in an export function is OK.

 template<typename T>                              int VarTmplRedecl2 = 1;
 
 template<typename T>                       extern int VarTmplRedecl3; // expected-note{{previous declaration is here}}
 template<typename T> __declspec(dllexport) extern int VarTmplRedecl3; // expected-error{{redeclaration of 'VarTmplRedecl3' cannot add 'dllexport' attribute}}
 
 // External linkage is required.
 template<typename T> __declspec(dllexport) static int StaticVarTmpl; // expected-error{{'StaticVarTmpl' must have external linkage when declared 'dllexport'}}
 template<typename T> __declspec(dllexport) Internal InternalTypeVarTmpl; // expected-error{{'InternalTypeVarTmpl' must have external linkage when declared 'dllexport'}}
+#ifndef MS
 namespace    { template<typename T> __declspec(dllexport) int InternalVarTmpl; } // expected-error{{'(anonymous namespace)::InternalVarTmpl' must have external linkage when declared 'dllexport'}}
+#endif
 namespace ns { template<typename T> __declspec(dllexport) int ExternalVarTmpl = 1; }
 
 template<typename T> __declspec(dllexport) auto InternalAutoTypeVarTmpl = Internal(); // expected-error{{'InternalAutoTypeVarTmpl' must have external linkage when declared 'dllexport'}}
 template<typename T> __declspec(dllexport) auto ExternalAutoTypeVarTmpl = External();
 template External ExternalAutoTypeVarTmpl<ExplicitInst_Exported>;
 
 
 template<typename T> int VarTmpl = 1;

test/SemaCXX/dllimport.cpp

 extern "C" {
                       extern int GlobalRedecl5; // expected-note{{previous declaration is here}}
 __declspec(dllimport) extern int GlobalRedecl5; // expected-warning{{redeclaration of 'GlobalRedecl5' should not add 'dllimport' attribute}}
 }
 
 // External linkage is required.
 __declspec(dllimport) static int StaticGlobal; // expected-error{{'StaticGlobal' must have external linkage when declared 'dllimport'}}
 __declspec(dllimport) Internal InternalTypeGlobal; // expected-error{{'InternalTypeGlobal' must have external linkage when declared 'dllimport'}}
+#ifndef MS
 namespace    { __declspec(dllimport) int InternalGlobal; } // expected-error{{'(anonymous namespace)::InternalGlobal' must have external linkage when declared 'dllimport'}}
+#endif
 namespace ns { __declspec(dllimport) int ExternalGlobal; }
 
 __declspec(dllimport) auto InternalAutoTypeGlobal = Internal(); // expected-error{{'InternalAutoTypeGlobal' must have external linkage when declared 'dllimport'}}
                                                                 // expected-error@-1{{definition of dllimport data}}
 
 // Thread local variables are invalid.
 __declspec(dllimport) __thread int ThreadLocalGlobal; // expected-error{{'ThreadLocalGlobal' cannot be thread local when declared 'dllimport'}}
 // This doesn't work on MinGW, because there, dllimport on the inline function is ignored.

 template<typename T>                       extern int VarTmplRedecl3; // expected-warning{{'VarTmplRedecl3' redeclared without 'dllimport' attribute: previous 'dllimport' ignored}}
 
 template<typename T>                       extern int VarTmplRedecl4; // expected-note{{previous declaration is here}}
 template<typename T> __declspec(dllimport) extern int VarTmplRedecl4; // expected-error{{redeclaration of 'VarTmplRedecl4' cannot add 'dllimport' attribute}}
 
 // External linkage is required.
 template<typename T> __declspec(dllimport) static int StaticVarTmpl; // expected-error{{'StaticVarTmpl' must have external linkage when declared 'dllimport'}}
 template<typename T> __declspec(dllimport) Internal InternalTypeVarTmpl; // expected-error{{'InternalTypeVarTmpl' must have external linkage when declared 'dllimport'}}
+#ifndef MS
 namespace    { template<typename T> __declspec(dllimport) int InternalVarTmpl; } // expected-error{{'(anonymous namespace)::InternalVarTmpl' must have external linkage when declared 'dllimport'}}
+#endif
 namespace ns { template<typename T> __declspec(dllimport) int ExternalVarTmpl; }
 
 template<typename T> __declspec(dllimport) auto InternalAutoTypeVarTmpl = Internal(); // expected-error{{definition of dllimport data}} // expected-error{{'InternalAutoTypeVarTmpl' must have external linkage when declared 'dllimport'}}
 
 
 template<typename T> int VarTmpl;
 template<typename T> __declspec(dllimport) int ImportedVarTmpl;