projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move function dependent resetting of a subtarget variable out of the
[oota-llvm.git]
/
lib
/
DebugInfo
/
DWARFDebugLine.cpp
diff --git
a/lib/DebugInfo/DWARFDebugLine.cpp
b/lib/DebugInfo/DWARFDebugLine.cpp
index a5261d7644ec742f6a50d09f6c95e2234534a8e3..ce87635507e169237752f217c73382ba22866f6c 100644
(file)
--- a/
lib/DebugInfo/DWARFDebugLine.cpp
+++ b/
lib/DebugInfo/DWARFDebugLine.cpp
@@
-15,6
+15,7
@@
#include <algorithm>
using namespace llvm;
using namespace dwarf;
#include <algorithm>
using namespace llvm;
using namespace dwarf;
+typedef DILineInfoSpecifier::FileLineInfoKind FileLineInfoKind;
DWARFDebugLine::Prologue::Prologue() {
clear();
DWARFDebugLine::Prologue::Prologue() {
clear();
@@
-643,13
+644,14
@@
bool DWARFDebugLine::LineTable::lookupAddressRange(
bool
DWARFDebugLine::LineTable::getFileNameByIndex(uint64_t FileIndex,
bool
DWARFDebugLine::LineTable::getFileNameByIndex(uint64_t FileIndex,
-
bool NeedsAbsoluteFilePath
,
+
FileLineInfoKind Kind
,
std::string &Result) const {
std::string &Result) const {
- if (FileIndex == 0 || FileIndex > Prologue.FileNames.size())
+ if (FileIndex == 0 || FileIndex > Prologue.FileNames.size() ||
+ Kind == FileLineInfoKind::None)
return false;
const FileNameEntry &Entry = Prologue.FileNames[FileIndex - 1];
const char *FileName = Entry.Name;
return false;
const FileNameEntry &Entry = Prologue.FileNames[FileIndex - 1];
const char *FileName = Entry.Name;
- if (
!Needs
AbsoluteFilePath ||
+ if (
Kind != FileLineInfoKind::
AbsoluteFilePath ||
sys::path::is_absolute(FileName)) {
Result = FileName;
return true;
sys::path::is_absolute(FileName)) {
Result = FileName;
return true;