commit 7655381aa1f27729966c16b16599fba802dacec1
author Richard Smith <richard-llvm@metafoo.co.uk> Wed Jul 01 07:24:18 2015 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Wed Jul 01 07:24:18 2015 +0000
tree 4a735fa620254c614244e78bd8ecde31ee6a20c7
parent 6d4ed0583033169f4a83f352e6ef0bd9275e34fa

[modules] Don't require the 'inline' specifier when merging an inline function;
any source of the inline nature is sufficient.

llvm-svn: 241146

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 1dec6fc..6508d6f 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -10385,7 +10385,7 @@
   // through a deduced return type, or instantiate templates with local types.
   if (!hasVisibleDefinition(Definition) &&
       (Definition->getFormalLinkage() == InternalLinkage ||
-       Definition->isInlineSpecified() ||
+       Definition->isInlined() ||
        Definition->getDescribedFunctionTemplate() ||
        Definition->getNumTemplateParameterLists()))
     return;