[llvm-commits] CVS: llvm/lib/CodeGen/DwarfWriter.cpp MachineDebugInfo.cpp

[Jim Laskey]

Changes in directory llvm/lib/CodeGen:

DwarfWriter.cpp updated: 1.67 -> 1.68
MachineDebugInfo.cpp updated: 1.44 -> 1.45
---
Log message:

1. Support for c++ mangled names.
2. Support for private/protected class members.


---
Diffs of the changes:  (+14 -1)

 DwarfWriter.cpp      |    6 ++++++
 MachineDebugInfo.cpp |    9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)


Index: llvm/lib/CodeGen/DwarfWriter.cpp
diff -u llvm/lib/CodeGen/DwarfWriter.cpp:1.67 llvm/lib/CodeGen/DwarfWriter.cpp:1.68
--- llvm/lib/CodeGen/DwarfWriter.cpp:1.67	Fri Jun 23 07:51:53 2006
+++ llvm/lib/CodeGen/DwarfWriter.cpp	Tue Jul 11 10:58:09 2006
@@ -1383,6 +1383,12 @@
         Block->AddUInt(DW_FORM_udata, FieldOffset >> 3);
         Block->ComputeSize(*this);
         Member->AddBlock(DW_AT_data_member_location, 0, Block);
+
+        if (MemberDesc->isProtected()) {
+          Member->AddUInt(DW_AT_accessibility, 0, DW_ACCESS_protected);
+        } else if (MemberDesc->isPrivate()) {
+          Member->AddUInt(DW_AT_accessibility, 0, DW_ACCESS_private);
+        }
         
         Ty->AddChild(Member);
       }


Index: llvm/lib/CodeGen/MachineDebugInfo.cpp
diff -u llvm/lib/CodeGen/MachineDebugInfo.cpp:1.44 llvm/lib/CodeGen/MachineDebugInfo.cpp:1.45
--- llvm/lib/CodeGen/MachineDebugInfo.cpp:1.44	Tue Jun 20 14:41:06 2006
+++ llvm/lib/CodeGen/MachineDebugInfo.cpp	Tue Jul 11 10:58:09 2006
@@ -671,6 +671,7 @@
 , Size(0)
 , Align(0)
 , Offset(0)
+, Flags(0)
 {}
 
 /// ApplyToFields - Target the visitor to the fields of the TypeDesc.
@@ -685,6 +686,7 @@
   Visitor->Apply(Size);
   Visitor->Apply(Align);
   Visitor->Apply(Offset);
+  if (getVersion() > LLVMDebugVersion4) Visitor->Apply(Flags);
 }
 
 /// getDescString - Return a string used to compose global names and labels.
@@ -710,7 +712,8 @@
             << "Line(" << Line << "), "
             << "Size(" << Size << "), "
             << "Align(" << Align << "), "
-            << "Offset(" << Offset << ")\n";
+            << "Offset(" << Offset << "), "
+            << "Flags(" << Flags << ")\n";
 }
 #endif
 
@@ -1029,6 +1032,7 @@
 : AnchoredDesc(T)
 , Context(0)
 , Name("")
+, DisplayName("")
 , File(NULL)
 , Line(0)
 , TyDesc(NULL)
@@ -1043,6 +1047,7 @@
 
   Visitor->Apply(Context);
   Visitor->Apply(Name);
+  if (getVersion() > LLVMDebugVersion4) Visitor->Apply(DisplayName);
   Visitor->Apply(File);
   Visitor->Apply(Line);
   Visitor->Apply(TyDesc);
@@ -1096,6 +1101,7 @@
             << "Tag(" << getTag() << "), "
             << "Anchor(" << getAnchor() << "), "
             << "Name(\"" << getName() << "\"), "
+            << "DisplayName(\"" << getDisplayName() << "\"), "
             << "File(" << getFile() << "),"
             << "Line(" << getLine() << "),"
             << "Type(\"" << getType() << "\"), "
@@ -1148,6 +1154,7 @@
             << "Tag(" << getTag() << "), "
             << "Anchor(" << getAnchor() << "), "
             << "Name(\"" << getName() << "\"), "
+            << "DisplayName(\"" << getDisplayName() << "\"), "
             << "File(" << getFile() << "),"
             << "Line(" << getLine() << "),"
             << "Type(\"" << getType() << "\"), "