<!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>
Ben Gamari pushed to branch ghc-8.8
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/c58498b2dd95bac99cb3fa9014fa64cf12dd2f18">c58498b2</a></strong>
<div>
<span>by Ben Gamari</span>
<i>at 2020-11-14T06:49:01-05:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">rts/linker: Fix relocation overflow in PE linker
Previously the overflow check for the IMAGE_REL_AMD64_ADDR32NB
relocation failed to account for the signed nature of the value.
Specifically, the overflow check was:
uint64_t v;
v = S + A;
if (v >> 32) { ... }
However, `v` ultimately needs to fit into 32-bits as a signed value.
Consequently, values `v > 2^31` in fact overflow yet this is not caught
by the existing overflow check.
Here we rewrite the overflow check to rather ensure that
`INT32_MIN <= v <= INT32_MAX`. There is now quite a bit of repetition
between the `IMAGE_REL_AMD64_REL32` and `IMAGE_REL_AMD64_ADDR32` cases
but I am leaving fixing this for future work.
This bug was first noticed by @awson.
Fixes #15808.
(cherry picked from commit 6d21ecee535782f01dba9947a49e282afee25724)
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#2b3a5da6af2421fdb559def8637e7fac0436609f">
libraries/Cabal
</a>
</li>
<li class="file-stats">
<a href="#9670354b74fe55079feca82e1510129734b46f4f">
rts/linker/PEi386.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="2b3a5da6af2421fdb559def8637e7fac0436609f">
<a href="https://gitlab.haskell.org/ghc/ghc/-/commit/c58498b2dd95bac99cb3fa9014fa64cf12dd2f18#2b3a5da6af2421fdb559def8637e7fac0436609f"><strong>libraries/Cabal</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 old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="1" 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">
1
</td>
<td class="diff-line-num new_line old" data-linenumber="1" 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;">-Subproject commit <span class="idiff left right">8199c3f838a15fb9b7c8d3527603084b2474d877</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="2" 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="1" 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">
1
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+Subproject commit <span class="idiff left right">bd07f0a095869b91a590d8a564f716a6a136818a</span></pre>
</td>
</tr>
</table>
<br>
</li>
<li id="9670354b74fe55079feca82e1510129734b46f4f">
<a href="https://gitlab.haskell.org/ghc/ghc/-/commit/c58498b2dd95bac99cb3fa9014fa64cf12dd2f18#9670354b74fe55079feca82e1510129734b46f4f"><strong>rts/linker/PEi386.c</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="1943" 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="1943" 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">@@ -1943,13 +1943,15 @@ ocResolve_PEi386 ( ObjectCode* oc )</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1943" 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">
1943
</td>
<td class="diff-line-num new_line" data-linenumber="1943" 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">
1943
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1943" class="line" lang="c"> <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="1944" 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">
1944
</td>
<td class="diff-line-num new_line" data-linenumber="1944" 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">
1944
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1944" class="line" lang="c"> <span class="kt" style="color: #458; font-weight: 600;">uint64_t</span> <span class="n" style="color: #333;">v</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="1945" 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">
1945
</td>
<td class="diff-line-num new_line" data-linenumber="1945" 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">
1945
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1945" class="line" lang="c"> <span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">S</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">A</span><span class="p">;</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="1946" 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">
1946
</td>
<td class="diff-line-num new_line old" data-linenumber="1946" 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="LC1946" class="line" lang="c"> <span class="k" style="font-weight: 600;">if</span> <span class="p">(</span><span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;">>></span> <span class="mi" style="color: #099;">32</span><span class="p">)</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="1947" 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="1946" 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">
1946
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1946" class="line" lang="c"> <span class="c1" style="color: #998; font-style: italic;">// N.B. in the case of the sign-extended relocations we must ensure that v</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="1947" 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="1947" 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">
1947
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1947" class="line" lang="c"> <span class="c1" style="color: #998; font-style: italic;">// fits in a signed 32-bit value. See #15808.</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="1947" 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="1948" 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">
1948
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1948" class="line" lang="c"> <span class="k" style="font-weight: 600;">if</span> <span class="p">(((</span><span class="kt" style="color: #458; font-weight: 600;">int64_t</span><span class="p">)</span> <span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;">></span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">int64_t</span><span class="p">)</span> <span class="n" style="color: #333;">INT32_MAX</span><span class="p">)</span> <span class="o" style="font-weight: 600;">||</span> <span class="p">((</span><span class="kt" style="color: #458; font-weight: 600;">int64_t</span><span class="p">)</span> <span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;"><</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">int64_t</span><span class="p">)</span> <span class="n" style="color: #333;">INT32_MIN</span><span class="p">))</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="1947" 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">
1947
</td>
<td class="diff-line-num new_line" data-linenumber="1949" 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">
1949
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1949" class="line" lang="c"> <span class="n" style="color: #333;">copyName</span> <span class="p">(</span><span class="n" style="color: #333;">getSymShortName</span> <span class="p">(</span><span class="n" style="color: #333;">info</span><span class="p">,</span> <span class="n" style="color: #333;">sym</span><span class="p">),</span> <span class="n" style="color: #333;">oc</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="1948" 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">
1948
</td>
<td class="diff-line-num new_line" data-linenumber="1950" 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">
1950
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1950" class="line" lang="c"> <span class="n" style="color: #333;">symbol</span><span class="p">,</span> <span class="k" style="font-weight: 600;">sizeof</span><span class="p">(</span><span class="n" style="color: #333;">symbol</span><span class="p">)</span><span class="o" style="font-weight: 600;">-</span><span class="mi" style="color: #099;">1</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="1949" 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">
1949
</td>
<td class="diff-line-num new_line" data-linenumber="1951" 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">
1951
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1951" class="line" lang="c"> <span class="n" style="color: #333;">S</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">makeSymbolExtra_PEi386</span><span class="p">(</span><span class="n" style="color: #333;">oc</span><span class="p">,</span> <span class="n" style="color: #333;">symIndex</span><span class="p">,</span> <span class="n" style="color: #333;">S</span><span class="p">,</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">char</span> <span class="o" style="font-weight: 600;">*</span><span class="p">)</span><span class="n" style="color: #333;">symbol</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="1950" 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">
1950
</td>
<td class="diff-line-num new_line" data-linenumber="1952" 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">
1952
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1952" class="line" lang="c"> <span class="cm" style="color: #998; font-style: italic;">/* And retry */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1951" 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">
1951
</td>
<td class="diff-line-num new_line" data-linenumber="1953" 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">
1953
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1953" class="line" lang="c"> <span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">S</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">A</span><span class="p">;</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="1952" 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">
1952
</td>
<td class="diff-line-num new_line old" data-linenumber="1954" 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="LC1952" class="line" lang="c"> <span class="k" style="font-weight: 600;">if</span> <span class="p">(</span><span class="n" style="color: #333;"><span class="idiff left">v</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">>></span></span><span class="idiff"> </span><span class="mi" style="color: #099;"><span class="idiff right">32</span></span><span class="p">)</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="1953" 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="1954" 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">
1954
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1954" class="line" lang="c"> <span class="k" style="font-weight: 600;">if</span> <span class="p">(<span class="idiff left">((</span></span><span class="kt" style="color: #458; font-weight: 600;"><span class="idiff">int64_t</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">v</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">></span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="kt" style="color: #458; font-weight: 600;"><span class="idiff">int64_t</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">INT32_MAX</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">||</span></span><span class="idiff"> </span><span class="p"><span class="idiff">((</span></span><span class="kt" style="color: #458; font-weight: 600;"><span class="idiff">int64_t</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">v</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff"><</span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="kt" style="color: #458; font-weight: 600;"><span class="idiff">int64_t</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">INT32_MIN</span></span><span class="p"><span class="idiff right">)</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="1953" 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">
1953
</td>
<td class="diff-line-num new_line" data-linenumber="1955" 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">
1955
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1955" class="line" lang="c"> <span class="n" style="color: #333;">barf</span><span class="p">(</span><span class="s" style="color: #d14;">"IMAGE_REL_AMD64_ADDR32[NB]: High bits are set in %zx for %s"</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="1954" 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">
1954
</td>
<td class="diff-line-num new_line" data-linenumber="1956" 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">
1956
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1956" class="line" lang="c"> <span class="n" style="color: #333;">v</span><span class="p">,</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">char</span> <span class="o" style="font-weight: 600;">*</span><span class="p">)</span><span class="n" style="color: #333;">symbol</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="1955" 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">
1955
</td>
<td class="diff-line-num new_line" data-linenumber="1957" 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">
1957
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1957" class="line" lang="c"> <span class="p">}</span></span>
</pre>
</td>
</tr>
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1961" 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="1963" 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">@@ -1961,14 +1963,14 @@ ocResolve_PEi386 ( ObjectCode* oc )</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1961" 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">
1961
</td>
<td class="diff-line-num new_line" data-linenumber="1963" 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">
1963
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1963" class="line" lang="c"> <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="1962" 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">
1962
</td>
<td class="diff-line-num new_line" data-linenumber="1964" 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">
1964
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1964" class="line" lang="c"> <span class="kt" style="color: #458; font-weight: 600;">intptr_t</span> <span class="n" style="color: #333;">v</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="1963" 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">
1963
</td>
<td class="diff-line-num new_line" data-linenumber="1965" 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">
1965
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1965" class="line" lang="c"> <span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">S</span> <span class="o" style="font-weight: 600;">+</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">int32_t</span><span class="p">)</span><span class="n" style="color: #333;">A</span> <span class="o" style="font-weight: 600;">-</span> <span class="p">((</span><span class="kt" style="color: #458; font-weight: 600;">intptr_t</span><span class="p">)</span><span class="n" style="color: #333;">pP</span><span class="p">)</span> <span class="o" style="font-weight: 600;">-</span> <span class="mi" style="color: #099;">4</span><span class="p">;</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="1964" 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">
1964
</td>
<td class="diff-line-num new_line old" data-linenumber="1966" 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="LC1964" class="line" lang="c"> <span class="k" style="font-weight: 600;">if</span> <span class="p">((</span><span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;">></span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">int<span class="idiff left">ptr_t</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">INT32_MAX</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><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">v</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff"><</span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="kt" style="color: #458; font-weight: 600;"><span class="idiff right">intptr</span>_t</span><span class="p">)</span> <span class="n" style="color: #333;">INT32_MIN</span><span class="p">))</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="1965" 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="1966" 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">
1966
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1966" class="line" lang="c"> <span class="k" style="font-weight: 600;">if</span> <span class="p">((</span><span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;">></span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">int<span class="idiff left">64_t</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">INT32_MAX</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><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">v</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff"><</span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="kt" style="color: #458; font-weight: 600;"><span class="idiff right">int64</span>_t</span><span class="p">)</span> <span class="n" style="color: #333;">INT32_MIN</span><span class="p">))</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="1965" 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">
1965
</td>
<td class="diff-line-num new_line" data-linenumber="1967" 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">
1967
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1967" class="line" lang="c"> <span class="cm" style="color: #998; font-style: italic;">/* Make the trampoline then */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1966" 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">
1966
</td>
<td class="diff-line-num new_line" data-linenumber="1968" 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">
1968
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1968" class="line" lang="c"> <span class="n" style="color: #333;">copyName</span> <span class="p">(</span><span class="n" style="color: #333;">getSymShortName</span> <span class="p">(</span><span class="n" style="color: #333;">info</span><span class="p">,</span> <span class="n" style="color: #333;">sym</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="1967" 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">
1967
</td>
<td class="diff-line-num new_line" data-linenumber="1969" 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">
1969
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1969" class="line" lang="c"> <span class="n" style="color: #333;">oc</span><span class="p">,</span> <span class="n" style="color: #333;">symbol</span><span class="p">,</span> <span class="k" style="font-weight: 600;">sizeof</span><span class="p">(</span><span class="n" style="color: #333;">symbol</span><span class="p">)</span><span class="o" style="font-weight: 600;">-</span><span class="mi" style="color: #099;">1</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="1968" 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">
1968
</td>
<td class="diff-line-num new_line" data-linenumber="1970" 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">
1970
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1970" class="line" lang="c"> <span class="n" style="color: #333;">S</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">makeSymbolExtra_PEi386</span><span class="p">(</span><span class="n" style="color: #333;">oc</span><span class="p">,</span> <span class="n" style="color: #333;">symIndex</span><span class="p">,</span> <span class="n" style="color: #333;">S</span><span class="p">,</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">char</span> <span class="o" style="font-weight: 600;">*</span><span class="p">)</span><span class="n" style="color: #333;">symbol</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="1969" 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">
1969
</td>
<td class="diff-line-num new_line" data-linenumber="1971" 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">
1971
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1971" class="line" lang="c"> <span class="cm" style="color: #998; font-style: italic;">/* And retry */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1970" 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">
1970
</td>
<td class="diff-line-num new_line" data-linenumber="1972" 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">
1972
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1972" class="line" lang="c"> <span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">S</span> <span class="o" style="font-weight: 600;">+</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">int32_t</span><span class="p">)</span><span class="n" style="color: #333;">A</span> <span class="o" style="font-weight: 600;">-</span> <span class="p">((</span><span class="kt" style="color: #458; font-weight: 600;">intptr_t</span><span class="p">)</span><span class="n" style="color: #333;">pP</span><span class="p">)</span> <span class="o" style="font-weight: 600;">-</span> <span class="mi" style="color: #099;">4</span><span class="p">;</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="1971" 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">
1971
</td>
<td class="diff-line-num new_line old" data-linenumber="1973" 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="LC1971" class="line" lang="c"> <span class="k" style="font-weight: 600;">if</span> <span class="p">((</span><span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;">></span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">int<span class="idiff left">ptr_t</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">INT32_MAX</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><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">v</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff"><</span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="kt" style="color: #458; font-weight: 600;"><span class="idiff right">intptr</span>_t</span><span class="p">)</span> <span class="n" style="color: #333;">INT32_MIN</span><span class="p">))</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="1972" 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="1973" 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">
1973
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1973" class="line" lang="c"> <span class="k" style="font-weight: 600;">if</span> <span class="p">((</span><span class="n" style="color: #333;">v</span> <span class="o" style="font-weight: 600;">></span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">int<span class="idiff left">64_t</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">INT32_MAX</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><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">v</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff"><</span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="kt" style="color: #458; font-weight: 600;"><span class="idiff right">int64</span>_t</span><span class="p">)</span> <span class="n" style="color: #333;">INT32_MIN</span><span class="p">))</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="1972" 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">
1972
</td>
<td class="diff-line-num new_line" data-linenumber="1974" 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">
1974
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1974" class="line" lang="c"> <span class="n" style="color: #333;">barf</span><span class="p">(</span><span class="s" style="color: #d14;">"IMAGE_REL_AMD64_REL32: High bits are set in %zx for %s"</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="1973" 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">
1973
</td>
<td class="diff-line-num new_line" data-linenumber="1975" 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">
1975
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1975" class="line" lang="c"> <span class="n" style="color: #333;">v</span><span class="p">,</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: 600;">char</span> <span class="o" style="font-weight: 600;">*</span><span class="p">)</span><span class="n" style="color: #333;">symbol</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="1974" 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">
1974
</td>
<td class="diff-line-num new_line" data-linenumber="1976" 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">
1976
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1976" class="line" lang="c"> <span class="p">}</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/-/commit/c58498b2dd95bac99cb3fa9014fa64cf12dd2f18">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.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.haskell.org/ghc/ghc/-/commit/c58498b2dd95bac99cb3fa9014fa64cf12dd2f18"}}</script>
</p>
</div>
</body>
</html>