6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-15 23:31:37 +00:00
Code Issues Projects Releases Wiki Activity

Reorder the DIFile parameter in DINameSpace

Browse Source 
Moving the DIFile parameter to immediately proceed the tag so that it will be a
common prefix with other DIScopes (once the DIFile is replaced with the raw
file/directory pair).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@177492 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2013-03-20 06:27:06 +00:00
parent d73795f07e
commit 4cf132fccd
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/DebugInfo.h
View File

@ -644,13 +644,13 @@ namespace llvm {
void printInternal(raw_ostream &OS) const; void printInternal(raw_ostream &OS) const;
public: public:
explicit DINameSpace(const MDNode *N = 0) : DIScope(N) {} explicit DINameSpace(const MDNode *N = 0) : DIScope(N) {}
DIScope getContext() const { return getFieldAs<DIScope>(1); } DIScope getContext() const { return getFieldAs<DIScope>(2); }
StringRef getName() const { return getStringField(2); } StringRef getName() const { return getStringField(3); }
StringRef getDirectory() const { StringRef getDirectory() const {
return getFieldAs<DIFile>(3).getDirectory(); return getFieldAs<DIFile>(1).getDirectory();
} }
StringRef getFilename() const { StringRef getFilename() const {
return getFieldAs<DIFile>(3).getFilename(); return getFieldAs<DIFile>(1).getFilename();
} }
unsigned getLineNumber() const { return getUnsignedField(4); } unsigned getLineNumber() const { return getUnsignedField(4); }
bool Verify() const; bool Verify() const;

2
lib/IR/DIBuilder.cpp
View File

@ -975,9 +975,9 @@ DINameSpace DIBuilder::createNameSpace(DIDescriptor Scope, StringRef Name,
DIFile File, unsigned LineNo) { DIFile File, unsigned LineNo) {
Value *Elts[] = { Value *Elts[] = {
GetTagConstant(VMContext, dwarf::DW_TAG_namespace), GetTagConstant(VMContext, dwarf::DW_TAG_namespace),
File,
getNonCompileUnitScope(Scope), getNonCompileUnitScope(Scope),
MDString::get(VMContext, Name), MDString::get(VMContext, Name),
File,
ConstantInt::get(Type::getInt32Ty(VMContext), LineNo) ConstantInt::get(Type::getInt32Ty(VMContext), LineNo)
}; };
DINameSpace R(MDNode::get(VMContext, Elts)); DINameSpace R(MDNode::get(VMContext, Elts));

3
test/DebugInfo/namespace.ll
View File

@ -1,6 +1,7 @@
; RUN: llc -O0 -filetype=obj < %s > %t ; RUN: llc -O0 -filetype=obj < %s > %t
; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s ; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s
; CHECK: DW_TAG_namespace ; CHECK: DW_TAG_namespace
; CHECK-NEXT: DW_AT_name{{.*}} = "A"
; CHECK-NOT: NULL ; CHECK-NOT: NULL
; CHECK: DW_TAG_variable ; CHECK: DW_TAG_variable
; CHECK-NEXT: DW_AT_name{{.*}}= "i" ; CHECK-NEXT: DW_AT_name{{.*}}= "i"
@ -21,5 +22,5 @@
!3 = metadata !{i32 0} !3 = metadata !{i32 0}
!4 = metadata !{metadata !5} !4 = metadata !{metadata !5}
!5 = metadata !{i32 786484, i32 0, metadata !6, metadata !"i", metadata !"i", metadata !"_ZN1A1iE", metadata !1, i32 4, metadata !7, i32 0, i32 1, i32* @_ZN1A1iE, null} ; [ DW_TAG_variable ] [i] [line 4] [def] !5 = metadata !{i32 786484, i32 0, metadata !6, metadata !"i", metadata !"i", metadata !"_ZN1A1iE", metadata !1, i32 4, metadata !7, i32 0, i32 1, i32* @_ZN1A1iE, null} ; [ DW_TAG_variable ] [i] [line 4] [def]
!6 = metadata !{i32 786489, null, metadata !"A", metadata !1, i32 3} ; [ DW_TAG_namespace ] [A] [line 3] !6 = metadata !{i32 786489, metadata !1, null, metadata !"A", i32 3} ; [ DW_TAG_namespace ] [A] [line 3]
!7 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed] !7 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]