[llvm] r192002 - Tighten up some type arguments to functions. Where we expect a

[Eric Christopher]

Author: echristo
Date: Fri Oct  4 18:49:26 2013
New Revision: 192002

URL: http://llvm.org/viewvc/llvm-project?rev=192002&view=rev
Log:
Tighten up some type arguments to functions. Where we expect a
scope, pass a scope.

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=192002&r1=192001&r2=192002&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Fri Oct  4 18:49:26 2013
@@ -745,7 +745,7 @@ void CompileUnit::addTemplateParams(DIE
 }
 
 /// getOrCreateContextDIE - Get context owner's DIE.
-DIE *CompileUnit::getOrCreateContextDIE(DIDescriptor Context) {
+DIE *CompileUnit::getOrCreateContextDIE(DIScope Context) {
   if (Context.isType())
     return getOrCreateTypeDIE(DIType(Context));
   else if (Context.isNameSpace())
@@ -757,7 +757,7 @@ DIE *CompileUnit::getOrCreateContextDIE(
 }
 
 /// 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());
   if (DIE *ContextDIE = getOrCreateContextDIE(Context)) {
     if (Die->getParent()) {
@@ -872,7 +872,7 @@ void CompileUnit::addGlobalName(StringRe
 /// addGlobalType - Add a new global type to the compile unit.
 ///
 void CompileUnit::addGlobalType(DIType Ty) {
-  DIDescriptor Context = DD->resolve(Ty.getContext());
+  DIScope Context = DD->resolve(Ty.getContext());
   if (!Ty.getName().empty() && !Ty.isForwardDecl() &&
       (!Context || Context.isCompileUnit() || Context.isFile() ||
        Context.isNameSpace()))
@@ -1398,7 +1398,7 @@ void CompileUnit::createGlobalVariableDI
   if (!GV.isGlobalVariable())
     return;
 
-  DIDescriptor GVContext = GV.getContext();
+  DIScope GVContext = GV.getContext();
   DIType GTy = GV.getType();
 
   // If this is a static data member definition, some attributes belong

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h?rev=192002&r1=192001&r2=192002&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h Fri Oct  4 18:49:26 2013
@@ -292,7 +292,7 @@ public:
                           MachineLocation Location);
 
   /// 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
   /// and attribute parameter because DW_AT_friend attributes are also
@@ -362,7 +362,7 @@ public:
   DIE *createStaticMemberDIE(DIDerivedType DT);
 
   /// getOrCreateContextDIE - Get context owner's DIE.
-  DIE *getOrCreateContextDIE(DIDescriptor Context);
+  DIE *getOrCreateContextDIE(DIScope Context);
 
 private: