summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 13ca05e)
raw | patch | inline | side by side (from parent 1: 13ca05e)
author | Adrian Prantl <aprantl@apple.com> | |
Tue, 18 Mar 2014 17:41:15 +0000 (17:41 +0000) | ||
committer | Adrian Prantl <aprantl@apple.com> | |
Tue, 18 Mar 2014 17:41:15 +0000 (17:41 +0000) |
Follow-up to r203982.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204162 91177308-0d34-0410-b5e6-96231b3b80d8
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204162 91177308-0d34-0410-b5e6-96231b3b80d8
index 87f1878e86503e3e916582db4989f313f3fd8ddb..5fb603c143b6c1bb3b5af268afc10bd70b9a394c 100644 (file)
// scope then create and insert DIEs for these variables.
DIE *DwarfDebug::updateSubprogramScopeDIE(DwarfCompileUnit *SPCU,
DISubprogram SP) {
- SP = SPCU->getOdrUniqueSubprogram(resolve(SP.getContext()), SP);
DIE *SPDie = SPCU->getDIE(SP);
assert(SPDie && "Unable to find subprogram DIE!");
if (!Scope || !Scope->getScopeNode())
return NULL;
- DIScope DS(Scope->getScopeNode());
+ // Unique scope where applicable.
+ DIScope DS(resolve(DIScope(Scope->getScopeNode()).getRef()));
SmallVector<DIE *, 8> Children;
DIE *ObjectPointer = NULL;
index 2f6c2546ed4ae38af8b66b0a4dda6b2f579e269d..b4a1cdde11b833dc0cc6f3a7dd6ecf7c9022e0e5 100644 (file)
/// of in DwarfCompileUnit.
DenseMap<const MDNode *, DIE *> MDTypeNodeToDieMap;
- // Used to unique C++ member function declarations.
- StringMap<const MDNode *> OdrMemberMap;
-
// List of all labels used in aranges generation.
std::vector<SymbolCU> ArangeLabels;
return MDTypeNodeToDieMap.lookup(TypeMD);
}
- /// \brief Look up or create an entry in the OdrMemberMap.
- const MDNode *&getOrCreateOdrMember(StringRef Key) {
- return OdrMemberMap.GetOrCreateValue(Key).getValue();
- }
-
/// \brief Emit all Dwarf sections that should come prior to the
/// content.
void beginModule();
index be21d633e54ba287cedaee0577d298a3bd24bfa7..bf377f52d41f1e5cfd8017a0d6beec0f452a199c 100644 (file)
return NDie;
}
-/// Unique C++ member function declarations based on their
-/// context and mangled name.
-DISubprogram
-DwarfUnit::getOdrUniqueSubprogram(DIScope Context, DISubprogram SP) const {
- if (!hasODR() ||
- !Context.isCompositeType() ||
- SP.getLinkageName().empty() ||
- SP.isDefinition())
- return SP;
- // Create a key with the UID of the parent class and this SP's name.
- Twine Key = SP.getContext().getName() + SP.getLinkageName();
- const MDNode *&Entry = DD->getOrCreateOdrMember(Key.str());
- if (!Entry)
- Entry = &*SP;
-
- return DISubprogram(Entry);
-}
-
/// getOrCreateSubprogramDIE - Create new DIE using SP.
DIE *DwarfUnit::getOrCreateSubprogramDIE(DISubprogram SP) {
// Construct the context before querying for the existence of the DIE in case
// declarations).
DIScope Context = resolve(SP.getContext());
DIE *ContextDIE = getOrCreateContextDIE(Context);
+
// Unique declarations based on the ODR, where applicable.
- SP = getOdrUniqueSubprogram(Context, SP);
+ SP = DISubprogram(DD->resolve(SP.getRef()));
+ assert(SP.Verify());
DIE *SPDie = getDIE(SP);
if (SPDie)
index 1c4e0e552f5d82cc22169d272abf5ae58ff8dc89..6f8e55edc914cb63cb2c6299b87638dee3311d57 100644 (file)
virtual DwarfCompileUnit &getCU() = 0;
- /// \brief Return whether this compilation unit has the
- /// one-definition-rule (ODR). In C++ this allows the compiler to
- /// perform type unique during LTO.
- bool hasODR() const {
- switch (getLanguage()) {
- case dwarf::DW_LANG_C_plus_plus:
- case dwarf::DW_LANG_C_plus_plus_03:
- case dwarf::DW_LANG_C_plus_plus_11:
- // For all we care, the C++ part of the language has the ODR and
- // ObjC methods are not represented in a way that they could be
- // confused with C++ member functions.
- case dwarf::DW_LANG_ObjC_plus_plus:
- return true;
- default:
- return false;
- }
- }
-
- /// \brief Unique C++ member function declarations based on their
- /// context+mangled name.
- DISubprogram getOdrUniqueSubprogram(DIScope Context, DISubprogram SP) const;
-
protected:
/// getOrCreateStaticMemberDIE - Create new static data member DIE.
DIE *getOrCreateStaticMemberDIE(DIDerivedType DT);