maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[modules] Don't require the 'inline' specifier when merging an inline function; 

any source of the inline nature is sufficient.

llvm-svn: 241146
This commit is contained in:
Richard Smith 2015-07-01 07:24:18 +00:00
parent 6d4ed05830
commit 7655381aa1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Sema/SemaDecl.cpp
View File

@ -10385,7 +10385,7 @@ Sema::CheckForFunctionRedefinition(FunctionDecl *FD,
// through a deduced return type, or instantiate templates with local types. // through a deduced return type, or instantiate templates with local types.
if (!hasVisibleDefinition(Definition) && if (!hasVisibleDefinition(Definition) &&
(Definition->getFormalLinkage() == InternalLinkage || (Definition->getFormalLinkage() == InternalLinkage ||
Definition->isInlineSpecified() || Definition->isInlined() ||
Definition->getDescribedFunctionTemplate() || Definition->getDescribedFunctionTemplate() ||
Definition->getNumTemplateParameterLists())) Definition->getNumTemplateParameterLists()))
return; return;

6
clang/test/Modules/Inputs/submodules-merge-defs/defs.h
View File

@ -74,3 +74,9 @@ namespace FriendDefArg {
template<typename, int, template<typename> class> friend struct D; template<typename, int, template<typename> class> friend struct D;
}; };
} }
namespace SeparateInline {
inline void f();
void f() {}
constexpr int g() { return 0; }
}