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-06-04 19:07:28 +02:00
commit 45ec6a0512
5 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gen/dibuilder.cpp
View file

@ -776,7 +776,7 @@ void ldc::DIBuilder::EmitFuncStart(FuncDeclaration *fd)
LOG_SCOPE;
assert(static_cast<llvm::MDNode *>(getIrFunc(fd)->diSubprogram) != 0);
EmitStopPoint(fd->loc.linnum);
EmitStopPoint(fd->loc);
}
void ldc::DIBuilder::EmitFuncEnd(FuncDeclaration *fd)
@ -788,7 +788,7 @@ void ldc::DIBuilder::EmitFuncEnd(FuncDeclaration *fd)
LOG_SCOPE;
assert(static_cast<llvm::MDNode *>(getIrFunc(fd)->diSubprogram) != 0);
EmitStopPoint(fd->endloc.linnum);
EmitStopPoint(fd->endloc);
}
void ldc::DIBuilder::EmitBlockStart(Loc& loc)
@ -809,7 +809,7 @@ void ldc::DIBuilder::EmitBlockStart(Loc& loc)
#endif
);
IR->func()->diLexicalBlocks.push(block);
EmitStopPoint(loc.linnum);
EmitStopPoint(loc);
}
void ldc::DIBuilder::EmitBlockEnd()
@ -825,15 +825,14 @@ void ldc::DIBuilder::EmitBlockEnd()
fn->diLexicalBlocks.pop();
}
void ldc::DIBuilder::EmitStopPoint(unsigned ln)
void ldc::DIBuilder::EmitStopPoint(Loc& loc)
{
if (!global.params.symdebug)
return;
Logger::println("D to dwarf stoppoint at line %u", ln);
Logger::println("D to dwarf stoppoint at line %u, column %u", loc.linnum, loc.charnum);
LOG_SCOPE;
llvm::DebugLoc loc = llvm::DebugLoc::get(ln, 0, GetCurrentScope());
IR->ir->SetCurrentDebugLocation(loc);
IR->ir->SetCurrentDebugLocation(llvm::DebugLoc::get(loc.linnum, loc.charnum, GetCurrentScope()));
}
void ldc::DIBuilder::EmitValue(llvm::Value *val, VarDeclaration *vd)