mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-02 08:01:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into merge-2.067

Browse source
This commit is contained in:
Kai Nacke 2015-05-23 23:53:36 +02:00
commit ccd8dd06c5
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gen/functions.cpp
View file

@ -731,7 +731,7 @@ static llvm::GlobalValue::LinkageTypes lowerFuncLinkage(FuncDeclaration* fdecl)
// Generated array op functions behave like templates in that they might be
// emitted into many different modules.
if (fdecl->isArrayOp && !isDruntimeArrayOp(fdecl))
if (fdecl->isArrayOp && (willInline() || !isDruntimeArrayOp(fdecl)))
return templateLinkage;
// A body-less declaration always needs to be marked as external in LLVM
@ -780,7 +780,7 @@ void DtoDefineFunction(FuncDeclaration* fd)
}
// Skip array ops implemented in druntime
if (fd->isArrayOp && isDruntimeArrayOp(fd))
if (fd->isArrayOp && !willInline() && isDruntimeArrayOp(fd))
{
IF_LOG Logger::println("No code generation for array op %s implemented in druntime", fd->toChars());
fd->ir.setDefined();