mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-06 10:57:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3832 from kinke/fix_compilability

Browse source 
Fix little compilability regression
This commit is contained in:
Martin Kinkelin 2021-09-18 02:39:40 +02:00 • committed by GitHub
parent 88d8a2f856
commit 406e469e99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
driver/codegenerator.cpp
View file

@ -152,8 +152,8 @@ void emitLLVMUsedArray(IRState &irs) {
llvmUsed->setSection("llvm.metadata"); llvmUsed->setSection("llvm.metadata");
} }
bool inlineAsmDiagnostic(IRState* irs,const llvm::SMDiagnostic &d, unsigned locCookie) bool inlineAsmDiagnostic(IRState *irs, const llvm::SMDiagnostic &d,
{ unsigned locCookie) {
if (!locCookie) { if (!locCookie) {
d.print(nullptr, llvm::errs()); d.print(nullptr, llvm::errs());
return true; return true;

16
ir/irfunction.cpp
View file

@ -29,25 +29,13 @@ IrFunction::IrFunction(FuncDeclaration *fd)
} }
void IrFunction::setNeverInline() { void IrFunction::setNeverInline() {
assert(!func->getAttributes() assert(!func->hasFnAttribute(llvm::Attribute::AlwaysInline) &&
#if LDC_LLVM_VER < 1400
.hasAttribute(LLAttributeList::FunctionIndex,
#else
.hasFnAttr(
#endif
llvm::Attribute::AlwaysInline) &&
"function can't be never- and always-inline at the same time"); "function can't be never- and always-inline at the same time");
func->addFnAttr(llvm::Attribute::NoInline); func->addFnAttr(llvm::Attribute::NoInline);
} }
void IrFunction::setAlwaysInline() { void IrFunction::setAlwaysInline() {
assert(!func->getAttributes() assert(!func->hasFnAttribute(llvm::Attribute::NoInline) &&
#if LDC_LLVM_VER < 1400
.hasAttribute(LLAttributeList::FunctionIndex,
#else
.hasFnAttr(
#endif
llvm::Attribute::NoInline) &&
"function can't be never- and always-inline at the same time"); "function can't be never- and always-inline at the same time");
func->addFnAttr(llvm::Attribute::AlwaysInline); func->addFnAttr(llvm::Attribute::AlwaysInline);
} }