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

DIBuilder: retain a type when created with a unique identifier.

Browse Source 
createClassType, createStructType, createUnionType, createEnumerationType,
and createForwardDecl will retain a type when created with a unique identifier,
to make sure they are treated as used even when all uses are replaced with
the identifiers.

Use TrackingVH<MDNode> instead of MDNode in AllRetainTypes, since the created
node can later be updated.

The change will be tested when clients of DIBuilder start to pass in non-empty
unique identifier.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189621 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Manman Ren 2013-08-29 23:17:54 +00:00
parent 88acef0b8e
commit 3a0e9b50f3
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/DIBuilder.h
View File

@ -18,6 +18,7 @@
#include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringRef.h"
#include "llvm/Support/DataTypes.h" #include "llvm/Support/DataTypes.h"
#include "llvm/Support/ValueHandle.h"
namespace llvm { namespace llvm {
class BasicBlock; class BasicBlock;
@ -65,7 +66,9 @@ namespace llvm {
Function *ValueFn; // llvm.dbg.value Function *ValueFn; // llvm.dbg.value
SmallVector<Value *, 4> AllEnumTypes; SmallVector<Value *, 4> AllEnumTypes;
SmallVector<Value *, 4> AllRetainTypes; /// Use TrackingVH to collect RetainTypes, since they can be updated
/// later on.
SmallVector<TrackingVH<MDNode>, 4> AllRetainTypes;
SmallVector<Value *, 4> AllSubprograms; SmallVector<Value *, 4> AllSubprograms;
SmallVector<Value *, 4> AllGVs; SmallVector<Value *, 4> AllGVs;
SmallVector<Value *, 4> AllImportedModules; SmallVector<Value *, 4> AllImportedModules;

26
lib/IR/DIBuilder.cpp
View File

@ -40,7 +40,16 @@ void DIBuilder::finalize() {
DIArray Enums = getOrCreateArray(AllEnumTypes); DIArray Enums = getOrCreateArray(AllEnumTypes);
DIType(TempEnumTypes).replaceAllUsesWith(Enums); DIType(TempEnumTypes).replaceAllUsesWith(Enums);
DIArray RetainTypes = getOrCreateArray(AllRetainTypes); SmallVector<Value *, 16> RetainValues;
// Declarations and definitions of the same type may be retained. Some
// clients RAUW these pairs, leaving duplicates in the retained types
// list. Use a set to remove the duplicates while we transform the
// TrackingVHs back into Values.
SmallPtrSet<Value *, 16> RetainSet;
for (unsigned I = 0, E = AllRetainTypes.size(); I < E; I++)
if (RetainSet.insert(AllRetainTypes[I]))
RetainValues.push_back(AllRetainTypes[I]);
DIArray RetainTypes = getOrCreateArray(RetainValues);
DIType(TempRetainTypes).replaceAllUsesWith(RetainTypes); DIType(TempRetainTypes).replaceAllUsesWith(RetainTypes);
DIArray SPs = getOrCreateArray(AllSubprograms); DIArray SPs = getOrCreateArray(AllSubprograms);
@ -624,6 +633,8 @@ DICompositeType DIBuilder::createClassType(DIDescriptor Context, StringRef Name,
DICompositeType R(MDNode::get(VMContext, Elts)); DICompositeType R(MDNode::get(VMContext, Elts));
assert(R.isCompositeType() && assert(R.isCompositeType() &&
"createClassType should return a DICompositeType"); "createClassType should return a DICompositeType");
if (!UniqueIdentifier.empty())
retainType(R);
return R; return R;
} }
@ -659,6 +670,8 @@ DICompositeType DIBuilder::createStructType(DIDescriptor Context,
DICompositeType R(MDNode::get(VMContext, Elts)); DICompositeType R(MDNode::get(VMContext, Elts));
assert(R.isCompositeType() && assert(R.isCompositeType() &&
"createStructType should return a DICompositeType"); "createStructType should return a DICompositeType");
if (!UniqueIdentifier.empty())
retainType(R);
return R; return R;
} }
@ -688,7 +701,10 @@ DICompositeType DIBuilder::createUnionType(DIDescriptor Scope, StringRef Name,
NULL, NULL,
UniqueIdentifier.empty() ? NULL : MDString::get(VMContext, UniqueIdentifier) UniqueIdentifier.empty() ? NULL : MDString::get(VMContext, UniqueIdentifier)
}; };
return DICompositeType(MDNode::get(VMContext, Elts)); DICompositeType R(MDNode::get(VMContext, Elts));
if (!UniqueIdentifier.empty())
retainType(R);
return R;
} }
/// createSubroutineType - Create subroutine type. /// createSubroutineType - Create subroutine type.
@ -741,6 +757,8 @@ DICompositeType DIBuilder::createEnumerationType(
}; };
MDNode *Node = MDNode::get(VMContext, Elts); MDNode *Node = MDNode::get(VMContext, Elts);
AllEnumTypes.push_back(Node); AllEnumTypes.push_back(Node);
if (!UniqueIdentifier.empty())
retainType(Node);
return DICompositeType(Node); return DICompositeType(Node);
} }
@ -844,7 +862,7 @@ DIType DIBuilder::createObjectPointerType(DIType Ty) {
/// retainType - Retain DIType in a module even if it is not referenced /// retainType - Retain DIType in a module even if it is not referenced
/// through debug info anchors. /// through debug info anchors.
void DIBuilder::retainType(DIType T) { void DIBuilder::retainType(DIType T) {
AllRetainTypes.push_back(T); AllRetainTypes.push_back(TrackingVH<MDNode>(T));
} }
/// createUnspecifiedParameter - Create unspeicified type descriptor /// createUnspecifiedParameter - Create unspeicified type descriptor
@ -887,6 +905,8 @@ DICompositeType DIBuilder::createForwardDecl(unsigned Tag, StringRef Name,
DICompositeType RetTy(Node); DICompositeType RetTy(Node);
assert(RetTy.isCompositeType() && assert(RetTy.isCompositeType() &&
"createForwardDecl result should be a DIType"); "createForwardDecl result should be a DIType");
if (!UniqueIdentifier.empty())
retainType(RetTy);
return RetTy; return RetTy;
} }