[llvm] r234294 - Try again to fix MSVC build after r234290

[Duncan P. N. Exon Smith]

Author: dexonsmith
Date: Mon Apr  6 23:49:13 2015
New Revision: 234294

URL: http://llvm.org/viewvc/llvm-project?rev=234294&view=rev
Log:
Try again to fix MSVC build after r234290

Still failing:

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

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=234294&r1=234293&r2=234294&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Mon Apr  6 23:49:13 2015
@@ -1015,11 +1015,11 @@ void DwarfUnit::constructTypeDIE(DIE &Bu
     // 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::applySubprogramAttribute
   // 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();