<html><head><meta http-equiv="Content-Type" content="text/html charset=iso-8859-1"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">Does this need to go into 3.4?<div><br></div><div>-bw</div><div><br><div style=""><div>On Nov 21, 2013, at 10:35 AM, David Blaikie <<a href="mailto:dblaikie@gmail.com">dblaikie@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">2013/11/21 NAKAMURA Takumi <span dir="ltr"><<a href="mailto:geek4civic@gmail.com" target="_blank">geek4civic@gmail.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: chapuni<br>
Date: Thu Nov 21 07:40:40 2013<br>
New Revision: 195356<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=195356&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=195356&view=rev</a><br>
Log:<br>
Debug.cpp: Try to unbreak build corresponding to llvm's r195055.<br></blockquote><div><br></div><div>Thanks for the fix, Takumi!</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
dragonegg/trunk/src/Debug.cpp<br>
<br>
Modified: dragonegg/trunk/src/Debug.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Debug.cpp?rev=195356&r1=195355&r2=195356&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Debug.cpp?rev=195356&r1=195355&r2=195356&view=diff</a><br>
==============================================================================<br>
--- dragonegg/trunk/src/Debug.cpp (original)<br>
+++ dragonegg/trunk/src/Debug.cpp Thu Nov 21 07:40:40 2013<br>
@@ -1099,7 +1099,7 @@ DICompositeType DebugInfo::CreateComposi<br>
case dwarf::DW_TAG_structure_type:<br>
return Builder.createStructType(Context, Name, F, LineNumber, SizeInBits,<br>
AlignInBits, Flags, DerivedFrom, Elements,<br>
- 0, ContainingType);<br>
+ 0, DIType(ContainingType));<br>
case dwarf::DW_TAG_union_type:<br>
return Builder.createUnionType(Context, Name, F, LineNumber, SizeInBits,<br>
AlignInBits, Flags, Elements, RuntimeLang);<br>
@@ -1127,7 +1127,8 @@ DISubprogram DebugInfo::CreateSubprogram<br>
assert(CTy.Verify() && "Expected a composite type!");<br>
if (ContainingType.isValid() || VK || VIndex)<br>
return Builder.createMethod(Context, Name, LinkageName, F, LineNo, CTy,<br>
- isLocalToUnit, isDefinition, VK, VIndex, NULL,<br>
+ isLocalToUnit, isDefinition, VK, VIndex,<br>
+ DIType(),<br>
Flags, isOptimized, Fn, NULL);<br>
return Builder.createFunction(Context, Name, LinkageName, F, LineNo, CTy,<br>
isLocalToUnit, isDefinition, LineNo, Flags,<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>
_______________________________________________<br>llvm-commits mailing list<br><a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits<br></blockquote></div><br></div></body></html>