[llvm] r193361 - DIEHash: Do not use shallow type hashing for unnamed types
David Blaikie
dblaikie at gmail.com
Thu Oct 24 10:53:58 PDT 2013
Author: dblaikie
Date: Thu Oct 24 12:53:58 2013
New Revision: 193361
URL: http://llvm.org/viewvc/llvm-project?rev=193361&view=rev
Log:
DIEHash: Do not use shallow type hashing for unnamed types
Modified:
llvm/trunk/lib/CodeGen/AsmPrinter/DIEHash.cpp
llvm/trunk/unittests/CodeGen/DIEHashTest.cpp
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DIEHash.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DIEHash.cpp?rev=193361&r1=193360&r2=193361&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DIEHash.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DIEHash.cpp Thu Oct 24 12:53:58 2013
@@ -242,10 +242,12 @@ void DIEHash::hashDIEEntry(dwarf::Attrib
// there's a decl/def difference in the containing type of a
// ptr_to_member_type, but it's what DWARF says, for some reason.
Attribute == dwarf::DW_AT_type) {
- // [FIXME] ... has a DW_AT_name attribute,
- hashShallowTypeReference(Attribute, Entry,
- getDIEStringAttr(Entry, dwarf::DW_AT_name));
- return;
+ // ... has a DW_AT_name attribute,
+ StringRef Name = getDIEStringAttr(Entry, dwarf::DW_AT_name);
+ if (!Name.empty()) {
+ hashShallowTypeReference(Attribute, Entry, Name);
+ return;
+ }
}
unsigned &DieNumber = Numbering[&Entry];
Modified: llvm/trunk/unittests/CodeGen/DIEHashTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/CodeGen/DIEHashTest.cpp?rev=193361&r1=193360&r2=193361&view=diff
==============================================================================
--- llvm/trunk/unittests/CodeGen/DIEHashTest.cpp (original)
+++ llvm/trunk/unittests/CodeGen/DIEHashTest.cpp Thu Oct 24 12:53:58 2013
@@ -442,4 +442,39 @@ TEST(DIEHashTest, PtrToMemberDeclDefMisM
// and a definition in another.
ASSERT_NE(MD5ResDef, MD5ResDecl);
}
+
+// struct { } a;
+// struct foo { decltype(a) mem; };
+TEST(DIEHashTest, RefUnnamedType) {
+ DIEInteger Zero(0);
+ DIEInteger One(1);
+ DIEInteger Eight(8);
+ DIEString FooStr(&Zero, "foo");
+ DIEString MemStr(&Zero, "mem");
+
+ DIE Unnamed(dwarf::DW_TAG_structure_type);
+ Unnamed.addValue(dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, &One);
+
+ DIE Foo(dwarf::DW_TAG_structure_type);
+ Foo.addValue(dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, &Eight);
+ Foo.addValue(dwarf::DW_AT_name, dwarf::DW_FORM_strp, &FooStr);
+
+ DIE *Mem = new DIE(dwarf::DW_TAG_member);
+ Mem->addValue(dwarf::DW_AT_name, dwarf::DW_FORM_strp, &MemStr);
+ Mem->addValue(dwarf::DW_AT_data_member_location, dwarf::DW_FORM_data1, &Zero);
+
+ DIE UnnamedPtr(dwarf::DW_TAG_pointer_type);
+ UnnamedPtr.addValue(dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, &Eight);
+ DIEEntry UnnamedRef(&Unnamed);
+ UnnamedPtr.addValue(dwarf::DW_AT_type, dwarf::DW_FORM_ref4, &UnnamedRef);
+
+ DIEEntry UnnamedPtrRef(&UnnamedPtr);
+ Mem->addValue(dwarf::DW_AT_type, dwarf::DW_FORM_ref4, &UnnamedPtrRef);
+
+ Foo.addChild(Mem);
+
+ uint64_t MD5Res = DIEHash().computeTypeSignature(&Foo);
+
+ ASSERT_EQ(0x954e026f01c02529ULL, MD5Res);
+}
}
More information about the llvm-commits
mailing list