<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<!--[if !mso]><style>v\:* {behavior:url(#default#VML);}
o\:* {behavior:url(#default#VML);}
w\:* {behavior:url(#default#VML);}
.shape {behavior:url(#default#VML);}
</style><![endif]--><style><!--
/* Font Definitions */
@font-face
{font-family:Wingdings;
panose-1:5 0 0 0 0 0 0 0 0 0;}
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:"\@SimSun";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:SimSun;
mso-fareast-language:ZH-CN;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
tt
{mso-style-priority:99;
font-family:SimSun;}
p.msonormal0, li.msonormal0, div.msonormal0
{mso-style-name:msonormal;
mso-margin-top-alt:auto;
margin-right:0cm;
mso-margin-bottom-alt:auto;
margin-left:0cm;
font-size:12.0pt;
font-family:SimSun;
mso-fareast-language:ZH-CN;}
span.EmailStyle21
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
/* List Definitions */
@list l0
{mso-list-id:144708962;
mso-list-template-ids:-93924358;}
@list l0:level1
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Symbol;}
@list l0:level2
{mso-level-number-format:bullet;
mso-level-text:o;
mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:"Courier New";
mso-bidi-font-family:"Times New Roman";}
@list l0:level3
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l0:level4
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l0:level5
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l0:level6
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l0:level7
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l0:level8
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l0:level9
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l1
{mso-list-id:1353335490;
mso-list-template-ids:-1906036602;}
@list l1:level1
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Symbol;}
@list l1:level2
{mso-level-number-format:bullet;
mso-level-text:o;
mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:"Courier New";
mso-bidi-font-family:"Times New Roman";}
@list l1:level3
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l1:level4
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l1:level5
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l1:level6
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l1:level7
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l1:level8
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l1:level9
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l2
{mso-list-id:1783187635;
mso-list-template-ids:1877129606;}
@list l2:level1
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Symbol;}
@list l2:level2
{mso-level-number-format:bullet;
mso-level-text:o;
mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:"Courier New";
mso-bidi-font-family:"Times New Roman";}
@list l2:level3
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l2:level4
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l2:level5
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l2:level6
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l2:level7
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l2:level8
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l2:level9
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l3
{mso-list-id:2106413420;
mso-list-template-ids:-1100849598;}
@list l3:level1
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Symbol;}
@list l3:level2
{mso-level-number-format:bullet;
mso-level-text:o;
mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:"Courier New";
mso-bidi-font-family:"Times New Roman";}
@list l3:level3
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l3:level4
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l3:level5
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l3:level6
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l3:level7
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l3:level8
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
@list l3:level9
{mso-level-number-format:bullet;
mso-level-text:;
mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Wingdings;}
ol
{margin-bottom:0cm;}
ul
{margin-bottom:0cm;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-CA" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">Andrzej, Jinsong, thanks for the help, using `patch` works! I’ll install arcanist as well.</span><span style="font-size:10.0pt;font-family:"Calibri",sans-serif;mso-fareast-language:EN-US"><o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span lang="FR" style="font-size:11.0pt;font-family:"Calibri",sans-serif">De :</span></b><span lang="FR" style="font-size:11.0pt;font-family:"Calibri",sans-serif"> Jinsong Ji <jji@us.ibm.com>
<br>
<b>Envoyé :</b> April 9, 2020 10:48 AM<br>
<b>À :</b> Alexandre Ganea <alexandre.ganea@ubisoft.com><br>
<b>Cc :</b> LLVM Dev <llvm-dev@lists.llvm.org>; llvm-dev <llvm-dev-bounces@lists.llvm.org><br>
<b>Objet :</b> RE: [llvm-dev] Applying patches from Phabricator?<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p><span style="font-size:10.0pt">Or use cherry-pick in your scenario.</span><br>
<br>
<br>
<span style="font-size:10.0pt">If you apply the patch to master</span><o:p></o:p></p>
<p class="MsoNormal" style="margin-left:144.0pt"><span style="font-size:10.0pt;font-family:"Courier New"">F:\llvm-project>curl
</span><a href="https://reviews.llvm.org/D77421?download=true"><span style="font-size:10.0pt;font-family:"Courier New";color:#0563C1">https://reviews.llvm.org/D77421?download=true</span></a><span style="font-size:10.0pt;font-family:"Courier New""> -L >patch.txt</span><br>
<span style="font-size:10.0pt;font-family:"Courier New"">F:\llvm-project>git apply -3 patch.txt</span><o:p></o:p></p>
<p class="MsoNormal">Then switch to 10.x branch and cherry-pick it.<br>
<span style="font-size:10.0pt;font-family:"Courier New"">F:\llvm-project>git checkout release/10.x<br>
<b>F:\llvm-project>git cherry-pick master </b></span><o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:0cm;margin-right:0cm;margin-bottom:12.0pt;margin-left:144.0pt">
<o:p> </o:p></p>
<p class="MsoNormal"><br>
<span style="font-size:10.0pt">If you are using arc, it will be simpler:</span><br>
<br>
<span style="font-size:10.0pt">> arc patch D77421</span><br>
<span style="font-size:10.0pt">> </span><span style="font-size:10.0pt;font-family:"Courier New"">git checkout release/10.x</span><br>
<span style="font-size:10.0pt">> git cherry-pick arcpatch-D77421 </span><br>
<br>
<br>
<span style="font-size:10.0pt"><br>
Best,<br>
<br>
Jinsong Ji (<span lang="ZH-CN">纪金松</span>), PhD.<br>
<br>
XL/LLVM on Power Compiler Development <br>
E-mail: <a href="mailto:jji@us.ibm.com">jji@us.ibm.com</a></span><br>
<br>
<img border="0" width="16" height="16" style="width:.1666in;height:.1666in" id="_x0000_i1025" src="cid:image001.gif@01D60E5D.2A81B7E0" alt="Inactive hide details for Jinsong Ji via llvm-dev ---04/09/2020 10:38:20 AM---Try using patch instead of git (due to fuzz) $ p"><span style="font-size:10.0pt;color:#424282">Jinsong
Ji via llvm-dev ---04/09/2020 10:38:20 AM---Try using patch instead of git (due to fuzz) $ patch -p1 < D77421.diff</span><br>
<br>
<span style="font-size:10.0pt;color:#5F5F5F">From: </span><span style="font-size:10.0pt">Jinsong Ji via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>></span><br>
<span style="font-size:10.0pt;color:#5F5F5F">To: </span><span style="font-size:10.0pt">Alexandre Ganea <<a href="mailto:alexandre.ganea@ubisoft.com">alexandre.ganea@ubisoft.com</a>></span><br>
<span style="font-size:10.0pt;color:#5F5F5F">Cc: </span><span style="font-size:10.0pt">LLVM Dev <<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>>, llvm-dev <<a href="mailto:llvm-dev-bounces@lists.llvm.org">llvm-dev-bounces@lists.llvm.org</a>></span><br>
<span style="font-size:10.0pt;color:#5F5F5F">Date: </span><span style="font-size:10.0pt">04/09/2020 10:38 AM</span><br>
<span style="font-size:10.0pt;color:#5F5F5F">Subject: </span><span style="font-size:10.0pt">[EXTERNAL] Re: [llvm-dev] Applying patches from Phabricator?</span><br>
<span style="font-size:10.0pt;color:#5F5F5F">Sent by: </span><span style="font-size:10.0pt">"llvm-dev" <<a href="mailto:llvm-dev-bounces@lists.llvm.org">llvm-dev-bounces@lists.llvm.org</a>></span><o:p></o:p></p>
<div class="MsoNormal">
<hr size="2" width="100%" noshade="" style="color:#8091A5" align="left">
</div>
<p class="MsoNormal"><br>
<br>
<br>
<span style="font-size:10.0pt">Try using patch instead of git (due to fuzz)</span><br>
<span style="font-size:10.0pt"><br>
$ patch -p1 < D77421.diff <br>
patching file llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp<br>
Hunk #1 succeeded at 454 (offset -46 lines).<br>
Hunk #2 succeeded at 486 with fuzz 1 (offset -47 lines).<br>
Hunk #3 succeeded at 1278 (offset -142 lines).<br>
Hunk #4 succeeded at 1321 (offset -142 lines).<br>
patching file llvm/test/Transforms/WholeProgramDevirt/Inputs/unique-retval-same-vtable.yaml<br>
patching file llvm/test/Transforms/WholeProgramDevirt/import.ll<br>
patching file llvm/test/Transforms/WholeProgramDevirt/unique-retval-same-vtable.ll<br>
patching file llvm/test/Transforms/WholeProgramDevirt/unique-retval.ll</span><br>
<span style="font-size:10.0pt"><br>
<br>
Best,<br>
<br>
Jinsong Ji (<span lang="ZH-CN">纪金松</span>), PhD.<br>
<br>
XL/LLVM on Power Compiler Development <br>
E-mail: <a href="mailto:jji@us.ibm.com">jji@us.ibm.com</a></span><br>
<br>
<img border="0" width="16" height="16" style="width:.1666in;height:.1666in" id="_x0000_i1027" src="cid:image001.gif@01D60E5D.2A81B7E0" alt="Inactive hide details for Alexandre Ganea via llvm-dev ---04/09/2020 10:30:26 AM---Hello, Is there a way for Phabricator to ret"><span style="font-size:10.0pt;color:#424282">Alexandre
Ganea via llvm-dev ---04/09/2020 10:30:26 AM---Hello, Is there a way for Phabricator to retain the patches as originally uploaded?</span><br>
<span style="font-size:10.0pt;color:#5F5F5F"><br>
From: </span><span style="font-size:10.0pt">Alexandre Ganea via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>><span style="color:#5F5F5F"><br>
To: </span>LLVM Dev <<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>>, MyDeveloper Day <<a href="mailto:mydeveloperday@gmail.com">mydeveloperday@gmail.com</a>><span style="color:#5F5F5F"><br>
Date: </span>04/09/2020 10:30 AM<span style="color:#5F5F5F"><br>
Subject: </span>[EXTERNAL] [llvm-dev] Applying patches from Phabricator?<span style="color:#5F5F5F"><br>
Sent by: </span>"llvm-dev" <<a href="mailto:llvm-dev-bounces@lists.llvm.org">llvm-dev-bounces@lists.llvm.org</a>></span><o:p></o:p></p>
<div class="MsoNormal">
<hr size="2" width="100%" noshade="" style="color:#A0A0A0" align="left">
</div>
<p class="MsoNormal"><br>
<br>
<br>
Hello,<br>
<br>
Is there a way for Phabricator to retain the patches as originally uploaded?<br>
When using the “Download Raw Diff” button, it seems Phabricator reformats the patch, loosing the parent commit along the way, so often patches don’t apply.<br>
<br>
The following works, because I’ve got the latest checkout on master, and the patch was rebased recently:
<o:p></o:p></p>
<p class="MsoNormal" style="margin-left:144.0pt"><span style="font-size:10.0pt;font-family:"Courier New"">F:\llvm-project>curl
</span><a href="https://reviews.llvm.org/D77421?download=true"><span style="font-size:10.0pt;font-family:"Courier New";color:#0563C1">https://reviews.llvm.org/D77421?download=true</span></a><span style="font-size:10.0pt;font-family:"Courier New""> -L >patch.txt</span><br>
<span style="font-size:10.0pt;font-family:"Courier New""><br>
F:\llvm-project>git apply -3 patch.txt</span><o:p></o:p></p>
<p class="MsoNormal"><br>
But if I switch to the release branch and try to apply: <o:p></o:p></p>
<p class="MsoNormal" style="margin-left:144.0pt"><span style="font-size:10.0pt;font-family:"Courier New"">F:\llvm-project>git reset && git checkout .<br>
(...)</span><br>
<span style="font-size:10.0pt;font-family:"Courier New"">F:\llvm-project>git checkout release/10.x<br>
(...)</span><br>
<span style="font-size:10.0pt;font-family:"Courier New"">F:\llvm-project>git apply -3 patch.txt<br>
error: patch failed: llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp:529<br>
error: repository lacks the necessary blob to fall back on 3-way merge.<br>
error: llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp: patch does not apply</span><o:p></o:p></p>
<p class="MsoNormal" style="margin-bottom:12.0pt"><br>
Is there some magic I’m not aware of?<br>
<br>
Thanks!<br>
Alex.<tt><span style="font-size:10.0pt">_______________________________________________</span></tt><span style="font-size:10.0pt"><br>
<tt>LLVM Developers mailing list</tt><br>
<tt><a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a></tt><u><span style="color:blue"><br>
</span></u></span><a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev"><tt><span style="font-size:10.0pt">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</span></tt></a><tt><span style="font-size:10.0pt"> </span></tt><br>
<br>
<br>
<tt><span style="font-size:10.0pt">_______________________________________________</span></tt><span style="font-size:10.0pt"><br>
<tt>LLVM Developers mailing list</tt><br>
<tt><a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a></tt><br>
<tt><a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a> </tt><br>
</span><br>
<br>
<o:p></o:p></p>
</div>
</body>
</html>