<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Marge Bot pushed to branch master
at <a href="https://gitlab.haskell.org/ghc/ghc">Glasgow Haskell Compiler / GHC</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/973077ac63c79988f2d5f25d13b60dce82f9e8dd">973077ac</a></strong>
<div>
<span>by Sergei Trofimovich</span>
<i>at 2019-05-31T05:57:31Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">powerpc32: fix 64-bit comparison (#16465)
On powerpc32 64-bit comparison code generated dangling
target labels. This caused ghc build failure as:
$ ./configure --target=powerpc-unknown-linux-gnu && make
...
SCCs aren't in reverse dependent order
bad blockId n3U
This happened because condIntCode' in PPC codegen generated
label name but did not place the label into `cmp_lo` code block.
The change adds the `cmp_lo` label into the case of negative
comparison.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/bb2ee86a4cf47eb56d4b8b4a552537449d492f88">bb2ee86a</a></strong>
<div>
<span>by Sergei Trofimovich</span>
<i>at 2019-05-31T05:57:31Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">powerpc32: fix stack allocation code generation
When ghc was built for powerpc32 built failed as:
It's a fallout of commit 3f46cffcc2850e68405a1
("PPC NCG: Refactor stack allocation code") where
word size used to be
II32/II64
and changed to
II8/panic "no width for given number of bytes"
widthFromBytes ((platformWordSize platform) `quot` 8)
The change restores initial behaviour by removing extra division.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#4046c7d6a8687b60dad02104071b70a747bc6cba">
compiler/nativeGen/PPC/CodeGen.hs
</a>
</li>
<li class="file-stats">
<a href="#6c18f272fe86ef28560d2bdc8bc0c7a15f7b758a">
compiler/nativeGen/PPC/Instr.hs
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="4046c7d6a8687b60dad02104071b70a747bc6cba">
<a href="https://gitlab.haskell.org/ghc/ghc/compare/0b01a3541e483ea3fcbd6c0f1586a063310b75f9...bb2ee86a4cf47eb56d4b8b4a552537449d492f88#4046c7d6a8687b60dad02104071b70a747bc6cba"><strong>compiler/nativeGen/PPC/CodeGen.hs</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="949" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="949" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -949,6 +949,7 @@ condIntCode' True cond W64 x y</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="949" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
949
</td>
<td class="diff-line-num new_line" data-linenumber="949" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
949
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC949" class="line" lang="haskell"> <span class="p">,</span> <span class="kt" style="color: #458; font-weight: 600;">BCC</span> <span class="kt" style="color: #458; font-weight: 600;">LE</span> <span class="n" style="color: #333;">cmp_lo</span> <span class="kt" style="color: #458; font-weight: 600;">Nothing</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="950" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
950
</td>
<td class="diff-line-num new_line" data-linenumber="950" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
950
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC950" class="line" lang="haskell"> <span class="p">,</span> <span class="kt" style="color: #458; font-weight: 600;">CMPL</span> <span class="kt" style="color: #458; font-weight: 600;">II32</span> <span class="n" style="color: #333;">x_lo</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">RIReg</span> <span class="n" style="color: #333;">y_lo</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="951" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
951
</td>
<td class="diff-line-num new_line" data-linenumber="951" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
951
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC951" class="line" lang="haskell"> <span class="p">,</span> <span class="kt" style="color: #458; font-weight: 600;">BCC</span> <span class="kt" style="color: #458; font-weight: 600;">ALWAYS</span> <span class="n" style="color: #333;">end_lbl</span> <span class="kt" style="color: #458; font-weight: 600;">Nothing</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="952" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="952" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
952
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC952" class="line" lang="haskell"> <span class="p">,</span> <span class="kt" style="color: #458; font-weight: 600;">NEWBLOCK</span> <span class="n" style="color: #333;">cmp_lo</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="952" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
952
</td>
<td class="diff-line-num new_line" data-linenumber="953" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
953
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC953" class="line" lang="haskell"> <span class="p">,</span> <span class="kt" style="color: #458; font-weight: 600;">CMPL</span> <span class="kt" style="color: #458; font-weight: 600;">II32</span> <span class="n" style="color: #333;">y_lo</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">RIReg</span> <span class="n" style="color: #333;">x_lo</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="953" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
953
</td>
<td class="diff-line-num new_line" data-linenumber="954" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
954
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC954" class="line" lang="haskell"> <span class="p">,</span> <span class="kt" style="color: #458; font-weight: 600;">BCC</span> <span class="kt" style="color: #458; font-weight: 600;">ALWAYS</span> <span class="n" style="color: #333;">end_lbl</span> <span class="kt" style="color: #458; font-weight: 600;">Nothing</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="954" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
954
</td>
<td class="diff-line-num new_line" data-linenumber="955" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
955
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC955" class="line" lang="haskell"></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="6c18f272fe86ef28560d2bdc8bc0c7a15f7b758a">
<a href="https://gitlab.haskell.org/ghc/ghc/compare/0b01a3541e483ea3fcbd6c0f1586a063310b75f9...bb2ee86a4cf47eb56d4b8b4a552537449d492f88#6c18f272fe86ef28560d2bdc8bc0c7a15f7b758a"><strong>compiler/nativeGen/PPC/Instr.hs</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="98" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="98" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -98,7 +98,7 @@ ppc_mkStackAllocInstr' platform amount</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="98" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
98
</td>
<td class="diff-line-num new_line" data-linenumber="98" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
98
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC98" class="line" lang="haskell"> <span class="p">,</span> <span class="kt" style="color: #458; font-weight: 600;">STU</span> <span class="n" style="color: #333;">fmt</span> <span class="n" style="color: #333;">r0</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">AddrRegReg</span> <span class="n" style="color: #333;">sp</span> <span class="n" style="color: #333;">tmp</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="99" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
99
</td>
<td class="diff-line-num new_line" data-linenumber="99" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
99
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC99" class="line" lang="haskell"> <span class="p">]</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="100" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
100
</td>
<td class="diff-line-num new_line" data-linenumber="100" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
100
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC100" class="line" lang="haskell"> <span class="kr" style="font-weight: 600;">where</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="101" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
101
</td>
<td class="diff-line-num new_line old" data-linenumber="101" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC101" class="line" lang="haskell"> <span class="n" style="color: #333;">fmt</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">intFormat</span> <span class="o" style="font-weight: 600;">$</span> <span class="n" style="color: #333;">widthFromBytes</span> <span class="p">(<span class="idiff left">(</span></span><span class="n" style="color: #333;"><span class="idiff">platformWordSize</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">platform</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="p"><span class="idiff">`</span></span><span class="n" style="color: #333;"><span class="idiff">quot</span></span><span class="p"><span class="idiff">`</span></span><span class="idiff"> </span><span class="mi" style="color: #099;"><span class="idiff right">8</span></span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="102" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="101" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
101
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC101" class="line" lang="haskell"> <span class="n" style="color: #333;">fmt</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">intFormat</span> <span class="o" style="font-weight: 600;">$</span> <span class="n" style="color: #333;">widthFromBytes</span> <span class="p">(</span><span class="n" style="color: #333;"><span class="idiff left">platformWordSize</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff right">platform</span></span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="102" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
102
</td>
<td class="diff-line-num new_line" data-linenumber="102" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
102
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC102" class="line" lang="haskell"> <span class="n" style="color: #333;">zero</span> <span class="o" style="font-weight: 600;">=</span> <span class="kt" style="color: #458; font-weight: 600;">ImmInt</span> <span class="mi" style="color: #099;">0</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="103" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
103
</td>
<td class="diff-line-num new_line" data-linenumber="103" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
103
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC103" class="line" lang="haskell"> <span class="n" style="color: #333;">tmp</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">tmpReg</span> <span class="n" style="color: #333;">platform</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="104" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
104
</td>
<td class="diff-line-num new_line" data-linenumber="104" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
104
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC104" class="line" lang="haskell"> <span class="n" style="color: #333;">immAmount</span> <span class="o" style="font-weight: 600;">=</span> <span class="kt" style="color: #458; font-weight: 600;">ImmInt</span> <span class="n" style="color: #333;">amount</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://gitlab.haskell.org/ghc/ghc/compare/0b01a3541e483ea3fcbd6c0f1586a063310b75f9...bb2ee86a4cf47eb56d4b8b4a552537449d492f88">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.haskell.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>