@@ -8935,8 +8935,7 @@ Sema::CheckSpecializationInstantiationRedecl(SourceLocation NewLoc,
8935
8935
// The declaration itself has not actually been instantiated, so it is
8936
8936
// still okay to specialize it.
8937
8937
StripImplicitInstantiation (
8938
- PrevDecl,
8939
- Context.getTargetInfo ().getTriple ().isWindowsGNUEnvironment ());
8938
+ PrevDecl, Context.getTargetInfo ().getTriple ().isOSCygMing ());
8940
8939
return false ;
8941
8940
}
8942
8941
// Fall through
@@ -9804,7 +9803,7 @@ DeclResult Sema::ActOnExplicitInstantiation(
9804
9803
: TSK_ExplicitInstantiationDeclaration;
9805
9804
9806
9805
if (TSK == TSK_ExplicitInstantiationDeclaration &&
9807
- !Context.getTargetInfo ().getTriple ().isWindowsGNUEnvironment ()) {
9806
+ !Context.getTargetInfo ().getTriple ().isOSCygMing ()) {
9808
9807
// Check for dllexport class template instantiation declarations,
9809
9808
// except for MinGW mode.
9810
9809
for (const ParsedAttr &AL : Attr) {
@@ -9869,7 +9868,7 @@ DeclResult Sema::ActOnExplicitInstantiation(
9869
9868
= PrevDecl ? PrevDecl->getTemplateSpecializationKind () : TSK_Undeclared;
9870
9869
9871
9870
if (TSK == TSK_ExplicitInstantiationDefinition && PrevDecl != nullptr &&
9872
- Context.getTargetInfo ().getTriple ().isWindowsGNUEnvironment ()) {
9871
+ Context.getTargetInfo ().getTriple ().isOSCygMing ()) {
9873
9872
// Check for dllexport class template instantiation definitions in MinGW
9874
9873
// mode, if a previous declaration of the instantiation was seen.
9875
9874
for (const ParsedAttr &AL : Attr) {
@@ -10038,7 +10037,7 @@ DeclResult Sema::ActOnExplicitInstantiation(
10038
10037
// In MinGW mode, export the template instantiation if the declaration
10039
10038
// was marked dllexport.
10040
10039
if (PrevDecl_TSK == TSK_ExplicitInstantiationDeclaration &&
10041
- Context.getTargetInfo ().getTriple ().isWindowsGNUEnvironment () &&
10040
+ Context.getTargetInfo ().getTriple ().isOSCygMing () &&
10042
10041
PrevDecl->hasAttr <DLLExportAttr>()) {
10043
10042
dllExportImportClassTemplateSpecialization (*this , Def);
10044
10043
}
0 commit comments