Merge remote-tracking branch 'origin/master' into merge-2.096

Conflicts:
	gen/dibuilder.cpp
This commit is contained in:
Martin Kinkelin 2021-04-10 15:57:21 +02:00
commit f39371a32d
8 changed files with 214 additions and 207 deletions

View file

@ -1244,8 +1244,8 @@ void DtoDefineFunction(FuncDeclaration *fd, bool linkageAvailableExternally) {
emitDMDStyleFunctionTrace(*gIR, fd, funcGen);
}
// disable frame-pointer-elimination for functions with inline asm
if (fd->hasReturnExp & 8) // has inline asm
// disable frame-pointer-elimination for functions with DMD-style inline asm
if (fd->hasReturnExp & 32)
{
#if LDC_LLVM_VER >= 800
func->addFnAttr(