mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-03 00:20:40 +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-06-04 16:24:31 +02:00
commit fe2b9d445d
6 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gen/dibuilder.cpp
View file

@ -787,6 +787,7 @@ void ldc::DIBuilder::EmitFuncEnd(FuncDeclaration *fd)
LOG_SCOPE;
assert(static_cast<llvm::MDNode *>(getIrFunc(fd)->diSubprogram) != 0);
EmitStopPoint(fd->endloc.linnum);
}
void ldc::DIBuilder::EmitBlockStart(Loc& loc)
@ -856,10 +857,11 @@ void ldc::DIBuilder::EmitValue(llvm::Value *val, VarDeclaration *vd)
}
void ldc::DIBuilder::EmitLocalVariable(llvm::Value *ll, VarDeclaration *vd,
Type *type, bool isArtificial,
#if LDC_LLVM_VER >= 306
llvm::ArrayRef<int64_t> addr
llvm::ArrayRef<int64_t> addr
#else
llvm::ArrayRef<llvm::Value *> addr
llvm::ArrayRef<llvm::Value *> addr
#endif
)
{
@ -875,7 +877,7 @@ void ldc::DIBuilder::EmitLocalVariable(llvm::Value *ll, VarDeclaration *vd,
return; // ensure that the debug variable is created only once
// get type description
ldc::DIType TD = CreateTypeDescription(vd->type, true);
ldc::DIType TD = CreateTypeDescription(type ? type : vd->type, true);
if (static_cast<llvm::MDNode *>(TD) == 0)
return; // unsupported
@ -900,7 +902,8 @@ void ldc::DIBuilder::EmitLocalVariable(llvm::Value *ll, VarDeclaration *vd,
CreateFile(vd->loc), // file
vd->loc.linnum, // line num
TD, // type
true // preserve
true, // preserve
isArtificial ? llvm::dwarf::DW_AT_artificial : 0
);
#if LDC_LLVM_VER < 306
}