<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Apr 28, 2015 at 10:37 AM, Tom Stellard <span dir="ltr"><<a href="mailto:thomas.stellard@amd.com" target="_blank">thomas.stellard@amd.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: tstellar<br>
Date: Tue Apr 28 12:37:03 2015<br>
New Revision: 236004<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=236004&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=236004&view=rev</a><br>
Log:<br>
R600: Fix up for AsmPrinter's OutStreamer being a unique_ptr<br>
<br>
Fixes a crash with basically any OpenGL application using the radeonsi<br>
driver.<br>
<br>
Patch by: Michel Dänzer<br>
<br>
Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=90176" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=90176</a><br>
Signed-off-by: Michel Dänzer <<a href="mailto:michel.daenzer@amd.com">michel.daenzer@amd.com</a>><br>
<br>
Added:<br>
    llvm/trunk/test/CodeGen/R600/debug.ll<br>
Modified:<br>
    llvm/trunk/lib/Target/R600/AMDGPUMCInstLower.cpp<br>
<br>
Modified: llvm/trunk/lib/Target/R600/AMDGPUMCInstLower.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/AMDGPUMCInstLower.cpp?rev=236004&r1=236003&r2=236004&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/AMDGPUMCInstLower.cpp?rev=236004&r1=236003&r2=236004&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/R600/AMDGPUMCInstLower.cpp (original)<br>
+++ llvm/trunk/lib/Target/R600/AMDGPUMCInstLower.cpp Tue Apr 28 12:37:03 2015<br>
@@ -132,8 +132,9 @@ void AMDGPUAsmPrinter::EmitInstruction(c<br>
       SmallVector<char, 16> CodeBytes;<br>
       raw_svector_ostream CodeStream(CodeBytes);<br>
<br>
-      MCObjectStreamer &ObjStreamer = (MCObjectStreamer &)OutStreamer;<br>
-      MCCodeEmitter &InstEmitter = ObjStreamer.getAssembler().getEmitter();<br>
+      MCObjectStreamer *ObjStreamer =<br>
+          static_cast<MCObjectStreamer *>(OutStreamer.get());<br></blockquote><div><br>Could skip the '.get()' call by moving to references, since we dereference on the next line anyway:<br><br>auto &ObjStreamer = static_cast<MCObjectStreamer&>(*OutStreamer);<br><br>(& this starts to look a lot like the original code, just adding the needed dereference in, fixing up the cast to be safer, using auto to avoid duplicating the typename, etc)<br><br>But maybe the ref/pointer difference between OutStreamer and ObjStreamer would be confusing? (though it's only used once anyway, on the immediate next line)<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+      MCCodeEmitter &InstEmitter = ObjStreamer->getAssembler().getEmitter();<br>
       InstEmitter.EncodeInstruction(TmpInst, CodeStream, Fixups,<br>
                                     MF->getSubtarget<MCSubtargetInfo>());<br>
       CodeStream.flush();<br>
<br>
Added: llvm/trunk/test/CodeGen/R600/debug.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/R600/debug.ll?rev=236004&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/R600/debug.ll?rev=236004&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/R600/debug.ll (added)<br>
+++ llvm/trunk/test/CodeGen/R600/debug.ll Tue Apr 28 12:37:03 2015<br>
@@ -0,0 +1,10 @@<br>
+; RUN: llc < %s -march=amdgcn -mcpu=verde -verify-machineinstrs -mattr=dumpcode -filetype=obj | FileCheck --check-prefix=SI --check-prefix=FUNC %s<br>
+; RUN: llc < %s -march=amdgcn -mcpu=tonga -verify-machineinstrs -mattr=dumpcode -filetype=obj | FileCheck --check-prefix=SI --check-prefix=FUNC %s<br>
+<br>
+; Test for a crash in the custom assembly dump code.<br>
+<br>
+; SI: s_endpgm<br>
+define void @test(i32 addrspace(1)* %out) {<br>
+  store i32 0, i32 addrspace(1)* %out<br>
+  ret void<br>
+}<br>
<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>