<div dir="ltr">Oh, no worries - I sent it after you'd already done that. (if you revert a patch, it can be handy to follow up/reply to the original commit email to mention what's happened - so the trail can be easily followed)</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 3, 2016 at 1:18 PM, Liu, Jack <span dir="ltr"><<a href="mailto:jack.liu@intel.com" target="_blank">jack.liu@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div lang="EN-US" link="blue" vlink="purple">
<div>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Consolas;color:#1f497d">It was my mistake. I got your email late, and had reverted the change and re-committed it again at r268424.<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Consolas;color:#1f497d"><u></u> <u></u></span></p>
<p class="MsoNormal" style="margin-left:.5in"><span style="font-size:9.0pt;font-family:Consolas">------------------------------------------------------------------------<u></u><u></u></span></p>
<p class="MsoNormal" style="margin-left:.5in;text-autospace:none"><span style="font-size:9.0pt;font-family:Consolas">r268424 | liu12295 | 2016-05-03 12:30:48 -0700 (Tue, 03 May 2016) | 6 lines<u></u><u></u></span></p>
<p class="MsoNormal" style="margin-left:.5in;text-autospace:none"><span style="font-size:9.0pt;font-family:Consolas"><u></u> <u></u></span></p>
<p class="MsoNormal" style="margin-left:.5in;text-autospace:none"><span style="font-size:9.0pt;font-family:Consolas">[SROA] Function canConvertValue needs to check whether both NewTy and OldTy pointers are<u></u><u></u></span></p>
<p class="MsoNormal" style="margin-left:.5in;text-autospace:none"><span style="font-size:9.0pt;font-family:Consolas">pointing to the same addr space. This can prevent SROA from creating a bitcast<u></u><u></u></span></p>
<p class="MsoNormal" style="margin-left:.5in;text-autospace:none"><span style="font-size:9.0pt;font-family:Consolas">between pointers with different addr spaces.<u></u><u></u></span></p>
<p class="MsoNormal" style="margin-left:.5in;text-autospace:none"><span style="font-size:9.0pt;font-family:Consolas"><u></u> <u></u></span></p>
<p class="MsoNormal" style="margin-left:.5in;text-autospace:none"><span style="font-size:9.0pt;font-family:Consolas">Differential Revision: <a href="http://reviews.llvm.org/D19697" target="_blank">http://reviews.llvm.org/D19697</a><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Consolas;color:#1f497d"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:Consolas;color:#1f497d">Sorry about the confusion.<u></u><u></u></span></p>
<p class="MsoNormal"><a name="m_3255312782095461671__MailEndCompose"><span style="font-size:11.0pt;font-family:Consolas;color:#1f497d"><u></u> <u></u></span></a></p>
<p class="MsoNormal"><a name="m_3255312782095461671______replyseparator"></a><b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif"> David Blaikie [mailto:<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>]
<br>
<b>Sent:</b> Tuesday, May 3, 2016 12:59 PM<br>
<b>To:</b> Liu, Jack <<a href="mailto:jack.liu@intel.com" target="_blank">jack.liu@intel.com</a>><br>
<b>Cc:</b> llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>><br>
<b>Subject:</b> Re: [llvm] r268409 -<u></u><u></u></span></p><div><div class="h5">
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<p class="MsoNormal">Missing commit message? (could you provide it in a reply here - and try to include commit messages in the commit in the future (ie: don't bother reverting & recommitting this just to add a commit message unless you particularly want to
- some people might appreciate it when trawling through the logs))<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<p class="MsoNormal">On Tue, May 3, 2016 at 11:01 AM, Jack Liu via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<u></u><u></u></p>
<blockquote style="border:none;border-left:solid #cccccc 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in">
<p class="MsoNormal">Author: liu12295<br>
Date: Tue May 3 13:01:43 2016<br>
New Revision: 268409<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=268409&view=rev" target="_blank">
http://llvm.org/viewvc/llvm-project?rev=268409&view=rev</a><br>
Log: (empty)<br>
<br>
Modified:<br>
llvm/trunk/lib/Transforms/Scalar/SROA.cpp<br>
llvm/trunk/test/Transforms/SROA/address-spaces.ll<br>
<br>
Modified: llvm/trunk/lib/Transforms/Scalar/SROA.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SROA.cpp?rev=268409&r1=268408&r2=268409&view=diff" target="_blank">
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SROA.cpp?rev=268409&r1=268408&r2=268409&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/Scalar/SROA.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/Scalar/SROA.cpp Tue May 3 13:01:43 2016<br>
@@ -1635,8 +1635,10 @@ static bool canConvertValue(const DataLa<br>
OldTy = OldTy->getScalarType();<br>
NewTy = NewTy->getScalarType();<br>
if (NewTy->isPointerTy() || OldTy->isPointerTy()) {<br>
- if (NewTy->isPointerTy() && OldTy->isPointerTy())<br>
- return true;<br>
+ if (NewTy->isPointerTy() && OldTy->isPointerTy()) {<br>
+ return cast<PointerType>(NewTy)->getPointerAddressSpace() ==<br>
+ cast<PointerType>(OldTy)->getPointerAddressSpace();<br>
+ }<br>
if (NewTy->isIntegerTy() || OldTy->isIntegerTy())<br>
return true;<br>
return false;<br>
<br>
Modified: llvm/trunk/test/Transforms/SROA/address-spaces.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SROA/address-spaces.ll?rev=268409&r1=268408&r2=268409&view=diff" target="_blank">
http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SROA/address-spaces.ll?rev=268409&r1=268408&r2=268409&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/SROA/address-spaces.ll (original)<br>
+++ llvm/trunk/test/Transforms/SROA/address-spaces.ll Tue May 3 13:01:43 2016<br>
@@ -52,7 +52,7 @@ define void @test_address_space_0_1(<2 x<br>
<br>
%struct.struct_test_27.0.13 = type { i32, float, i64, i8, [4 x i32] }<br>
<br>
-; Function Attrs: nounwind<br>
+; Function Attrs: nounwind<br>
define void @copy_struct([5 x i64] %in.coerce) {<br>
; CHECK-LABEL: @copy_struct(<br>
; CHECK-NOT: memcpy<br>
@@ -66,3 +66,20 @@ for.end:<br>
ret void<br>
}<br>
<br>
+%union.anon = type { i32* }<br>
+<br>
+@g = common global i32 0, align 4<br>
+@l = common addrspace(3) global i32 0, align 4<br>
+<br>
+; Make sure an illegal bitcast isn't introduced<br>
+define void @pr27557() {<br>
+; CHECK-LABEL: @pr27557(<br>
+; CHECK: %[[CAST:.*]] = bitcast i32** {{.*}} to i32 addrspace(3)**<br>
+; CHECK: store i32 addrspace(3)* @l, i32 addrspace(3)** %[[CAST]]<br>
+ %1 = alloca %union.anon, align 8<br>
+ %2 = bitcast %union.anon* %1 to i32**<br>
+ store i32* @g, i32** %2, align 8<br>
+ %3 = bitcast %union.anon* %1 to i32 addrspace(3)**<br>
+ store i32 addrspace(3)* @l, i32 addrspace(3)** %3, align 8<br>
+ ret void<br>
+}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><u></u><u></u></p>
</blockquote>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
</div></div></div>
</div>
</blockquote></div><br></div>