From: Duncan P. N. Exon Smith <dexonsmith@apple.com>
Date: Tue, 7 Apr 2015 04:49:13 +0000 (+0000)
Subject: Try again to fix MSVC build after r234290
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=faa23b7768d087687a0a121f800215439dbc9eea;p=oota-llvm.git

Try again to fix MSVC build after r234290

Still failing:

http://lab.llvm.org:8011/builders/sanitizer-windows/builds/2309

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@234294 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
index baa99758e3c..dadc9ba59a2 100644
--- a/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
@@ -1015,11 +1015,11 @@ void DwarfUnit::constructTypeDIE(DIE &Buffer, DICompositeType CTy) {
     // Add return type. A void return won't have a type.
     auto Elements = cast<MDSubroutineType>(CTy)->getTypeArray();
     if (Elements.size())
-      if (MDType *RTy = resolve(Elements[0]))
+      if (MDType *RTy = resolve(DITypeRef(Elements[0])))
         addType(Buffer, RTy);
 
     bool isPrototyped = true;
-    if (Elements.size() == 2 && !Elements[1])
+    if (Elements.size() == 2 && !DITypeRef(Elements[1]))
       isPrototyped = false;
 
     constructSubprogramArguments(Buffer, Elements);
@@ -1318,7 +1318,7 @@ void DwarfUnit::applySubprogramAttributes(DISubprogram SP, DIE &SPDie,
   // Add a return type. If this is a type like a C/C++ void type we don't add a
   // return type.
   if (Args.size())
-    if (MDType *Ty = resolve(Args[0]))
+    if (MDType *Ty = resolve(DITypeRef(Args[0])))
       addType(SPDie, Ty);
 
   unsigned VK = SP.getVirtuality();