[dragonegg] r195387 - Merging r195356:

[Bill Wendling]

Author: void
Date: Thu Nov 21 17:35:46 2013
New Revision: 195387

URL: http://llvm.org/viewvc/llvm-project?rev=195387&view=rev
Log:
Merging r195356:
------------------------------------------------------------------------
r195356 | chapuni | 2013-11-21 05:40:40 -0800 (Thu, 21 Nov 2013) | 1 line

Debug.cpp: Try to unbreak build corresponding to llvm's r195055.
------------------------------------------------------------------------

Modified:
    dragonegg/branches/release_34/   (props changed)
    dragonegg/branches/release_34/src/Debug.cpp

Propchange: dragonegg/branches/release_34/
------------------------------------------------------------------------------
    svn:mergeinfo = /dragonegg/trunk:195356

Modified: dragonegg/branches/release_34/src/Debug.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/branches/release_34/src/Debug.cpp?rev=195387&r1=195386&r2=195387&view=diff
==============================================================================
--- dragonegg/branches/release_34/src/Debug.cpp (original)
+++ dragonegg/branches/release_34/src/Debug.cpp Thu Nov 21 17:35:46 2013
@@ -1099,7 +1099,7 @@ DICompositeType DebugInfo::CreateComposi
   case dwarf::DW_TAG_structure_type:
     return Builder.createStructType(Context, Name, F, LineNumber, SizeInBits,
                                     AlignInBits, Flags, DerivedFrom, Elements,
-                                    0, ContainingType);
+                                    0, DIType(ContainingType));
   case dwarf::DW_TAG_union_type:
     return Builder.createUnionType(Context, Name, F, LineNumber, SizeInBits,
                                    AlignInBits, Flags, Elements, RuntimeLang);
@@ -1127,7 +1127,8 @@ DISubprogram DebugInfo::CreateSubprogram
   assert(CTy.Verify() && "Expected a composite type!");
   if (ContainingType.isValid() || VK || VIndex)
     return Builder.createMethod(Context, Name, LinkageName, F, LineNo, CTy,
-                                isLocalToUnit, isDefinition, VK, VIndex, NULL,
+                                isLocalToUnit, isDefinition, VK, VIndex,
+                                DIType(),
                                 Flags, isOptimized, Fn, NULL);
   return Builder.createFunction(Context, Name, LinkageName, F, LineNo, CTy,
                                 isLocalToUnit, isDefinition, LineNo, Flags,