Tighten up some type arguments to functions. Where we expect a

scope, pass a scope.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192002 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2013-10-04 23:49:26 +00:00
parent fc3b7bbf49
commit ccb6636684
2 changed files with 6 additions and 6 deletions

View File

@ -745,7 +745,7 @@ void CompileUnit::addTemplateParams(DIE &Buffer, DIArray TParams) {
} }
/// getOrCreateContextDIE - Get context owner's DIE. /// getOrCreateContextDIE - Get context owner's DIE.
DIE *CompileUnit::getOrCreateContextDIE(DIDescriptor Context) { DIE *CompileUnit::getOrCreateContextDIE(DIScope Context) {
if (Context.isType()) if (Context.isType())
return getOrCreateTypeDIE(DIType(Context)); return getOrCreateTypeDIE(DIType(Context));
else if (Context.isNameSpace()) else if (Context.isNameSpace())
@ -757,7 +757,7 @@ DIE *CompileUnit::getOrCreateContextDIE(DIDescriptor Context) {
} }
/// addToContextOwner - Add Die into the list of its context owner's children. /// addToContextOwner - Add Die into the list of its context owner's children.
void CompileUnit::addToContextOwner(DIE *Die, DIDescriptor Context) { void CompileUnit::addToContextOwner(DIE *Die, DIScope Context) {
assert(!Die->getParent()); assert(!Die->getParent());
if (DIE *ContextDIE = getOrCreateContextDIE(Context)) { if (DIE *ContextDIE = getOrCreateContextDIE(Context)) {
if (Die->getParent()) { if (Die->getParent()) {
@ -872,7 +872,7 @@ void CompileUnit::addGlobalName(StringRef Name, DIE *Die) {
/// addGlobalType - Add a new global type to the compile unit. /// addGlobalType - Add a new global type to the compile unit.
/// ///
void CompileUnit::addGlobalType(DIType Ty) { void CompileUnit::addGlobalType(DIType Ty) {
DIDescriptor Context = DD->resolve(Ty.getContext()); DIScope Context = DD->resolve(Ty.getContext());
if (!Ty.getName().empty() && !Ty.isForwardDecl() && if (!Ty.getName().empty() && !Ty.isForwardDecl() &&
(!Context || Context.isCompileUnit() || Context.isFile() || (!Context || Context.isCompileUnit() || Context.isFile() ||
Context.isNameSpace())) Context.isNameSpace()))
@ -1398,7 +1398,7 @@ void CompileUnit::createGlobalVariableDIE(const MDNode *N) {
if (!GV.isGlobalVariable()) if (!GV.isGlobalVariable())
return; return;
DIDescriptor GVContext = GV.getContext(); DIScope GVContext = GV.getContext();
DIType GTy = GV.getType(); DIType GTy = GV.getType();
// If this is a static data member definition, some attributes belong // If this is a static data member definition, some attributes belong

View File

@ -292,7 +292,7 @@ public:
MachineLocation Location); MachineLocation Location);
/// addToContextOwner - Add Die into the list of its context owner's children. /// addToContextOwner - Add Die into the list of its context owner's children.
void addToContextOwner(DIE *Die, DIDescriptor Context); void addToContextOwner(DIE *Die, DIScope Context);
/// addType - Add a new type attribute to the specified entity. This takes /// addType - Add a new type attribute to the specified entity. This takes
/// and attribute parameter because DW_AT_friend attributes are also /// and attribute parameter because DW_AT_friend attributes are also
@ -362,7 +362,7 @@ public:
DIE *createStaticMemberDIE(DIDerivedType DT); DIE *createStaticMemberDIE(DIDerivedType DT);
/// getOrCreateContextDIE - Get context owner's DIE. /// getOrCreateContextDIE - Get context owner's DIE.
DIE *getOrCreateContextDIE(DIDescriptor Context); DIE *getOrCreateContextDIE(DIScope Context);
private: private: