<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>227269</bug_id>
          
          <creation_ts>2021-06-22 14:13:07 -0700</creation_ts>
          <short_desc>[macOS] Suspend WebProcesses that are in the process cache</short_desc>
          <delta_ts>2021-07-07 09:44:41 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit2</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>ggaren</cc>
    
    <cc>kkinnunen</cc>
    
    <cc>nham</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1771786</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-06-22 14:13:07 -0700</bug_when>
    <thetext>Suspend WebProcesses that are in the process cache on macOS to make sure they use no CPU.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771787</commentid>
    <comment_count>1</comment_count>
      <attachid>431993</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-06-22 14:16:58 -0700</bug_when>
    <thetext>Created attachment 431993
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771797</commentid>
    <comment_count>2</comment_count>
      <attachid>431993</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2021-06-22 14:41:52 -0700</bug_when>
    <thetext>Comment on attachment 431993
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771822</commentid>
    <comment_count>3</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-22 16:48:41 -0700</bug_when>
    <thetext>Committed r279155 (239059@main): &lt;https://commits.webkit.org/239059@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 431993.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771824</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-06-22 16:49:21 -0700</bug_when>
    <thetext>&lt;rdar://problem/79639863&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1773752</commentid>
    <comment_count>5</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-06-30 08:23:10 -0700</bug_when>
    <thetext>Reverted r279155 for reason:

Caused a PLT5 regression

Committed r279411 (239276@main): &lt;https://commits.webkit.org/239276@main&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1774254</commentid>
    <comment_count>6</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-07-01 14:55:52 -0700</bug_when>
    <thetext>I can reproduce the issue on PLT5 locally. I am investigating. 2 of the pages hang for an extended period of time of warm loads (but eventually recover). It looks like the cached process ends up exiting in this case and the load eventually happens in a fresh process. I don&apos;t see any crash report though.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1774256</commentid>
    <comment_count>7</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-07-01 15:04:59 -0700</bug_when>
    <thetext>(In reply to Chris Dumez from comment #6)
&gt; I can reproduce the issue on PLT5 locally. I am investigating. 2 of the
&gt; pages hang for an extended period of time of warm loads (but eventually
&gt; recover). It looks like the cached process ends up exiting in this case and
&gt; the load eventually happens in a fresh process. I don&apos;t see any crash report
&gt; though.

Oh, I think the pages that cause trouble are the ones with service workers. If I look at the logs, I see this logging right after we resume the cached process:
com.apple.WebKit	2021-07-01 14:51:37.071485 -0700	ServiceWorker	error	28186	com.apple.WebKit.WebContent.Development	Failed to terminate service worker with identifier 1535, killing the service worker process

And then the Cached WebProcess dies.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1774276</commentid>
    <comment_count>8</comment_count>
      <attachid>432739</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-07-01 15:54:42 -0700</bug_when>
    <thetext>Created attachment 432739
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1774281</commentid>
    <comment_count>9</comment_count>
      <attachid>432739</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2021-07-01 16:10:19 -0700</bug_when>
    <thetext>Comment on attachment 432739
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1774351</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-01 20:14:34 -0700</bug_when>
    <thetext>Committed r279495 (239347@main): &lt;https://commits.webkit.org/239347@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 432739.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1774959</commentid>
    <comment_count>11</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-07-06 09:00:28 -0700</bug_when>
    <thetext>Reverted r279495 for reason:

Seems to have caused a ~2% PLT5 regression

Committed r279583 (239414@main): &lt;https://commits.webkit.org/239414@main&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1775046</commentid>
    <comment_count>12</comment_count>
      <attachid>432962</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-07-06 12:54:51 -0700</bug_when>
    <thetext>Created attachment 432962
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1775048</commentid>
    <comment_count>13</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-07-06 12:57:43 -0700</bug_when>
    <thetext>(In reply to Chris Dumez from comment #12)
&gt; Created attachment 432962 [details]
&gt; Patch

New iteration, I am currently evaluating its impact on PLT5.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1775057</commentid>
    <comment_count>14</comment_count>
      <attachid>432966</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-07-06 13:22:46 -0700</bug_when>
    <thetext>Created attachment 432966
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1775269</commentid>
    <comment_count>15</comment_count>
      <attachid>432966</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-07-07 08:17:30 -0700</bug_when>
    <thetext>Comment on attachment 432966
Patch

A/B bots say no PLT5 regression with this latest iteration.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1775296</commentid>
    <comment_count>16</comment_count>
      <attachid>432966</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2021-07-07 09:36:27 -0700</bug_when>
    <thetext>Comment on attachment 432966
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1775299</commentid>
    <comment_count>17</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-07 09:44:39 -0700</bug_when>
    <thetext>Committed r279644 (239457@main): &lt;https://commits.webkit.org/239457@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 432966.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431993</attachid>
            <date>2021-06-22 14:16:58 -0700</date>
            <delta_ts>2021-07-01 15:54:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227269-20210622141657.patch</filename>
            <type>text/plain</type>
            <size>6911</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQyNmViMTY2ZmIyZWRkOTJi
Mjk0NjQyM2E3YmZjZTgyN2ZhN2ZjODUuLjcwMmUwNTc4YTExODVhOWEzMjRhYmMxZDc3OWQ3YWJi
N2ZjMDM1MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMDYtMjIgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFN1c3BlbmQgV2ViUHJv
Y2Vzc2VzIHRoYXQgYXJlIGluIHRoZSBwcm9jZXNzIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjcyNjkKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdXNwZW5kIFdlYlByb2Nlc3NlcyB0aGF0IGFy
ZSBpbiB0aGUgcHJvY2VzcyBjYWNoZSBvbiBtYWNPUyB0byBtYWtlIHN1cmUgdGhleSB1c2Ugbm8g
Q1BVLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAgICAg
IChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6c2V0SXNJblByb2Nlc3NDYWNoZSk6CisgICAgICAg
IChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cGxhdGZvcm1TdXNwZW5kUHJvY2Vzcyk6CisgICAg
ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cGxhdGZvcm1SZXN1bWVQcm9jZXNzKToKKyAg
ICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNz
L21hYy9XZWJQcm9jZXNzUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQ
cm94eTo6cGxhdGZvcm1TdXNwZW5kUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl
c3NQcm94eTo6cGxhdGZvcm1SZXN1bWVQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl
YlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vz
c0NhY2hlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuaDoKKyAgICAgICAgKiBX
ZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW46CisKIDIwMjEtMDYtMjIgIEtpbW1vIEtp
bm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBGdW5jdGlvbnMgZGlzcGF0
Y2hlZCB0byBXb3JrUXVldWUgYXJlIHNvbWV0aW1lcyBkZXN0cm95ZWQgaW4gdGhlIGNhbGxpbmcg
dGhyZWFkIGR1ZSB0byBibG9jayByZWZjb3VudGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXggMTA3YTJiYjBmNTM3MjA1MDE5MjI2NjQwM2RmY2Q5
NWNjYTcwYTVjMy4uMjc1MzA3YzQ5Y2RlNTczY2ZkMzBkNGNkMDEyMWRhMDg3ZGViMTY2MiAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAorKysg
Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBAIC0yODMsNyAr
MjgzLDEzIEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpzZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wg
dmFsdWUpCiAgICAgQVNTRVJUKG1faXNJblByb2Nlc3NDYWNoZSAhPSB2YWx1ZSk7CiAgICAgbV9p
c0luUHJvY2Vzc0NhY2hlID0gdmFsdWU7CiAKLSAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNz
OjpTZXRJc0luUHJvY2Vzc0NhY2hlKG1faXNJblByb2Nlc3NDYWNoZSksIDApOworICAgIGlmICgh
bV9pc0luUHJvY2Vzc0NhY2hlKQorICAgICAgICBwbGF0Zm9ybVJlc3VtZVByb2Nlc3MoKTsKKwor
ICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0SXNJblByb2Nl
c3NDYWNoZShtX2lzSW5Qcm9jZXNzQ2FjaGUpLCBbd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhp
cyksIGlzRW50ZXJpbmdQcm9jZXNzQ2FjaGUgPSB2YWx1ZV0oKSBtdXRhYmxlIHsKKyAgICAgICAg
aWYgKGlzRW50ZXJpbmdQcm9jZXNzQ2FjaGUgJiYgd2Vha1RoaXMgJiYgd2Vha1RoaXMtPm1faXNJ
blByb2Nlc3NDYWNoZSkKKyAgICAgICAgICAgIHdlYWtUaGlzLT5wbGF0Zm9ybVN1c3BlbmRQcm9j
ZXNzKCk7CisgICAgfSk7CiAKICAgICBpZiAobV9pc0luUHJvY2Vzc0NhY2hlKSB7CiAgICAgICAg
IC8vIFdlYlByb2Nlc3NQcm94eSBvYmplY3RzIG5vcm1hbGx5IGtlZXAgdGhlIHByb2Nlc3MgcG9v
bCBhbGl2ZSBidXQgd2UgZG8gbm90IHdhbnQgdGhpcyB0byBiZSB0aGUgY2FzZQpAQCAtMTk1NCw2
ICsxOTYwLDE2IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpzeXN0ZW1CZWVwKCkKICAgICBQQUw6
OnN5c3RlbUJlZXAoKTsKIH0KIAorI2lmICFQTEFURk9STShNQUMpCit2b2lkIFdlYlByb2Nlc3NQ
cm94eTo6cGxhdGZvcm1TdXNwZW5kUHJvY2VzcygpCit7Cit9CisKK3ZvaWQgV2ViUHJvY2Vzc1By
b3h5OjpwbGF0Zm9ybVJlc3VtZVByb2Nlc3MoKQoreworfQorI2VuZGlmCisKIH0gLy8gbmFtZXNw
YWNlIFdlYktpdAogCiAjdW5kZWYgTUVTU0FHRV9DSEVDSwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQcm9jZXNzUHJveHkuaAppbmRleCBlMjI1ZmY0NjdkYzg0YjU3NmRjMjVkNjYyNTAyOGI2
MDE5Y2Y1ZTg5Li4zNWNjYjg5Mjk4YWU5YjZjMWMxYTc2MmIzMGQyZjBmODFiZjI0MjlkIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAorKysgYi9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaApAQCAtNDcxLDYgKzQ3MSw5
IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHByb2Nlc3NEaWRUZXJtaW5hdGVPckZhaWxlZFRvTGF1
bmNoKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbik7CiAKKyAgICB2b2lkIHBsYXRmb3JtU3VzcGVu
ZFByb2Nlc3MoKTsKKyAgICB2b2lkIHBsYXRmb3JtUmVzdW1lUHJvY2VzcygpOworCiAgICAgLy8g
SVBDOjpDb25uZWN0aW9uOjpDbGllbnQKICAgICBmcmllbmQgY2xhc3MgV2ViQ29ubmVjdGlvblRv
V2ViUHJvY2VzczsKICAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYs
IElQQzo6RGVjb2RlciYpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvbWFjL1dlYlByb2Nlc3NQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L21hYy9XZWJQcm9jZXNzUHJveHlNYWMubW0KaW5kZXggOTNkZTIyNmU0MGIxMTc4ZmE3MTRhN2Ni
ODk5NzEwNTJkM2U0MmEyMS4uMzBmOTYwMzI2MzVkNWU2YjQ0MTMyODdiNWZlMzhmNGNkYzJlOGMw
ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlByb2Nlc3NQcm94
eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc1Byb3h5
TWFjLm1tCkBAIC0zMSw2ICszMSw3IEBACiAKICNpbXBvcnQgIldLRnVsbEtleWJvYXJkQWNjZXNz
V2F0Y2hlci5oIgogI2ltcG9ydCA8S2VybmVsL2tlcm4vY3NfYmxvYnMuaD4KKyNpbXBvcnQgPHNp
Z25hbC5oPgogI2ltcG9ydCA8d3RmL1Byb2Nlc3NQcml2aWxlZ2UuaD4KICNpbXBvcnQgPHd0Zi9z
cGkvY29jb2EvU2VjdXJpdHlTUEkuaD4KIApAQCAtNzgsNiArNzksMjQgQEAgdm9pZCBXZWJQcm9j
ZXNzUHJveHk6OnNldERpc3BsYXlMaW5rUHJlZmVycmVkRnJhbWVzUGVyU2Vjb25kKERpc3BsYXlM
aW5rT2JzZXJ2ZXIKICAgICBwcm9jZXNzUG9vbCgpLnNldERpc3BsYXlMaW5rUHJlZmVycmVkRnJh
bWVzUGVyU2Vjb25kKCpjb25uZWN0aW9uKCksIG9ic2VydmVySUQsIGRpc3BsYXlJRCwgcHJlZmVy
cmVkRnJhbWVzUGVyU2Vjb25kKTsKIH0KIAordm9pZCBXZWJQcm9jZXNzUHJveHk6OnBsYXRmb3Jt
U3VzcGVuZFByb2Nlc3MoKQoreworICAgIFJFTEVBU0VfTE9HKFByb2Nlc3MsICIlcCAtIFtQSUQ9
JWldIFdlYlByb2Nlc3NQcm94eTo6cGxhdGZvcm1TdXNwZW5kUHJvY2VzcyIsIHRoaXMsIHByb2Nl
c3NJZGVudGlmaWVyKCkpOworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lO
CisgICAgaWYgKGF1dG8qIGNvbm5lY3Rpb24gPSB0aGlzLT5jb25uZWN0aW9uKCkpCisgICAgICAg
IHhwY19jb25uZWN0aW9uX2tpbGwoY29ubmVjdGlvbi0+eHBjQ29ubmVjdGlvbigpLCBTSUdTVE9Q
KTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKK30KKwordm9pZCBXZWJQ
cm9jZXNzUHJveHk6OnBsYXRmb3JtUmVzdW1lUHJvY2VzcygpCit7CisgICAgUkVMRUFTRV9MT0co
UHJvY2VzcywgIiVwIC0gW1BJRD0laV0gV2ViUHJvY2Vzc1Byb3h5OjpwbGF0Zm9ybVJlc3VtZVBy
b2Nlc3MiLCB0aGlzLCBwcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICBBTExPV19ERVBSRUNBVEVE
X0RFQ0xBUkFUSU9OU19CRUdJTgorICAgIGlmIChhdXRvKiBjb25uZWN0aW9uID0gdGhpcy0+Y29u
bmVjdGlvbigpKQorICAgICAgICB4cGNfY29ubmVjdGlvbl9raWxsKGNvbm5lY3Rpb24tPnhwY0Nv
bm5lY3Rpb24oKSwgU0lHQ09OVCk7CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNf
RU5ECit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gUExBVEZPUk0oTUFD
KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwIGIv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCmluZGV4IGRiNGMyMjgzMjNh
ODAzMTYwYTA5ZDU2OWY3NTNkMjgwYzRjYmM4MmYuLjAxOWRhZjNhMTE2OTIxMjQ3ZGMzZWJiMjRj
ZTAxMGVhZWE3ZDQxMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ
cm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAK
QEAgLTYwNSw3ICs2MDUsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnNldEhhc1N1c3BlbmRlZFBhZ2VQ
cm94eShib29sIGhhc1N1c3BlbmRlZFBhZ2VQcm94eSkKICAgICBtX2hhc1N1c3BlbmRlZFBhZ2VQ
cm94eSA9IGhhc1N1c3BlbmRlZFBhZ2VQcm94eTsKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjpzZXRJ
c0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nlc3NDYWNoZSkKK3ZvaWQgV2ViUHJvY2Vzczo6
c2V0SXNJblByb2Nlc3NDYWNoZShib29sIGlzSW5Qcm9jZXNzQ2FjaGUsIENvbXBsZXRpb25IYW5k
bGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICNpZiBQTEFURk9STShDT0NPQSkK
ICAgICBpZiAoaXNJblByb2Nlc3NDYWNoZSkgewpAQCAtNjIwLDYgKzYyMCw4IEBAIHZvaWQgV2Vi
UHJvY2Vzczo6c2V0SXNJblByb2Nlc3NDYWNoZShib29sIGlzSW5Qcm9jZXNzQ2FjaGUpCiAjZWxz
ZQogICAgIFVOVVNFRF9QQVJBTShpc0luUHJvY2Vzc0NhY2hlKTsKICNlbmRpZgorCisgICAgY29t
cGxldGlvbkhhbmRsZXIoKTsKIH0KIAogdm9pZCBXZWJQcm9jZXNzOjptYXJrSXNOb0xvbmdlclBy
ZXdhcm1lZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vz
cy5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAppbmRleCA0MDQ1ZTdk
M2U5ZDI3ZTUxZTJkNGU5ZmVjNDhiYjc5Mjk0ODJjOTVkLi5jNWFhNTI4YTkwNDA1ZGFlZDcxOGUz
MjA0ODY2ODBlYjYwNmZlY2NmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViUHJvY2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgK
QEAgLTQyMCw3ICs0MjAsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcGxhdGZvcm1UZXJtaW5hdGUo
KTsKIAogICAgIHZvaWQgc2V0SGFzU3VzcGVuZGVkUGFnZVByb3h5KGJvb2wpOwotICAgIHZvaWQg
c2V0SXNJblByb2Nlc3NDYWNoZShib29sKTsKKyAgICB2b2lkIHNldElzSW5Qcm9jZXNzQ2FjaGUo
Ym9vbCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICAgICB2b2lkIG1hcmtJc05vTG9u
Z2VyUHJld2FybWVkKCk7CiAKICAgICB2b2lkIHJlZ2lzdGVyVVJMU2NoZW1lQXNFbXB0eURvY3Vt
ZW50KGNvbnN0IFN0cmluZyYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYlByb2Nlc3MubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJv
Y2Vzcy5tZXNzYWdlcy5pbgppbmRleCA2MWYyNThiMzBlZjRlNjEzZjYyNGQ3ZmNjYTZlN2QxMjE3
YTc0ZDUzLi4zZTZlMGVlMmRkNzhjYzY4ZTFkMjEzZDU2OTVhYzllMjA5YjMwMDdiIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbgorKysg
Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbgpAQCAtMTA1
LDcgKzEwNSw3IEBAIG1lc3NhZ2VzIC0+IFdlYlByb2Nlc3MgTGVnYWN5UmVjZWl2ZXIgTm90UmVm
Q291bnRlZCB7CiAjZW5kaWYKIAogICAgIFNldEhhc1N1c3BlbmRlZFBhZ2VQcm94eShib29sIGhh
c1N1c3BlbmRlZFBhZ2VQcm94eSk7Ci0gICAgU2V0SXNJblByb2Nlc3NDYWNoZShib29sIGlzSW5Q
cm9jZXNzQ2FjaGUpCisgICAgU2V0SXNJblByb2Nlc3NDYWNoZShib29sIGlzSW5Qcm9jZXNzQ2Fj
aGUpIC0+ICgpIEFzeW5jCiAgICAgTWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoKQogICAgIEdldEFj
dGl2ZVBhZ2VzT3JpZ2luc0ZvclRlc3RpbmcoKSAtPiAoVmVjdG9yPFN0cmluZz4gYWN0aXZlT3Jp
Z2lucykgQXN5bmMKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432739</attachid>
            <date>2021-07-01 15:54:42 -0700</date>
            <delta_ts>2021-07-06 12:54:49 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227269-20210701155441.patch</filename>
            <type>text/plain</type>
            <size>9859</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NDgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ2OTAxMjZjOGQzMDhkMTYw
ODk2ODVlNmU1NGM0YWZhOWI5N2NlOGYuLmRlNjc1ZWY2ODQ4MDE1YzQxN2I4MjYwN2JmOGYyNzVk
NGM0MmNiNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMDctMDEgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFN1c3BlbmQgV2ViUHJv
Y2Vzc2VzIHRoYXQgYXJlIGluIHRoZSBwcm9jZXNzIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjcyNjkKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdXNwZW5kIFdlYlByb2Nlc3NlcyB0aGF0IGFy
ZSBpbiB0aGUgcHJvY2VzcyBjYWNoZSBvbiBtYWNPUyB0byBtYWtlIHN1cmUgdGhleSB1c2Ugbm8g
Q1BVLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAgICAg
IChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6c2V0SXNJblByb2Nlc3NDYWNoZSk6CisgICAgICAg
IChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cGxhdGZvcm1TdXNwZW5kUHJvY2Vzcyk6CisgICAg
ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6cGxhdGZvcm1SZXN1bWVQcm9jZXNzKToKKyAg
ICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNz
L21hYy9XZWJQcm9jZXNzUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQ
cm94eTo6cGxhdGZvcm1TdXNwZW5kUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl
c3NQcm94eTo6cGxhdGZvcm1SZXN1bWVQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl
YlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vz
c0NhY2hlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuaDoKKyAgICAgICAgKiBX
ZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW46CisKIDIwMjEtMDctMDEgIFlvdWVubiBG
YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIERpc2FibGUgcmVsYXkgZm9yIFVE
UCBzb2NrZXRzIHdoZW4gbm90IG5lZWRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29y
a2Vycy9zZXJ2aWNlL2NvbnRleHQvU1dDb250ZXh0TWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViQ29y
ZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TV0NvbnRleHRNYW5hZ2VyLmNwcAppbmRleCBhN2Rh
MDBkOTZjMDBkZGQ4OTA2ZDgyNzVmNmRhMmRjNDg5YjM2YTJjLi41ZTYwYTdjZjY1NmZhN2E1ODY1
ZDFhYzcyNDk5NDU1YjE4ODM4NWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJz
L3NlcnZpY2UvY29udGV4dC9TV0NvbnRleHRNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TV0NvbnRleHRNYW5hZ2VyLmNwcApAQCAtMTQzLDEy
ICsxNDMsMjUgQEAgdm9pZCBTV0NvbnRleHRNYW5hZ2VyOjpzdG9wV29ya2VyKFNlcnZpY2VXb3Jr
ZXJUaHJlYWRQcm94eSYgc2VydmljZVdvcmtlciwgU2Vjb24KICAgICAgICAgaWYgKGNvbXBsZXRp
b25IYW5kbGVyKQogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKIAorICAgICAgICBp
ZiAobV9wZW5kaW5nU2VydmljZVdvcmtlclRlcm1pbmF0aW9uUmVxdWVzdHMuaXNFbXB0eSgpKSB7
CisgICAgICAgICAgICBmb3IgKGF1dG8mIGhhbmRsZXIgOiBzdGQ6OmV4Y2hhbmdlKG1fd2hlblRl
cm1pbmF0aW9uUmVxdWVzdHNBcmVEb25lSGFuZGxlcnMsIHsgfSkpCisgICAgICAgICAgICAgICAg
aGFuZGxlcigpOworICAgICAgICB9CisKICAgICAgICAgLy8gU3BpbiB0aGUgcnVubG9vcCBiZWZv
cmUgcmVsZWFzaW5nIHRoZSB3b3JrZXIgdGhyZWFkIHByb3h5LCBhcyB0aGVyZSB3b3VsZCBvdGhl
cndpc2UgYmUKICAgICAgICAgLy8gYSByYWNlIHRvd2FyZHMgaXRzIGRlc3RydWN0aW9uLgogICAg
ICAgICBjYWxsT25NYWluVGhyZWFkKFtzZXJ2aWNlV29ya2VyID0gV1RGTW92ZShzZXJ2aWNlV29y
a2VyKV0geyB9KTsKICAgICB9KTsKIH0KIAordm9pZCBTV0NvbnRleHRNYW5hZ2VyOjp3aGVuVGVy
bWluYXRpb25SZXF1ZXN0c0FyZURvbmUoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBs
ZXRpb25IYW5kbGVyKQoreworICAgIGlmIChtX3BlbmRpbmdTZXJ2aWNlV29ya2VyVGVybWluYXRp
b25SZXF1ZXN0cy5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcigp
OworCisgICAgbV93aGVuVGVybWluYXRpb25SZXF1ZXN0c0FyZURvbmVIYW5kbGVycy5hcHBlbmQo
V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworfQorCiB2b2lkIFNXQ29udGV4dE1hbmFnZXI6
OmZvckVhY2hTZXJ2aWNlV29ya2VyVGhyZWFkKGNvbnN0IFdURjo6RnVuY3Rpb248dm9pZChTZXJ2
aWNlV29ya2VyVGhyZWFkUHJveHkmKT4mIGFwcGx5KQogewogICAgIGZvciAoYXV0byYgd29ya2Vy
VGhyZWFkIDogbV93b3JrZXJNYXAudmFsdWVzKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TV0NvbnRleHRNYW5hZ2VyLmggYi9Tb3VyY2UvV2Vi
Q29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TV0NvbnRleHRNYW5hZ2VyLmgKaW5kZXggMTkx
MDUyN2FjZDA5MmI2MjM4ZTBiOTBlYTgyMDM4ZjIyMmRkMzJhOS4uYWQwOTM4M2Q0ZDQ3ODJjOGM1
OGNhNGE4MjYxYzg1ZWE0N2E5Y2U5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vy
cy9zZXJ2aWNlL2NvbnRleHQvU1dDb250ZXh0TWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NXQ29udGV4dE1hbmFnZXIuaApAQCAtMTA3LDYgKzEw
Nyw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgY29uc3RleHByIFNlY29uZHMgd29ya2VyVGVybWlu
YXRpb25UaW1lb3V0IHsgMTBfcyB9OwogICAgIHN0YXRpYyBjb25zdGV4cHIgU2Vjb25kcyBzeW5j
V29ya2VyVGVybWluYXRpb25UaW1lb3V0IHsgMTAwX21zIH07IC8vIE9ubHkgdXNlZCBieSBsYXlv
dXQgdGVzdHMuCiAKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHdoZW5UZXJtaW5hdGlvblJlcXVl
c3RzQXJlRG9uZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOworCiBwcml2YXRlOgogICAg
IFNXQ29udGV4dE1hbmFnZXIoKSA9IGRlZmF1bHQ7CiAKQEAgLTEyOCw2ICsxMzAsNyBAQCBwcml2
YXRlOgogICAgICAgICBUaW1lciBtX3RpbWVvdXRUaW1lcjsKICAgICB9OwogICAgIEhhc2hNYXA8
U2VydmljZVdvcmtlcklkZW50aWZpZXIsIHN0ZDo6dW5pcXVlX3B0cjxTZXJ2aWNlV29ya2VyVGVy
bWluYXRpb25SZXF1ZXN0Pj4gbV9wZW5kaW5nU2VydmljZVdvcmtlclRlcm1pbmF0aW9uUmVxdWVz
dHM7CisgICAgVmVjdG9yPENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4+IG1fd2hlblRlcm1pbmF0
aW9uUmVxdWVzdHNBcmVEb25lSGFuZGxlcnM7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3Bw
IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCA5OGI4
MzY5MGVjNTBiY2NkODg2NmNkYjRjN2RjOWQ4M2M3ODI5MmRlLi4wYTgwNmJhNjc4ODRmN2U3MDZm
ZDI5OWU5N2JlYmVjZTk2ZTg1ZmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBy
b2Nlc3NQcm94eS5jcHAKQEAgLTI4OSw3ICsyODksMTMgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6
OnNldElzSW5Qcm9jZXNzQ2FjaGUoYm9vbCB2YWx1ZSkKICAgICBBU1NFUlQobV9pc0luUHJvY2Vz
c0NhY2hlICE9IHZhbHVlKTsKICAgICBtX2lzSW5Qcm9jZXNzQ2FjaGUgPSB2YWx1ZTsKIAotICAg
IHNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldElzSW5Qcm9jZXNzQ2FjaGUobV9pc0luUHJv
Y2Vzc0NhY2hlKSwgMCk7CisgICAgaWYgKCFtX2lzSW5Qcm9jZXNzQ2FjaGUpCisgICAgICAgIHBs
YXRmb3JtUmVzdW1lUHJvY2VzcygpOworCisgICAgc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2Vz
OjpXZWJQcm9jZXNzOjpTZXRJc0luUHJvY2Vzc0NhY2hlKG1faXNJblByb2Nlc3NDYWNoZSksIFt3
ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgaXNFbnRlcmluZ1Byb2Nlc3NDYWNoZSA9IHZh
bHVlXSgpIG11dGFibGUgeworICAgICAgICBpZiAoaXNFbnRlcmluZ1Byb2Nlc3NDYWNoZSAmJiB3
ZWFrVGhpcyAmJiB3ZWFrVGhpcy0+bV9pc0luUHJvY2Vzc0NhY2hlKQorICAgICAgICAgICAgd2Vh
a1RoaXMtPnBsYXRmb3JtU3VzcGVuZFByb2Nlc3MoKTsKKyAgICB9KTsKIAogICAgIGlmIChtX2lz
SW5Qcm9jZXNzQ2FjaGUpIHsKICAgICAgICAgLy8gV2ViUHJvY2Vzc1Byb3h5IG9iamVjdHMgbm9y
bWFsbHkga2VlcCB0aGUgcHJvY2VzcyBwb29sIGFsaXZlIGJ1dCB3ZSBkbyBub3Qgd2FudCB0aGlz
IHRvIGJlIHRoZSBjYXNlCkBAIC0yMDAzLDYgKzIwMDksMTYgQEAgdm9pZCBXZWJQcm9jZXNzUHJv
eHk6OnN5c3RlbUJlZXAoKQogICAgIFBBTDo6c3lzdGVtQmVlcCgpOwogfQogCisjaWYgIVBMQVRG
T1JNKE1BQykKK3ZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpwbGF0Zm9ybVN1c3BlbmRQcm9jZXNzKCkK
K3sKK30KKwordm9pZCBXZWJQcm9jZXNzUHJveHk6OnBsYXRmb3JtUmVzdW1lUHJvY2VzcygpCit7
Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICN1bmRlZiBNRVNTQUdFX0NI
RUNLCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku
aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCmluZGV4IGUyMjVm
ZjQ2N2RjODRiNTc2ZGMyNWQ2NjI1MDI4YjYwMTljZjVlODkuLjM1Y2NiODkyOThhZTliNmMxYzFh
NzYyYjMwZDJmMGY4MWJmMjQyOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L1dlYlByb2Nlc3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl
c3NQcm94eS5oCkBAIC00NzEsNiArNDcxLDkgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgcHJvY2Vz
c0RpZFRlcm1pbmF0ZU9yRmFpbGVkVG9MYXVuY2goUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uKTsK
IAorICAgIHZvaWQgcGxhdGZvcm1TdXNwZW5kUHJvY2VzcygpOworICAgIHZvaWQgcGxhdGZvcm1S
ZXN1bWVQcm9jZXNzKCk7CisKICAgICAvLyBJUEM6OkNvbm5lY3Rpb246OkNsaWVudAogICAgIGZy
aWVuZCBjbGFzcyBXZWJDb25uZWN0aW9uVG9XZWJQcm9jZXNzOwogICAgIHZvaWQgZGlkUmVjZWl2
ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJikgb3ZlcnJpZGU7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc1Byb3h5TWFjLm1t
IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlByb2Nlc3NQcm94eU1hYy5tbQppbmRl
eCA5M2RlMjI2ZTQwYjExNzhmYTcxNGE3Y2I4OTk3MTA1MmQzZTQyYTIxLi4zMGY5NjAzMjYzNWQ1
ZTZiNDQxMzI4N2I1ZmUzOGY0Y2RjMmU4YzBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc1Byb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL21hYy9XZWJQcm9jZXNzUHJveHlNYWMubW0KQEAgLTMxLDYgKzMxLDcgQEAKIAogI2lt
cG9ydCAiV0tGdWxsS2V5Ym9hcmRBY2Nlc3NXYXRjaGVyLmgiCiAjaW1wb3J0IDxLZXJuZWwva2Vy
bi9jc19ibG9icy5oPgorI2ltcG9ydCA8c2lnbmFsLmg+CiAjaW1wb3J0IDx3dGYvUHJvY2Vzc1By
aXZpbGVnZS5oPgogI2ltcG9ydCA8d3RmL3NwaS9jb2NvYS9TZWN1cml0eVNQSS5oPgogCkBAIC03
OCw2ICs3OSwyNCBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6c2V0RGlzcGxheUxpbmtQcmVmZXJy
ZWRGcmFtZXNQZXJTZWNvbmQoRGlzcGxheUxpbmtPYnNlcnZlcgogICAgIHByb2Nlc3NQb29sKCku
c2V0RGlzcGxheUxpbmtQcmVmZXJyZWRGcmFtZXNQZXJTZWNvbmQoKmNvbm5lY3Rpb24oKSwgb2Jz
ZXJ2ZXJJRCwgZGlzcGxheUlELCBwcmVmZXJyZWRGcmFtZXNQZXJTZWNvbmQpOwogfQogCit2b2lk
IFdlYlByb2Nlc3NQcm94eTo6cGxhdGZvcm1TdXNwZW5kUHJvY2VzcygpCit7CisgICAgUkVMRUFT
RV9MT0coUHJvY2VzcywgIiVwIC0gW1BJRD0laV0gV2ViUHJvY2Vzc1Byb3h5OjpwbGF0Zm9ybVN1
c3BlbmRQcm9jZXNzIiwgdGhpcywgcHJvY2Vzc0lkZW50aWZpZXIoKSk7CisgICAgQUxMT1dfREVQ
UkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KKyAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IHRo
aXMtPmNvbm5lY3Rpb24oKSkKKyAgICAgICAgeHBjX2Nvbm5lY3Rpb25fa2lsbChjb25uZWN0aW9u
LT54cGNDb25uZWN0aW9uKCksIFNJR1NUT1ApOworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFS
QVRJT05TX0VORAorfQorCit2b2lkIFdlYlByb2Nlc3NQcm94eTo6cGxhdGZvcm1SZXN1bWVQcm9j
ZXNzKCkKK3sKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzLCAiJXAgLSBbUElEPSVpXSBXZWJQcm9j
ZXNzUHJveHk6OnBsYXRmb3JtUmVzdW1lUHJvY2VzcyIsIHRoaXMsIHByb2Nlc3NJZGVudGlmaWVy
KCkpOworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCisgICAgaWYgKGF1
dG8qIGNvbm5lY3Rpb24gPSB0aGlzLT5jb25uZWN0aW9uKCkpCisgICAgICAgIHhwY19jb25uZWN0
aW9uX2tpbGwoY29ubmVjdGlvbi0+eHBjQ29ubmVjdGlvbigpLCBTSUdDT05UKTsKKyAgICBBTExP
V19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0
CiAKICNlbmRpZiAvLyBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJv
Y2Vzcy5jcHAKaW5kZXggODdjYzQyMmE1OTJkYmI2YzU0NzIxOTE4OWE1Nzg1N2RhOTRkMTI2MC4u
YWY2NjBmYjljZGZiYTIyY2Q1YTM5NTc5OWY4ODUzMzg5N2Q0N2RiNSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApAQCAtNjE0LDcgKzYxNCw3IEBAIHZvaWQgV2ViUHJv
Y2Vzczo6c2V0SGFzU3VzcGVuZGVkUGFnZVByb3h5KGJvb2wgaGFzU3VzcGVuZGVkUGFnZVByb3h5
KQogICAgIG1faGFzU3VzcGVuZGVkUGFnZVByb3h5ID0gaGFzU3VzcGVuZGVkUGFnZVByb3h5Owog
fQogCi12b2lkIFdlYlByb2Nlc3M6OnNldElzSW5Qcm9jZXNzQ2FjaGUoYm9vbCBpc0luUHJvY2Vz
c0NhY2hlKQordm9pZCBXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblBy
b2Nlc3NDYWNoZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVy
KQogewogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmIChpc0luUHJvY2Vzc0NhY2hlKSB7CkBA
IC02MjksNiArNjI5LDE4IEBAIHZvaWQgV2ViUHJvY2Vzczo6c2V0SXNJblByb2Nlc3NDYWNoZShi
b29sIGlzSW5Qcm9jZXNzQ2FjaGUpCiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShpc0luUHJvY2Vz
c0NhY2hlKTsKICNlbmRpZgorCisjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQorICAgIGlmIChp
c0luUHJvY2Vzc0NhY2hlKSB7CisgICAgICAgIC8vIFdoZW4gY2FsbGluZyB0aGUgY29tcGxldGlv
biBoYW5kbGVyLCB0aGUgcGFyZW50IHByb2Nlc3MgbWF5IHN1c3BlbmQgdXMuIFdlIGRvIG5vdCB3
YW50IHRvIGdldCBzdXNwZW5kZWQgdW50aWwgcGVuZGluZyByZXF1ZXN0cyB0bworICAgICAgICAv
LyBzdG9wIHNlcnZpY2Ugd29ya2VycyBhcmUgcHJvY2Vzc2VkIGJlY2F1c2UgdGhpcyB3b3VsZCBi
ZSB3YXN0ZWZ1bCBmcm9tIGEgbWVtb3J5IHN0YW5kcG9pbnQuIEFsc28sIHNlcnZpY2Ugd29ya2Vy
IHRlcm1pbmF0aW9uCisgICAgICAgIC8vIHJlcXVlc3RzIGhhdmUgYSB0aW1lb3V0IGFuZCB0aGlz
IHRpbWVvdXQgd291bGQgYmUgcmVhY2hlZCBpZiB3ZSBzdXNwZW5kZWQgd2hpbGUgaXQgaXMgYmVp
bmcgcHJvY2Vzc2VkLgorICAgICAgICBTV0NvbnRleHRNYW5hZ2VyOjpzaW5nbGV0b24oKS53aGVu
VGVybWluYXRpb25SZXF1ZXN0c0FyZURvbmUoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwor
ICAgICAgICByZXR1cm47CisgICAgfQorI2VuZGlmCisKKyAgICBjb21wbGV0aW9uSGFuZGxlcigp
OwogfQogCiB2b2lkIFdlYlByb2Nlc3M6Om1hcmtJc05vTG9uZ2VyUHJld2FybWVkKCkKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmggYi9Tb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCmluZGV4IDQwNDVlN2QzZTlkMjdlNTFlMmQ0ZTlm
ZWM0OGJiNzkyOTQ4MmM5NWQuLmM1YWE1MjhhOTA0MDVkYWVkNzE4ZTMyMDQ4NjY4MGViNjA2ZmVj
Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKKysr
IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaApAQCAtNDIwLDcgKzQyMCw3
IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybVRlcm1pbmF0ZSgpOwogCiAgICAgdm9pZCBz
ZXRIYXNTdXNwZW5kZWRQYWdlUHJveHkoYm9vbCk7Ci0gICAgdm9pZCBzZXRJc0luUHJvY2Vzc0Nh
Y2hlKGJvb2wpOworICAgIHZvaWQgc2V0SXNJblByb2Nlc3NDYWNoZShib29sLCBDb21wbGV0aW9u
SGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgbWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoKTsK
IAogICAgIHZvaWQgcmVnaXN0ZXJVUkxTY2hlbWVBc0VtcHR5RG9jdW1lbnQoY29uc3QgU3RyaW5n
Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNz
YWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmlu
CmluZGV4IDYxZjI1OGIzMGVmNGU2MTNmNjI0ZDdmY2NhNmU3ZDEyMTdhNzRkNTMuLjNlNmUwZWUy
ZGQ3OGNjNjhlMWQyMTNkNTY5NWFjOWUyMDliMzAwN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCkBAIC0xMDUsNyArMTA1LDcgQEAgbWVz
c2FnZXMgLT4gV2ViUHJvY2VzcyBMZWdhY3lSZWNlaXZlciBOb3RSZWZDb3VudGVkIHsKICNlbmRp
ZgogCiAgICAgU2V0SGFzU3VzcGVuZGVkUGFnZVByb3h5KGJvb2wgaGFzU3VzcGVuZGVkUGFnZVBy
b3h5KTsKLSAgICBTZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nlc3NDYWNoZSkKKyAg
ICBTZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nlc3NDYWNoZSkgLT4gKCkgQXN5bmMK
ICAgICBNYXJrSXNOb0xvbmdlclByZXdhcm1lZCgpCiAgICAgR2V0QWN0aXZlUGFnZXNPcmlnaW5z
Rm9yVGVzdGluZygpIC0+IChWZWN0b3I8U3RyaW5nPiBhY3RpdmVPcmlnaW5zKSBBc3luYwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432962</attachid>
            <date>2021-07-06 12:54:51 -0700</date>
            <delta_ts>2021-07-06 13:35:27 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227269-20210706125450.patch</filename>
            <type>text/plain</type>
            <size>7116</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRjOGQ2NjUxODNjMzYyNDcz
N2Y4M2I1MGY5NWFjOWZkYTUxOWZkZjAuLjQzNmMxMmQ3YTU5MzAyMTA5OWIwNzMzODJkMTkzMDM2
OGEwYmQyZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDctMDYgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFN1c3BlbmQgV2ViUHJv
Y2Vzc2VzIHRoYXQgYXJlIGluIHRoZSBwcm9jZXNzIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjcyNjkKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzc5NjM5ODYzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIFN1c3BlbmQgV2ViUHJvY2Vzc2VzIHRoYXQgYXJlIGluIHRoZSBwcm9jZXNzIGNhY2hl
IG9uIG1hY09TIHRvIG1ha2Ugc3VyZSB0aGV5IHVzZSBubyBDUFUuCisgICAgICAgIFRoZSBzdXNw
ZW5zaW9uIGhhcHBlbnMgMzAgc2Vjb25kcyBhZnRlciB0aGUgcHJvY2VzcyBlbnRlcnMgdGhlIGNh
Y2hlLCBnaXZpbmcgdGhlIFdlYlByb2Nlc3MKKyAgICAgICAgdGltZSB0byBmaW5pc2ggd2hhdGV2
ZXIgY2xlYW4gdXAgaXQgbmVlZHMgdG8gZG8gYmVmb3JlIHN1c3BlbmRpbmcuCisKKyAgICAgICAg
KiBVSVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv
Y2Vzc0NhY2hlOjpDYWNoZWRQcm9jZXNzOjpDYWNoZWRQcm9jZXNzKToKKyAgICAgICAgKFdlYktp
dDo6V2ViUHJvY2Vzc0NhY2hlOjpDYWNoZWRQcm9jZXNzOjp+Q2FjaGVkUHJvY2Vzcyk6CisgICAg
ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDYWNoZTo6Q2FjaGVkUHJvY2Vzczo6dGFrZVByb2Nlc3Mp
OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ2FjaGU6OnN1c3BlbnNpb25UaW1lckZpcmVk
KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmg6CisgICAgICAgIChXZWJL
aXQ6OldlYlByb2Nlc3NDYWNoZTo6Q2FjaGVkUHJvY2Vzczo6aXNTdXNwZW5kZWQgY29uc3QpOgor
ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nl
c3MvbWFjL1dlYlByb2Nlc3NQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz
c1Byb3h5OjpwbGF0Zm9ybVN1c3BlbmRQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv
Y2Vzc1Byb3h5OjpwbGF0Zm9ybVJlc3VtZVByb2Nlc3MpOgorCiAyMDIxLTA3LTA2ICBDaHJpcyBE
dW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gSGF2ZSBQcm9jZXNzQXNz
ZXJ0aW9uIHRha2UgdGhlIFJ1bm5pbmdCb2FyZCBhc3NlcnRpb24gYXN5bmNocm9ub3VzbHkgYnkg
ZGVmYXVsdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc0Nh
Y2hlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NDYWNoZS5jcHAKaW5k
ZXggZDgxYWY3YzE1NGMwN2EzNTViYTAyMWZmZWUzOWE2MTdkMWQxODJiOC4uN2Q3MjcwZDdlMWNi
YTc0NjMzNjcyYmM1YTk3ZmYxN2Q3ODIwNTY1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQcm9jZXNzQ2FjaGUuY3BwCkBAIC00MCw2ICs0MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQg
ewogCiBTZWNvbmRzIFdlYlByb2Nlc3NDYWNoZTo6Y2FjaGVkUHJvY2Vzc0xpZmV0aW1lIHsgMzBf
bWluIH07CiBTZWNvbmRzIFdlYlByb2Nlc3NDYWNoZTo6Y2xlYXJpbmdEZWxheUFmdGVyQXBwbGlj
YXRpb25SZXNpZ25zQWN0aXZlIHsgNV9taW4gfTsKK3N0YXRpYyBjb25zdGV4cHIgU2Vjb25kcyBj
YWNoZWRQcm9jZXNzU3VzcGVuc2lvbkRlbGF5IHsgMzBfcyB9OwogCiBzdGF0aWMgdWludDY0X3Qg
Z2VuZXJhdGVBZGRSZXF1ZXN0SWRlbnRpZmllcigpCiB7CkBAIC0yNTksMTEgKzI2MCwxNyBAQCB2
b2lkIFdlYlByb2Nlc3NDYWNoZTo6cmVtb3ZlUHJvY2VzcyhXZWJQcm9jZXNzUHJveHkmIHByb2Nl
c3MsIFNob3VsZFNodXREb3duUHJvYwogV2ViUHJvY2Vzc0NhY2hlOjpDYWNoZWRQcm9jZXNzOjpD
YWNoZWRQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcykKICAgICA6IG1fcHJv
Y2VzcyhXVEZNb3ZlKHByb2Nlc3MpKQogICAgICwgbV9ldmljdGlvblRpbWVyKFJ1bkxvb3A6Om1h
aW4oKSwgdGhpcywgJkNhY2hlZFByb2Nlc3M6OmV2aWN0aW9uVGltZXJGaXJlZCkKKyNpZiBQTEFU
Rk9STShNQUMpCisgICAgLCBtX3N1c3BlbnNpb25UaW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMs
ICZDYWNoZWRQcm9jZXNzOjpzdXNwZW5zaW9uVGltZXJGaXJlZCkKKyNlbmRpZgogewogICAgIFJF
TEVBU0VfQVNTRVJUKCFtX3Byb2Nlc3MtPnBhZ2VDb3VudCgpKTsKICAgICBSRUxFQVNFX0FTU0VS
VF9XSVRIX01FU1NBR0UoIW1fcHJvY2Vzcy0+d2Vic2l0ZURhdGFTdG9yZSgpLnByb2Nlc3Nlcygp
LmNvbnRhaW5zKCptX3Byb2Nlc3MpLCAiT25seSBwcm9jZXNzZXMgd2l0aCBwYWdlcyBzaG91bGQg
YmUgcmVnaXN0ZXJlZCB3aXRoIHRoZSBkYXRhIHN0b3JlIik7CiAgICAgbV9wcm9jZXNzLT5zZXRJ
c0luUHJvY2Vzc0NhY2hlKHRydWUpOwogICAgIG1fZXZpY3Rpb25UaW1lci5zdGFydE9uZVNob3Qo
Y2FjaGVkUHJvY2Vzc0xpZmV0aW1lKTsKKyNpZiBQTEFURk9STShNQUMpCisgICAgbV9zdXNwZW5z
aW9uVGltZXIuc3RhcnRPbmVTaG90KGNhY2hlZFByb2Nlc3NTdXNwZW5zaW9uRGVsYXkpOworI2Vu
ZGlmCiB9CiAKIFdlYlByb2Nlc3NDYWNoZTo6Q2FjaGVkUHJvY2Vzczo6fkNhY2hlZFByb2Nlc3Mo
KQpAQCAtMjc1LDYgKzI4MiwxMCBAQCBXZWJQcm9jZXNzQ2FjaGU6OkNhY2hlZFByb2Nlc3M6On5D
YWNoZWRQcm9jZXNzKCkKICAgICBBU1NFUlQoIW1fcHJvY2Vzcy0+cHJvdmlzaW9uYWxQYWdlQ291
bnQoKSk7CiAgICAgQVNTRVJUKCFtX3Byb2Nlc3MtPnN1c3BlbmRlZFBhZ2VDb3VudCgpKTsKIAor
I2lmIFBMQVRGT1JNKE1BQykKKyAgICBpZiAoaXNTdXNwZW5kZWQoKSkKKyAgICAgICAgbV9wcm9j
ZXNzLT5wbGF0Zm9ybVJlc3VtZVByb2Nlc3MoKTsKKyNlbmRpZgogICAgIG1fcHJvY2Vzcy0+c2V0
SXNJblByb2Nlc3NDYWNoZShmYWxzZSk7CiAgICAgbV9wcm9jZXNzLT5zaHV0RG93bigpOwogfQpA
QCAtMjgzLDYgKzI5NCwxMiBAQCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzQ2FjaGU6
OkNhY2hlZFByb2Nlc3M6OnRha2VQcm9jZXNzKCkKIHsKICAgICBBU1NFUlQobV9wcm9jZXNzKTsK
ICAgICBtX2V2aWN0aW9uVGltZXIuc3RvcCgpOworI2lmIFBMQVRGT1JNKE1BQykKKyAgICBpZiAo
aXNTdXNwZW5kZWQoKSkKKyAgICAgICAgbV9wcm9jZXNzLT5wbGF0Zm9ybVJlc3VtZVByb2Nlc3Mo
KTsKKyAgICBlbHNlCisgICAgICAgIG1fc3VzcGVuc2lvblRpbWVyLnN0b3AoKTsKKyNlbmRpZgog
ICAgIG1fcHJvY2Vzcy0+c2V0SXNJblByb2Nlc3NDYWNoZShmYWxzZSk7CiAgICAgcmV0dXJuIG1f
cHJvY2Vzcy5yZWxlYXNlTm9uTnVsbCgpOwogfQpAQCAtMjkzLDYgKzMxMCwxMiBAQCB2b2lkIFdl
YlByb2Nlc3NDYWNoZTo6Q2FjaGVkUHJvY2Vzczo6ZXZpY3Rpb25UaW1lckZpcmVkKCkKICAgICBt
X3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkud2ViUHJvY2Vzc0NhY2hlKCkucmVtb3ZlUHJvY2Vzcygq
bV9wcm9jZXNzLCBTaG91bGRTaHV0RG93blByb2Nlc3M6Olllcyk7CiB9CiAKK3ZvaWQgV2ViUHJv
Y2Vzc0NhY2hlOjpDYWNoZWRQcm9jZXNzOjpzdXNwZW5zaW9uVGltZXJGaXJlZCgpCit7CisgICAg
QVNTRVJUKG1fcHJvY2Vzcyk7CisgICAgbV9wcm9jZXNzLT5wbGF0Zm9ybVN1c3BlbmRQcm9jZXNz
KCk7Cit9CisKICNpZiAhUExBVEZPUk0oQ09DT0EpCiB2b2lkIFdlYlByb2Nlc3NDYWNoZTo6cGxh
dGZvcm1Jbml0aWFsaXplKCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L1dlYlByb2Nlc3NDYWNoZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc0Nh
Y2hlLmgKaW5kZXggNjY4ODg2NjMwOGNiZDRhMGU0ZWQ3YzEwYjZmYWZhYTYyNjY4ZjAzMy4uODc2
N2FjODI2YTU0Yzc0MGI2OGMzNDc5NDA4ZmUzMWVlYjFiZThjMSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmgKKysrIGIvU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmgKQEAgLTcyLDExICs3MiwyMSBAQCBwcml2YXRlOgog
ICAgICAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5PiB0YWtlUHJvY2VzcygpOwogICAgICAgICBXZWJQ
cm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IEFTU0VSVChtX3Byb2Nlc3MpOyByZXR1cm4gKm1fcHJv
Y2VzczsgfQogCisjaWYgUExBVEZPUk0oTUFDKQorICAgICAgICBib29sIGlzU3VzcGVuZGVkKCkg
Y29uc3QgeyByZXR1cm4gIW1fc3VzcGVuc2lvblRpbWVyLmlzQWN0aXZlKCk7IH0KKyNlbmRpZgor
CiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBldmljdGlvblRpbWVyRmlyZWQoKTsKKyNpZiBQ
TEFURk9STShNQUMpCisgICAgICAgIHZvaWQgc3VzcGVuc2lvblRpbWVyRmlyZWQoKTsKKyNlbmRp
ZgogCiAgICAgICAgIFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+IG1fcHJvY2VzczsKICAgICAgICAg
UnVuTG9vcDo6VGltZXI8Q2FjaGVkUHJvY2Vzcz4gbV9ldmljdGlvblRpbWVyOworI2lmIFBMQVRG
T1JNKE1BQykKKyAgICAgICAgUnVuTG9vcDo6VGltZXI8Q2FjaGVkUHJvY2Vzcz4gbV9zdXNwZW5z
aW9uVGltZXI7CisjZW5kaWYKICAgICB9OwogCiAgICAgYm9vbCBjYW5DYWNoZVByb2Nlc3MoV2Vi
UHJvY2Vzc1Byb3h5JikgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ
cm94eS5oCmluZGV4IGI5NmUzNTJiYmI5OThiNTZkNTkxMTQ3ZGFjNjU4OTI4NTEwODg3NjAuLjky
ZDAwZDBmNDFjZTI5ZDE5NjQ1YjRlMGEwNzZiMjI2OTJjODEwMjEgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCkBAIC00MDQsNiArNDA0LDExIEBAIHB1YmxpYzoK
ICAgICBzdGF0aWMgYm9vbCBzaG91bGRFbmFibGVSZW1vdGVJbnNwZWN0b3IoKTsKICNlbmRpZgog
CisjaWYgUExBVEZPUk0oTUFDKQorICAgIHZvaWQgcGxhdGZvcm1TdXNwZW5kUHJvY2VzcygpOwor
ICAgIHZvaWQgcGxhdGZvcm1SZXN1bWVQcm9jZXNzKCk7CisjZW5kaWYKKwogcHJvdGVjdGVkOgog
ICAgIFdlYlByb2Nlc3NQcm94eShXZWJQcm9jZXNzUG9vbCYsIFdlYnNpdGVEYXRhU3RvcmUqLCBJ
c1ByZXdhcm1lZCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9X
ZWJQcm9jZXNzUHJveHlNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUHJv
Y2Vzc1Byb3h5TWFjLm1tCmluZGV4IDkzZGUyMjZlNDBiMTE3OGZhNzE0YTdjYjg5OTcxMDUyZDNl
NDJhMjEuLjMwZjk2MDMyNjM1ZDVlNmI0NDEzMjg3YjVmZTM4ZjRjZGMyZThjMGQgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJQcm9jZXNzUHJveHlNYWMubW0KKysr
IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYlByb2Nlc3NQcm94eU1hYy5tbQpAQCAt
MzEsNiArMzEsNyBAQAogCiAjaW1wb3J0ICJXS0Z1bGxLZXlib2FyZEFjY2Vzc1dhdGNoZXIuaCIK
ICNpbXBvcnQgPEtlcm5lbC9rZXJuL2NzX2Jsb2JzLmg+CisjaW1wb3J0IDxzaWduYWwuaD4KICNp
bXBvcnQgPHd0Zi9Qcm9jZXNzUHJpdmlsZWdlLmg+CiAjaW1wb3J0IDx3dGYvc3BpL2NvY29hL1Nl
Y3VyaXR5U1BJLmg+CiAKQEAgLTc4LDYgKzc5LDI0IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpz
ZXREaXNwbGF5TGlua1ByZWZlcnJlZEZyYW1lc1BlclNlY29uZChEaXNwbGF5TGlua09ic2VydmVy
CiAgICAgcHJvY2Vzc1Bvb2woKS5zZXREaXNwbGF5TGlua1ByZWZlcnJlZEZyYW1lc1BlclNlY29u
ZCgqY29ubmVjdGlvbigpLCBvYnNlcnZlcklELCBkaXNwbGF5SUQsIHByZWZlcnJlZEZyYW1lc1Bl
clNlY29uZCk7CiB9CiAKK3ZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpwbGF0Zm9ybVN1c3BlbmRQcm9j
ZXNzKCkKK3sKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzLCAiJXAgLSBbUElEPSVpXSBXZWJQcm9j
ZXNzUHJveHk6OnBsYXRmb3JtU3VzcGVuZFByb2Nlc3MiLCB0aGlzLCBwcm9jZXNzSWRlbnRpZmll
cigpKTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgorICAgIGlmIChh
dXRvKiBjb25uZWN0aW9uID0gdGhpcy0+Y29ubmVjdGlvbigpKQorICAgICAgICB4cGNfY29ubmVj
dGlvbl9raWxsKGNvbm5lY3Rpb24tPnhwY0Nvbm5lY3Rpb24oKSwgU0lHU1RPUCk7CisgICAgQUxM
T1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECit9CisKK3ZvaWQgV2ViUHJvY2Vzc1Byb3h5
OjpwbGF0Zm9ybVJlc3VtZVByb2Nlc3MoKQoreworICAgIFJFTEVBU0VfTE9HKFByb2Nlc3MsICIl
cCAtIFtQSUQ9JWldIFdlYlByb2Nlc3NQcm94eTo6cGxhdGZvcm1SZXN1bWVQcm9jZXNzIiwgdGhp
cywgcHJvY2Vzc0lkZW50aWZpZXIoKSk7CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElP
TlNfQkVHSU4KKyAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9IHRoaXMtPmNvbm5lY3Rpb24oKSkK
KyAgICAgICAgeHBjX2Nvbm5lY3Rpb25fa2lsbChjb25uZWN0aW9uLT54cGNDb25uZWN0aW9uKCks
IFNJR0NPTlQpOworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAorfQorCiB9
IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykK
</data>
<flag name="commit-queue"
          id="455060"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432966</attachid>
            <date>2021-07-06 13:22:46 -0700</date>
            <delta_ts>2021-07-07 09:44:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227269-20210706132245.patch</filename>
            <type>text/plain</type>
            <size>7143</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRjOGQ2NjUxODNjMzYyNDcz
N2Y4M2I1MGY5NWFjOWZkYTUxOWZkZjAuLjQzNmMxMmQ3YTU5MzAyMTA5OWIwNzMzODJkMTkzMDM2
OGEwYmQyZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDctMDYgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFN1c3BlbmQgV2ViUHJv
Y2Vzc2VzIHRoYXQgYXJlIGluIHRoZSBwcm9jZXNzIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjcyNjkKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzc5NjM5ODYzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIFN1c3BlbmQgV2ViUHJvY2Vzc2VzIHRoYXQgYXJlIGluIHRoZSBwcm9jZXNzIGNhY2hl
IG9uIG1hY09TIHRvIG1ha2Ugc3VyZSB0aGV5IHVzZSBubyBDUFUuCisgICAgICAgIFRoZSBzdXNw
ZW5zaW9uIGhhcHBlbnMgMzAgc2Vjb25kcyBhZnRlciB0aGUgcHJvY2VzcyBlbnRlcnMgdGhlIGNh
Y2hlLCBnaXZpbmcgdGhlIFdlYlByb2Nlc3MKKyAgICAgICAgdGltZSB0byBmaW5pc2ggd2hhdGV2
ZXIgY2xlYW4gdXAgaXQgbmVlZHMgdG8gZG8gYmVmb3JlIHN1c3BlbmRpbmcuCisKKyAgICAgICAg
KiBVSVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv
Y2Vzc0NhY2hlOjpDYWNoZWRQcm9jZXNzOjpDYWNoZWRQcm9jZXNzKToKKyAgICAgICAgKFdlYktp
dDo6V2ViUHJvY2Vzc0NhY2hlOjpDYWNoZWRQcm9jZXNzOjp+Q2FjaGVkUHJvY2Vzcyk6CisgICAg
ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDYWNoZTo6Q2FjaGVkUHJvY2Vzczo6dGFrZVByb2Nlc3Mp
OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ2FjaGU6OnN1c3BlbnNpb25UaW1lckZpcmVk
KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmg6CisgICAgICAgIChXZWJL
aXQ6OldlYlByb2Nlc3NDYWNoZTo6Q2FjaGVkUHJvY2Vzczo6aXNTdXNwZW5kZWQgY29uc3QpOgor
ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nl
c3MvbWFjL1dlYlByb2Nlc3NQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz
c1Byb3h5OjpwbGF0Zm9ybVN1c3BlbmRQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv
Y2Vzc1Byb3h5OjpwbGF0Zm9ybVJlc3VtZVByb2Nlc3MpOgorCiAyMDIxLTA3LTA2ICBDaHJpcyBE
dW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gSGF2ZSBQcm9jZXNzQXNz
ZXJ0aW9uIHRha2UgdGhlIFJ1bm5pbmdCb2FyZCBhc3NlcnRpb24gYXN5bmNocm9ub3VzbHkgYnkg
ZGVmYXVsdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc0Nh
Y2hlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NDYWNoZS5jcHAKaW5k
ZXggZDgxYWY3YzE1NGMwN2EzNTViYTAyMWZmZWUzOWE2MTdkMWQxODJiOC4uZTQzZWNiNTJjZTVh
NzhmOWM0YzJkN2U4NjAwNDk0NTk4ZDc4YzAxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQcm9jZXNzQ2FjaGUuY3BwCkBAIC00MCw2ICs0MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQg
ewogCiBTZWNvbmRzIFdlYlByb2Nlc3NDYWNoZTo6Y2FjaGVkUHJvY2Vzc0xpZmV0aW1lIHsgMzBf
bWluIH07CiBTZWNvbmRzIFdlYlByb2Nlc3NDYWNoZTo6Y2xlYXJpbmdEZWxheUFmdGVyQXBwbGlj
YXRpb25SZXNpZ25zQWN0aXZlIHsgNV9taW4gfTsKK3N0YXRpYyBjb25zdGV4cHIgU2Vjb25kcyBj
YWNoZWRQcm9jZXNzU3VzcGVuc2lvbkRlbGF5IHsgMzBfcyB9OwogCiBzdGF0aWMgdWludDY0X3Qg
Z2VuZXJhdGVBZGRSZXF1ZXN0SWRlbnRpZmllcigpCiB7CkBAIC0yNTksMTEgKzI2MCwxNyBAQCB2
b2lkIFdlYlByb2Nlc3NDYWNoZTo6cmVtb3ZlUHJvY2VzcyhXZWJQcm9jZXNzUHJveHkmIHByb2Nl
c3MsIFNob3VsZFNodXREb3duUHJvYwogV2ViUHJvY2Vzc0NhY2hlOjpDYWNoZWRQcm9jZXNzOjpD
YWNoZWRQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcykKICAgICA6IG1fcHJv
Y2VzcyhXVEZNb3ZlKHByb2Nlc3MpKQogICAgICwgbV9ldmljdGlvblRpbWVyKFJ1bkxvb3A6Om1h
aW4oKSwgdGhpcywgJkNhY2hlZFByb2Nlc3M6OmV2aWN0aW9uVGltZXJGaXJlZCkKKyNpZiBQTEFU
Rk9STShNQUMpCisgICAgLCBtX3N1c3BlbnNpb25UaW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMs
ICZDYWNoZWRQcm9jZXNzOjpzdXNwZW5zaW9uVGltZXJGaXJlZCkKKyNlbmRpZgogewogICAgIFJF
TEVBU0VfQVNTRVJUKCFtX3Byb2Nlc3MtPnBhZ2VDb3VudCgpKTsKICAgICBSRUxFQVNFX0FTU0VS
VF9XSVRIX01FU1NBR0UoIW1fcHJvY2Vzcy0+d2Vic2l0ZURhdGFTdG9yZSgpLnByb2Nlc3Nlcygp
LmNvbnRhaW5zKCptX3Byb2Nlc3MpLCAiT25seSBwcm9jZXNzZXMgd2l0aCBwYWdlcyBzaG91bGQg
YmUgcmVnaXN0ZXJlZCB3aXRoIHRoZSBkYXRhIHN0b3JlIik7CiAgICAgbV9wcm9jZXNzLT5zZXRJ
c0luUHJvY2Vzc0NhY2hlKHRydWUpOwogICAgIG1fZXZpY3Rpb25UaW1lci5zdGFydE9uZVNob3Qo
Y2FjaGVkUHJvY2Vzc0xpZmV0aW1lKTsKKyNpZiBQTEFURk9STShNQUMpCisgICAgbV9zdXNwZW5z
aW9uVGltZXIuc3RhcnRPbmVTaG90KGNhY2hlZFByb2Nlc3NTdXNwZW5zaW9uRGVsYXkpOworI2Vu
ZGlmCiB9CiAKIFdlYlByb2Nlc3NDYWNoZTo6Q2FjaGVkUHJvY2Vzczo6fkNhY2hlZFByb2Nlc3Mo
KQpAQCAtMjc1LDYgKzI4MiwxMCBAQCBXZWJQcm9jZXNzQ2FjaGU6OkNhY2hlZFByb2Nlc3M6On5D
YWNoZWRQcm9jZXNzKCkKICAgICBBU1NFUlQoIW1fcHJvY2Vzcy0+cHJvdmlzaW9uYWxQYWdlQ291
bnQoKSk7CiAgICAgQVNTRVJUKCFtX3Byb2Nlc3MtPnN1c3BlbmRlZFBhZ2VDb3VudCgpKTsKIAor
I2lmIFBMQVRGT1JNKE1BQykKKyAgICBpZiAoaXNTdXNwZW5kZWQoKSkKKyAgICAgICAgbV9wcm9j
ZXNzLT5wbGF0Zm9ybVJlc3VtZVByb2Nlc3MoKTsKKyNlbmRpZgogICAgIG1fcHJvY2Vzcy0+c2V0
SXNJblByb2Nlc3NDYWNoZShmYWxzZSk7CiAgICAgbV9wcm9jZXNzLT5zaHV0RG93bigpOwogfQpA
QCAtMjgzLDYgKzI5NCwxMiBAQCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzQ2FjaGU6
OkNhY2hlZFByb2Nlc3M6OnRha2VQcm9jZXNzKCkKIHsKICAgICBBU1NFUlQobV9wcm9jZXNzKTsK
ICAgICBtX2V2aWN0aW9uVGltZXIuc3RvcCgpOworI2lmIFBMQVRGT1JNKE1BQykKKyAgICBpZiAo
aXNTdXNwZW5kZWQoKSkKKyAgICAgICAgbV9wcm9jZXNzLT5wbGF0Zm9ybVJlc3VtZVByb2Nlc3Mo
KTsKKyAgICBlbHNlCisgICAgICAgIG1fc3VzcGVuc2lvblRpbWVyLnN0b3AoKTsKKyNlbmRpZgog
ICAgIG1fcHJvY2Vzcy0+c2V0SXNJblByb2Nlc3NDYWNoZShmYWxzZSk7CiAgICAgcmV0dXJuIG1f
cHJvY2Vzcy5yZWxlYXNlTm9uTnVsbCgpOwogfQpAQCAtMjkzLDYgKzMxMCwxNCBAQCB2b2lkIFdl
YlByb2Nlc3NDYWNoZTo6Q2FjaGVkUHJvY2Vzczo6ZXZpY3Rpb25UaW1lckZpcmVkKCkKICAgICBt
X3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkud2ViUHJvY2Vzc0NhY2hlKCkucmVtb3ZlUHJvY2Vzcygq
bV9wcm9jZXNzLCBTaG91bGRTaHV0RG93blByb2Nlc3M6Olllcyk7CiB9CiAKKyNpZiBQTEFURk9S
TShNQUMpCit2b2lkIFdlYlByb2Nlc3NDYWNoZTo6Q2FjaGVkUHJvY2Vzczo6c3VzcGVuc2lvblRp
bWVyRmlyZWQoKQoreworICAgIEFTU0VSVChtX3Byb2Nlc3MpOworICAgIG1fcHJvY2Vzcy0+cGxh
dGZvcm1TdXNwZW5kUHJvY2VzcygpOworfQorI2VuZGlmCisKICNpZiAhUExBVEZPUk0oQ09DT0Ep
CiB2b2lkIFdlYlByb2Nlc3NDYWNoZTo6cGxhdGZvcm1Jbml0aWFsaXplKCkKIHsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NDYWNoZS5oIGIvU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmgKaW5kZXggNjY4ODg2NjMwOGNiZDRhMGU0
ZWQ3YzEwYjZmYWZhYTYyNjY4ZjAzMy4uODc2N2FjODI2YTU0Yzc0MGI2OGMzNDc5NDA4ZmUzMWVl
YjFiZThjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc0Nh
Y2hlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc0NhY2hlLmgKQEAg
LTcyLDExICs3MiwyMSBAQCBwcml2YXRlOgogICAgICAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5PiB0
YWtlUHJvY2VzcygpOwogICAgICAgICBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IEFTU0VS
VChtX3Byb2Nlc3MpOyByZXR1cm4gKm1fcHJvY2VzczsgfQogCisjaWYgUExBVEZPUk0oTUFDKQor
ICAgICAgICBib29sIGlzU3VzcGVuZGVkKCkgY29uc3QgeyByZXR1cm4gIW1fc3VzcGVuc2lvblRp
bWVyLmlzQWN0aXZlKCk7IH0KKyNlbmRpZgorCiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBl
dmljdGlvblRpbWVyRmlyZWQoKTsKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgIHZvaWQgc3Vz
cGVuc2lvblRpbWVyRmlyZWQoKTsKKyNlbmRpZgogCiAgICAgICAgIFJlZlB0cjxXZWJQcm9jZXNz
UHJveHk+IG1fcHJvY2VzczsKICAgICAgICAgUnVuTG9vcDo6VGltZXI8Q2FjaGVkUHJvY2Vzcz4g
bV9ldmljdGlvblRpbWVyOworI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgUnVuTG9vcDo6VGlt
ZXI8Q2FjaGVkUHJvY2Vzcz4gbV9zdXNwZW5zaW9uVGltZXI7CisjZW5kaWYKICAgICB9OwogCiAg
ICAgYm9vbCBjYW5DYWNoZVByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5JikgY29uc3Q7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCmluZGV4IGI5NmUzNTJiYmI5OThiNTZk
NTkxMTQ3ZGFjNjU4OTI4NTEwODg3NjAuLjkyZDAwZDBmNDFjZTI5ZDE5NjQ1YjRlMGEwNzZiMjI2
OTJjODEwMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ
cm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCkBA
IC00MDQsNiArNDA0LDExIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgYm9vbCBzaG91bGRFbmFibGVS
ZW1vdGVJbnNwZWN0b3IoKTsKICNlbmRpZgogCisjaWYgUExBVEZPUk0oTUFDKQorICAgIHZvaWQg
cGxhdGZvcm1TdXNwZW5kUHJvY2VzcygpOworICAgIHZvaWQgcGxhdGZvcm1SZXN1bWVQcm9jZXNz
KCk7CisjZW5kaWYKKwogcHJvdGVjdGVkOgogICAgIFdlYlByb2Nlc3NQcm94eShXZWJQcm9jZXNz
UG9vbCYsIFdlYnNpdGVEYXRhU3RvcmUqLCBJc1ByZXdhcm1lZCk7CiAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJQcm9jZXNzUHJveHlNYWMubW0gYi9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc1Byb3h5TWFjLm1tCmluZGV4IDkzZGUyMjZl
NDBiMTE3OGZhNzE0YTdjYjg5OTcxMDUyZDNlNDJhMjEuLjMwZjk2MDMyNjM1ZDVlNmI0NDEzMjg3
YjVmZTM4ZjRjZGMyZThjMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21h
Yy9XZWJQcm9jZXNzUHJveHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFj
L1dlYlByb2Nlc3NQcm94eU1hYy5tbQpAQCAtMzEsNiArMzEsNyBAQAogCiAjaW1wb3J0ICJXS0Z1
bGxLZXlib2FyZEFjY2Vzc1dhdGNoZXIuaCIKICNpbXBvcnQgPEtlcm5lbC9rZXJuL2NzX2Jsb2Jz
Lmg+CisjaW1wb3J0IDxzaWduYWwuaD4KICNpbXBvcnQgPHd0Zi9Qcm9jZXNzUHJpdmlsZWdlLmg+
CiAjaW1wb3J0IDx3dGYvc3BpL2NvY29hL1NlY3VyaXR5U1BJLmg+CiAKQEAgLTc4LDYgKzc5LDI0
IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpzZXREaXNwbGF5TGlua1ByZWZlcnJlZEZyYW1lc1Bl
clNlY29uZChEaXNwbGF5TGlua09ic2VydmVyCiAgICAgcHJvY2Vzc1Bvb2woKS5zZXREaXNwbGF5
TGlua1ByZWZlcnJlZEZyYW1lc1BlclNlY29uZCgqY29ubmVjdGlvbigpLCBvYnNlcnZlcklELCBk
aXNwbGF5SUQsIHByZWZlcnJlZEZyYW1lc1BlclNlY29uZCk7CiB9CiAKK3ZvaWQgV2ViUHJvY2Vz
c1Byb3h5OjpwbGF0Zm9ybVN1c3BlbmRQcm9jZXNzKCkKK3sKKyAgICBSRUxFQVNFX0xPRyhQcm9j
ZXNzLCAiJXAgLSBbUElEPSVpXSBXZWJQcm9jZXNzUHJveHk6OnBsYXRmb3JtU3VzcGVuZFByb2Nl
c3MiLCB0aGlzLCBwcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RF
Q0xBUkFUSU9OU19CRUdJTgorICAgIGlmIChhdXRvKiBjb25uZWN0aW9uID0gdGhpcy0+Y29ubmVj
dGlvbigpKQorICAgICAgICB4cGNfY29ubmVjdGlvbl9raWxsKGNvbm5lY3Rpb24tPnhwY0Nvbm5l
Y3Rpb24oKSwgU0lHU1RPUCk7CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5E
Cit9CisKK3ZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpwbGF0Zm9ybVJlc3VtZVByb2Nlc3MoKQorewor
ICAgIFJFTEVBU0VfTE9HKFByb2Nlc3MsICIlcCAtIFtQSUQ9JWldIFdlYlByb2Nlc3NQcm94eTo6
cGxhdGZvcm1SZXN1bWVQcm9jZXNzIiwgdGhpcywgcHJvY2Vzc0lkZW50aWZpZXIoKSk7CisgICAg
QUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KKyAgICBpZiAoYXV0byogY29ubmVj
dGlvbiA9IHRoaXMtPmNvbm5lY3Rpb24oKSkKKyAgICAgICAgeHBjX2Nvbm5lY3Rpb25fa2lsbChj
b25uZWN0aW9uLT54cGNDb25uZWN0aW9uKCksIFNJR0NPTlQpOworICAgIEFMTE9XX0RFUFJFQ0FU
RURfREVDTEFSQVRJT05TX0VORAorfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlm
IC8vIFBMQVRGT1JNKE1BQykK
</data>

          </attachment>
      

    </bug>

</bugzilla>