aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/AST/ASTContext.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 295489f489..52a158fdf4 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -6673,7 +6673,9 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
// always be deferred. Normal inline functions can be deferred in C99/C++.
// Implicit template instantiations can also be deferred in C++.
if (Linkage == GVA_Internal || Linkage == GVA_C99Inline ||
- Linkage == GVA_CXXInline || Linkage == GVA_TemplateInstantiation)
+ Linkage == GVA_CXXInline ||
+ (Linkage == GVA_StrongExternal && FD->isInlineSpecified()) ||
+ Linkage == GVA_TemplateInstantiation)
return false;
return true;
}