diff options
| author | David Blaikie <dblaikie@gmail.com> | 2013-03-13 22:52:59 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2013-03-13 22:52:59 +0000 |
| commit | aabfe4f997105e62435aa70fe0397627413c4c98 (patch) | |
| tree | 5a38ac34f246bb178a63e171b6afca95b506df1b | |
| parent | 0c27cb7fa1d6b0970b8c7f9a63b23adaea074f46 (diff) | |
| download | bcm5719-llvm-aabfe4f997105e62435aa70fe0397627413c4c98.tar.gz bcm5719-llvm-aabfe4f997105e62435aa70fe0397627413c4c98.zip | |
Simplify file/directory name handling in DILexicalBlock
llvm-svn: 176993
| -rw-r--r-- | llvm/include/llvm/DebugInfo.h | 6 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/llvm/include/llvm/DebugInfo.h b/llvm/include/llvm/DebugInfo.h index c1b5813ff94..47ac050c9f5 100644 --- a/llvm/include/llvm/DebugInfo.h +++ b/llvm/include/llvm/DebugInfo.h @@ -621,12 +621,10 @@ namespace llvm { unsigned getLineNumber() const { return getUnsignedField(2); } unsigned getColumnNumber() const { return getUnsignedField(3); } StringRef getDirectory() const { - StringRef dir = getFieldAs<DIFile>(4).getDirectory(); - return !dir.empty() ? dir : getContext().getDirectory(); + return getFieldAs<DIFile>(4).getDirectory(); } StringRef getFilename() const { - StringRef filename = getFieldAs<DIFile>(4).getFilename(); - return !filename.empty() ? filename : getContext().getFilename(); + return getFieldAs<DIFile>(4).getFilename(); } bool Verify() const; }; diff --git a/llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll b/llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll index 0ceec5c9766..43a7d72307a 100644 --- a/llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll +++ b/llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll @@ -55,9 +55,9 @@ declare void @llvm.dbg.value(metadata, i64, metadata) nounwind readnone !24 = metadata !{i32 786468, metadata !1, metadata !"char", metadata !1, i32 0, i64 8, i64 8, i64 0, i32 0, i32 6} ; [ DW_TAG_base_type ] !25 = metadata !{i32 786689, metadata !19, metadata !"argv", metadata !1, i32 22, metadata !22, i32 0, null} ; [ DW_TAG_arg_variable ] !26 = metadata !{i32 786688, metadata !27, metadata !"e", metadata !1, i32 23, metadata !14, i32 0, null} ; [ DW_TAG_auto_variable ] -!27 = metadata !{i32 786443, metadata !19, i32 22, i32 0} ; [ DW_TAG_lexical_block ] +!27 = metadata !{i32 786443, metadata !19, i32 22, i32 0, metadata !1, i32 0} ; [ DW_TAG_lexical_block ] !28 = metadata !{i32 18, i32 0, metadata !29, null} -!29 = metadata !{i32 786443, metadata !9, i32 17, i32 0} ; [ DW_TAG_lexical_block ] +!29 = metadata !{i32 786443, metadata !9, i32 17, i32 0, metadata !1, i32 1} ; [ DW_TAG_lexical_block ] !30 = metadata !{i32 19, i32 0, metadata !29, null} ; The variable bar:myvar changes registers after the first movq. |
