<?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>225007</bug_id>
          
          <creation_ts>2021-04-23 16:06:04 -0700</creation_ts>
          <short_desc>Reduce memory footprint for background tabs</short_desc>
          <delta_ts>2021-04-29 12:02:05 -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>New Bugs</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="Ben Nham">nham</reporter>
          <assigned_to name="Ben Nham">nham</assigned_to>
          <cc>benjamin</cc>
    
    <cc>cdumez</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>nham</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1753776</commentid>
    <comment_count>0</comment_count>
    <who name="Ben Nham">nham</who>
    <bug_when>2021-04-23 16:06:04 -0700</bug_when>
    <thetext>Reduce memory footprint for background tabs</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753780</commentid>
    <comment_count>1</comment_count>
      <attachid>426961</attachid>
    <who name="Ben Nham">nham</who>
    <bug_when>2021-04-23 16:10:53 -0700</bug_when>
    <thetext>Created attachment 426961
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753781</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-04-23 16:11:36 -0700</bug_when>
    <thetext>&lt;rdar://problem/77090852&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753782</commentid>
    <comment_count>3</comment_count>
      <attachid>426961</attachid>
    <who name="Ben Nham">nham</who>
    <bug_when>2021-04-23 16:12:29 -0700</bug_when>
    <thetext>Comment on attachment 426961
Patch

initial pass for testing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1753793</commentid>
    <comment_count>4</comment_count>
      <attachid>426961</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-23 16:36:37 -0700</bug_when>
    <thetext>Comment on attachment 426961
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=426961&amp;action=review

&gt; Source/WTF/ChangeLog:9
&gt; +        similar just before WebContent suspends.

The major difference is that on iOS the process suspends and does not keep allocating memory after we simulate memory pressure.

&gt; Source/WTF/wtf/PlatformEnableCocoa.h:393
&gt; +#if !defined(ENABLE_NON_VISIBLE_WEBPROCESS_MEMORY_CLEANUP_TIMER)

Did you mean to enable this only on macOS?

&gt; Source/WebKit/WebProcess/WebProcess.cpp:1590
&gt; +#if ENABLE(NON_VISIBLE_WEBPROCESS_MEMORY_CLEANUP_TIMER)

This should probably cover the whole timer logic. Why start a timer to do nothing on iOS?

&gt; Source/WebKit/WebProcess/WebProcess.cpp:1591
&gt; +    WebCore::releaseMemory(WTF::Critical::Yes, WTF::Synchronous::No, WebCore::MaintainBackForwardCache::No, WebCore::MaintainMemoryCache::No);

One concern. Consider the case where we navigate cross-origin (Process-swap-on-navigation). To support back/forward cache, we keep the previous process around with its back/forward cache entry. When we swapped process, I am assuming that pageWillLeaveWindow() gets called in the previous process. If so, it would start your 1min timer and it would clear my back/forward cache entry. This means that the back/forward cache only works for 1min after a process-swap. If so, this seems bad.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754326</commentid>
    <comment_count>5</comment_count>
      <attachid>427084</attachid>
    <who name="Ben Nham">nham</who>
    <bug_when>2021-04-26 13:11:19 -0700</bug_when>
    <thetext>Created attachment 427084
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754327</commentid>
    <comment_count>6</comment_count>
      <attachid>427084</attachid>
    <who name="Ben Nham">nham</who>
    <bug_when>2021-04-26 13:17:08 -0700</bug_when>
    <thetext>Comment on attachment 427084
Patch

Enable only for Mac and Catalyst and don&apos;t drop the back/forward cache.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754351</commentid>
    <comment_count>7</comment_count>
      <attachid>427084</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-26 13:37:13 -0700</bug_when>
    <thetext>Comment on attachment 427084
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=427084&amp;action=review

r- because this clears the back/forward cache and thus likely breaks the back/forward cache after 1 min, after navigating cross-origin (process-swap).

&gt; Source/WebKit/WebProcess/WebProcess.cpp:1600
&gt; +    WebCore::releaseMemory(WTF::Critical::Yes, WTF::Synchronous::No, WebCore::MaintainBackForwardCache::Yes, WebCore::MaintainMemoryCache::No);

You are still clearing the back/forward cache, which is the one I complained about.

WTF:: is unnecessary, so is WebCore::.

&gt; Source/WebKit/WebProcess/WebProcess.cpp:1602
&gt; +        page-&gt;releaseMemory(WTF::Critical::Yes);

WTF:: is unnecessary.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754353</commentid>
    <comment_count>8</comment_count>
      <attachid>427084</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-04-26 13:39:45 -0700</bug_when>
    <thetext>Comment on attachment 427084
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=427084&amp;action=review

r=me with nits.

&gt;&gt; Source/WebKit/WebProcess/WebProcess.cpp:1600
&gt;&gt; +    WebCore::releaseMemory(WTF::Critical::Yes, WTF::Synchronous::No, WebCore::MaintainBackForwardCache::Yes, WebCore::MaintainMemoryCache::No);
&gt; 
&gt; You are still clearing the back/forward cache, which is the one I complained about.
&gt; 
&gt; WTF:: is unnecessary, so is WebCore::.

Oh, I misread, this is keeping the back/forward cache. My bad.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754358</commentid>
    <comment_count>9</comment_count>
      <attachid>427088</attachid>
    <who name="Ben Nham">nham</who>
    <bug_when>2021-04-26 13:57:02 -0700</bug_when>
    <thetext>Created attachment 427088
patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754434</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-26 16:42:11 -0700</bug_when>
    <thetext>Committed r276619 (237048@main): &lt;https://commits.webkit.org/237048@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 427088.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755414</commentid>
    <comment_count>11</comment_count>
    <who name="Ben Nham">nham</who>
    <bug_when>2021-04-29 09:26:47 -0700</bug_when>
    <thetext>Reverted r276619 for reason:

Causes multiple regressions on perf bots.

Committed r276779 (237162@main): &lt;https://commits.webkit.org/237162@main&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755420</commentid>
    <comment_count>12</comment_count>
      <attachid>427351</attachid>
    <who name="Ben Nham">nham</who>
    <bug_when>2021-04-29 09:41:23 -0700</bug_when>
    <thetext>Created attachment 427351
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755422</commentid>
    <comment_count>13</comment_count>
    <who name="Ben Nham">nham</who>
    <bug_when>2021-04-29 09:42:21 -0700</bug_when>
    <thetext>*** Bug 225165 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1755482</commentid>
    <comment_count>14</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-29 12:02:02 -0700</bug_when>
    <thetext>Committed r276788 (237166@main): &lt;https://commits.webkit.org/237166@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 427351.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426961</attachid>
            <date>2021-04-23 16:10:53 -0700</date>
            <delta_ts>2021-04-26 13:11:17 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225007-20210423161053.patch</filename>
            <type>text/plain</type>
            <size>7408</size>
            <attacher name="Ben Nham">nham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDYxZDhhZmFjOGM2MmUwZDlmMTI3NTFj
ZGNmNjFhNDUzMzEwOGNiYzcuLmM5NTI2MzM5ZWZhODQ0MjkwNjkwNzM4ZTcxM2ZjNmJiN2VhOTlh
NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDQtMjMgIEJlbiBOaGFtICA8bmhhbUBhcHBs
ZS5jb20+CisKKyAgICAgICAgUmVkdWNlIG1lbW9yeSBmb290cHJpbnQgZm9yIGJhY2tncm91bmQg
dGFicworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1
MDA3CisKKyAgICAgICAgV2hlbiBhIFdlYkNvbnRlbnQgcHJvY2VzcyBjb250YWlucyBvbmx5IG5v
bi12aXNpYmxlIHBhZ2VzIChlLmcuIGlmIGl0IGlzIGEgYmFja2dyb3VuZCB0YWIpLAorICAgICAg
ICB3ZSBzaG91bGQgYXR0ZW1wdCB0byByZWR1Y2Ugb3VyIG1lbW9yeSBmb290cHJpbnQgYWZ0ZXIg
c29tZSB0aW1lIGludGVydmFsIHRvIGhlbHAgcmVsaWV2ZQorICAgICAgICBzeXN0ZW0td2lkZSBt
ZW1vcnkgcHJlc3N1cmUuIFRoaXMgaXMgZW5hYmxlZCBvbmx5IG9uIE1hYyBiZWNhdXNlIGlPUyBh
bHJlYWR5IGRvZXMgc29tZXRoaW5nCisgICAgICAgIHNpbWlsYXIganVzdCBiZWZvcmUgV2ViQ29u
dGVudCBzdXNwZW5kcy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIHd0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmg6CisKIDIwMjEtMDQtMjMgIERhcmlu
IEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBkZWNvZGVyIG1lbW9y
eSBhbGxvY2F0aW9ucyBiYXNlZCBvbiB1bnRydXN0ZWQgZGF0YSAoc2l6ZXMpIGluIHRoZSBzdHJl
YW07IHJlbGF0ZWQgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cg
Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBjYjZiZjU2M2RmOWViZWZhMGQ1NjlkMzdl
YjJjNGU0ZmY5NDM1YzQzLi44MmZmZTJlOGI1NzBlNmFhZWI1MWMwZjJkMzMwMDM5MzA5MjU4NzA2
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA0LTIzICBCZW4gTmhhbSAgPG5oYW1A
YXBwbGUuY29tPgorCisgICAgICAgIFJlZHVjZSBtZW1vcnkgZm9vdHByaW50IGZvciBiYWNrZ3Jv
dW5kIHRhYnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyNTAwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IFdoZW4gYSBXZWJDb250ZW50IHByb2Nlc3MgY29udGFpbnMgb25seSBub24tdmlzaWJsZSBwYWdl
cyAoZS5nLiBpZiBpdCBpcyBhIGJhY2tncm91bmQgdGFiKSwKKyAgICAgICAgd2Ugc2hvdWxkIGF0
dGVtcHQgdG8gcmVkdWNlIG91ciBtZW1vcnkgZm9vdHByaW50IGFmdGVyIHNvbWUgdGltZSBpbnRl
cnZhbCB0byBoZWxwIHJlbGlldmUKKyAgICAgICAgc3lzdGVtLXdpZGUgbWVtb3J5IHByZXNzdXJl
LiBUaGlzIGlzIGVuYWJsZWQgb25seSBvbiBNYWMgYmVjYXVzZSBpT1MgYWxyZWFkeSBkb2VzIHNv
bWV0aGluZworICAgICAgICBzaW1pbGFyIGp1c3QgYmVmb3JlIFdlYkNvbnRlbnQgc3VzcGVuZHMu
CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0
OjpXZWJQcm9jZXNzOjpwYWdlRGlkRW50ZXJXaW5kb3cpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ
cm9jZXNzOjpwYWdlV2lsbExlYXZlV2luZG93KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz
czo6bm9uVmlzaWJsZVByb2Nlc3NHcmFwaGljc0NsZWFudXBUaW1lckZpcmVkKToKKyAgICAgICAg
KFdlYktpdDo6V2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwVGltZXJG
aXJlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6Om5vblZpc2libGVQcm9jZXNzQ2xl
YW51cFRpbWVyRmlyZWQpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vz
cy5oOgorCiAyMDIxLTA0LTIzICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9y
Zz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NTU2Mi4KZGlmZiAtLWdpdCBh
L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaCBiL1NvdXJjZS9XVEYvd3RmL1Bs
YXRmb3JtRW5hYmxlQ29jb2EuaAppbmRleCA4NWY0ZTBhYzQ5NTk3MWNlNTM1NjYzMTgxMDg1OTg2
NTczMjFhNDFkLi5lNjYxNjE1YjU0NzA3MmM1YzMxYjcxNmY5NmMyNGVlOGNhZDc3YWJjIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKKysrIGIvU291cmNl
L1dURi93dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCkBAIC0zOTAsNiArMzkwLDEwIEBACiAjZGVm
aW5lIEVOQUJMRV9ORVRXT1JLX0NBQ0hFX1NUQUxFX1dISUxFX1JFVkFMSURBVEUgMQogI2VuZGlm
CiAKKyNpZiAhZGVmaW5lZChFTkFCTEVfTk9OX1ZJU0lCTEVfV0VCUFJPQ0VTU19NRU1PUllfQ0xF
QU5VUF9USU1FUikKKyNkZWZpbmUgRU5BQkxFX05PTl9WSVNJQkxFX1dFQlBST0NFU1NfTUVNT1JZ
X0NMRUFOVVBfVElNRVIgMQorI2VuZGlmCisKICNpZiAhZGVmaW5lZChFTkFCTEVfTk9USUZJQ0FU
SU9OUykgJiYgUExBVEZPUk0oTUFDKQogI2RlZmluZSBFTkFCTEVfTk9USUZJQ0FUSU9OUyAxCiAj
ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNw
cCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAppbmRleCBiYjRjY2Ri
NmY5MzMxOWFlNWRlY2JkNTZiZDZhMGUwMDU1ZDc0NjRjLi4wZDg3MzliYzY0NzE5YzI1YzJiOTA5
N2U0MzJhNzZjYjI0ZWQ3NjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu
Y3BwCkBAIC0yMzAsNyArMjMwLDExIEBACiBzdGF0aWMgY29uc3QgU2Vjb25kcyBwbHVnSW5BdXRv
U3RhcnRFeHBpcmF0aW9uVGltZVVwZGF0ZVRocmVzaG9sZCB7IDI5ICogMjQgKiA2MCAqIDYwIH07
CiAKIC8vIFRoaXMgc2hvdWxkIGJlIGdyZWF0ZXIgdGhhbiB0aWxlUmV2YWxpZGF0aW9uVGltZW91
dCBpbiBUaWxlQ29udHJvbGxlci4KLXN0YXRpYyBjb25zdCBTZWNvbmRzIG5vblZpc2libGVQcm9j
ZXNzQ2xlYW51cERlbGF5IHsgMTBfcyB9Oworc3RhdGljIGNvbnN0IFNlY29uZHMgbm9uVmlzaWJs
ZVByb2Nlc3NHcmFwaGljc0NsZWFudXBEZWxheSB7IDEwX3MgfTsKKworLy8gVGhpcyBzaG91bGQg
YmUgbG9uZyBlbm91Z2ggdG8gc3VwcG9ydCBhIHdvcmtsb2FkIHdoZXJlIGEgdXNlciBpcyBhY3Rp
dmVseSBzd2l0Y2hpbmcgYmV0d2VlbiBtdWx0aXBsZSB0YWJzLAorLy8gc2luY2Ugb3VyIG1lbW9y
eSBjbGVhbnVwIHJvdXRpbmUgY291bGQgcG90ZW50aWFsbHkgZGVsZXRlIGEgZ29vZCBhbW91bnQg
b2YgSklUIGNvZGUuCitzdGF0aWMgY29uc3QgU2Vjb25kcyBub25WaXNpYmxlUHJvY2Vzc01lbW9y
eUNsZWFudXBEZWxheSB7IDYwX3MgfTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1l
c3BhY2UgSlNDOwpAQCAtMjY1LDcgKzI2OSw4IEBAIFdlYlByb2Nlc3M6OldlYlByb2Nlc3MoKQog
I2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgICwgbV9wbHVnaW5Qcm9jZXNzQ29u
bmVjdGlvbk1hbmFnZXIoUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb25NYW5hZ2VyOjpjcmVhdGUoKSkK
ICNlbmRpZgotICAgICwgbV9ub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lcigqdGhpcywgJldl
YlByb2Nlc3M6Om5vblZpc2libGVQcm9jZXNzQ2xlYW51cFRpbWVyRmlyZWQpCisgICAgLCBtX25v
blZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwVGltZXIoKnRoaXMsICZXZWJQcm9jZXNzOjpu
b25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xlYW51cFRpbWVyRmlyZWQpCisgICAgLCBtX25vblZp
c2libGVQcm9jZXNzTWVtb3J5Q2xlYW51cFRpbWVyKCp0aGlzLCAmV2ViUHJvY2Vzczo6bm9uVmlz
aWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwVGltZXJGaXJlZCkKICNpZiBQTEFURk9STShJT1NfRkFN
SUxZKQogICAgICwgbV93ZWJTUUxpdGVEYXRhYmFzZVRyYWNrZXIoW3RoaXNdKGJvb2wgaXNIb2xk
aW5nTG9ja2VkRmlsZXMpIHsgcGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdl
czo6V2ViUHJvY2Vzc1Byb3h5OjpTZXRJc0hvbGRpbmdMb2NrZWRGaWxlcyhpc0hvbGRpbmdMb2Nr
ZWRGaWxlcyksIDApOyB9KQogI2VuZGlmCkBAIC0xNTQ4LDE4ICsxNTUzLDI0IEBAIHZvaWQgV2Vi
UHJvY2Vzczo6c2VuZFByZXdhcm1JbmZvcm1hdGlvbihjb25zdCBVUkwmIHVybCkKIHZvaWQgV2Vi
UHJvY2Vzczo6cGFnZURpZEVudGVyV2luZG93KFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCkKIHsKICAg
ICBtX3BhZ2VzSW5XaW5kb3dzLmFkZChwYWdlSUQpOwotICAgIG1fbm9uVmlzaWJsZVByb2Nlc3ND
bGVhbnVwVGltZXIuc3RvcCgpOworICAgIG1fbm9uVmlzaWJsZVByb2Nlc3NHcmFwaGljc0NsZWFu
dXBUaW1lci5zdG9wKCk7CisgICAgbV9ub25WaXNpYmxlUHJvY2Vzc01lbW9yeUNsZWFudXBUaW1l
ci5zdG9wKCk7CiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6cGFnZVdpbGxMZWF2ZVdpbmRvdyhQYWdl
SWRlbnRpZmllciBwYWdlSUQpCiB7CiAgICAgbV9wYWdlc0luV2luZG93cy5yZW1vdmUocGFnZUlE
KTsKIAotICAgIGlmIChtX3BhZ2VzSW5XaW5kb3dzLmlzRW1wdHkoKSAmJiAhbV9ub25WaXNpYmxl
UHJvY2Vzc0NsZWFudXBUaW1lci5pc0FjdGl2ZSgpKQotICAgICAgICBtX25vblZpc2libGVQcm9j
ZXNzQ2xlYW51cFRpbWVyLnN0YXJ0T25lU2hvdChub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBEZWxh
eSk7CisgICAgaWYgKG1fcGFnZXNJbldpbmRvd3MuaXNFbXB0eSgpKSB7CisgICAgICAgIGlmICgh
bV9ub25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xlYW51cFRpbWVyLmlzQWN0aXZlKCkpCisgICAg
ICAgICAgICBtX25vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwVGltZXIuc3RhcnRPbmVT
aG90KG5vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwRGVsYXkpOworCisgICAgICAgIGlm
ICghbV9ub25WaXNpYmxlUHJvY2Vzc01lbW9yeUNsZWFudXBUaW1lci5pc0FjdGl2ZSgpKQorICAg
ICAgICAgICAgbV9ub25WaXNpYmxlUHJvY2Vzc01lbW9yeUNsZWFudXBUaW1lci5zdGFydE9uZVNo
b3Qobm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwRGVsYXkpOworICAgIH0KIH0KICAgICAK
LXZvaWQgV2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NDbGVhbnVwVGltZXJGaXJlZCgpCit2
b2lkIFdlYlByb2Nlc3M6Om5vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwVGltZXJGaXJl
ZCgpCiB7CiAgICAgQVNTRVJUKG1fcGFnZXNJbldpbmRvd3MuaXNFbXB0eSgpKTsKICAgICBpZiAo
IW1fcGFnZXNJbldpbmRvd3MuaXNFbXB0eSgpKQpAQCAtMTU3MCw2ICsxNTgxLDE5IEBAIHZvaWQg
V2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NDbGVhbnVwVGltZXJGaXJlZCgpCiAjZW5kaWYK
IH0KIAordm9pZCBXZWJQcm9jZXNzOjpub25WaXNpYmxlUHJvY2Vzc01lbW9yeUNsZWFudXBUaW1l
ckZpcmVkKCkKK3sKKyAgICBBU1NFUlQobV9wYWdlc0luV2luZG93cy5pc0VtcHR5KCkpOworICAg
IGlmICghbV9wYWdlc0luV2luZG93cy5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworI2lm
IEVOQUJMRShOT05fVklTSUJMRV9XRUJQUk9DRVNTX01FTU9SWV9DTEVBTlVQX1RJTUVSKQorICAg
IFdlYkNvcmU6OnJlbGVhc2VNZW1vcnkoV1RGOjpDcml0aWNhbDo6WWVzLCBXVEY6OlN5bmNocm9u
b3VzOjpObywgV2ViQ29yZTo6TWFpbnRhaW5CYWNrRm9yd2FyZENhY2hlOjpObywgV2ViQ29yZTo6
TWFpbnRhaW5NZW1vcnlDYWNoZTo6Tm8pOworICAgIGZvciAoYXV0byYgcGFnZSA6IG1fcGFnZU1h
cC52YWx1ZXMoKSkKKyAgICAgICAgcGFnZS0+cmVsZWFzZU1lbW9yeShXVEY6OkNyaXRpY2FsOjpZ
ZXMpOworI2VuZGlmCit9CisKIHZvaWQgV2ViUHJvY2Vzczo6cmVnaXN0ZXJTdG9yYWdlQXJlYU1h
cChTdG9yYWdlQXJlYU1hcCYgc3RvcmFnZUFyZWFNYXApCiB7CiAgICAgQVNTRVJUKHN0b3JhZ2VB
cmVhTWFwLmlkZW50aWZpZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl
c3MvV2ViUHJvY2Vzcy5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaApp
bmRleCA4MzA5ZGI4ZDUwNTUxMDcwMWU0ZWM4NTZmM2RjODdiNjAxMWVkODgzLi5hN2Y1MDVlNWYx
ZjFjODJlNmJmZGY1NmYwNDNmZTE1NTM1Mzg0ODM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X
ZWJQcm9jZXNzLmgKQEAgLTI2NSw3ICsyNjUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBwYWdlRGlk
RW50ZXJXaW5kb3coV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIpOwogICAgIHZvaWQgcGFnZVdpbGxM
ZWF2ZVdpbmRvdyhXZWJDb3JlOjpQYWdlSWRlbnRpZmllcik7CiAKLSAgICB2b2lkIG5vblZpc2li
bGVQcm9jZXNzQ2xlYW51cFRpbWVyRmlyZWQoKTsKKyAgICB2b2lkIG5vblZpc2libGVQcm9jZXNz
R3JhcGhpY3NDbGVhbnVwVGltZXJGaXJlZCgpOworICAgIHZvaWQgbm9uVmlzaWJsZVByb2Nlc3NN
ZW1vcnlDbGVhbnVwVGltZXJGaXJlZCgpOwogCiAgICAgdm9pZCByZWdpc3RlclN0b3JhZ2VBcmVh
TWFwKFN0b3JhZ2VBcmVhTWFwJik7CiAgICAgdm9pZCB1bnJlZ2lzdGVyU3RvcmFnZUFyZWFNYXAo
U3RvcmFnZUFyZWFNYXAmKTsKQEAgLTY2Miw3ICs2NjMsOCBAQCBwcml2YXRlOgogICAgIGJvb2wg
bV9wcm9jZXNzSXNTdXNwZW5kZWQgeyBmYWxzZSB9OwogCiAgICAgSGFzaFNldDxXZWJDb3JlOjpQ
YWdlSWRlbnRpZmllcj4gbV9wYWdlc0luV2luZG93czsKLSAgICBXZWJDb3JlOjpUaW1lciBtX25v
blZpc2libGVQcm9jZXNzQ2xlYW51cFRpbWVyOworICAgIFdlYkNvcmU6OlRpbWVyIG1fbm9uVmlz
aWJsZVByb2Nlc3NHcmFwaGljc0NsZWFudXBUaW1lcjsKKyAgICBXZWJDb3JlOjpUaW1lciBtX25v
blZpc2libGVQcm9jZXNzTWVtb3J5Q2xlYW51cFRpbWVyOwogCiAgICAgUmVmUHRyPFdlYkNvcmU6
OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlPiBtX2FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427084</attachid>
            <date>2021-04-26 13:11:19 -0700</date>
            <delta_ts>2021-04-26 13:56:59 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225007-20210426131118.patch</filename>
            <type>text/plain</type>
            <size>7853</size>
            <attacher name="Ben Nham">nham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDYxZDhhZmFjOGM2MmUwZDlmMTI3NTFj
ZGNmNjFhNDUzMzEwOGNiYzcuLjUyYzUxNTFhMjVmMmU2ZmVlMjAyYmFhMGNmMjE5OWI1ZmJlODA5
ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDQtMjMgIEJlbiBOaGFtICA8bmhhbUBhcHBs
ZS5jb20+CisKKyAgICAgICAgUmVkdWNlIG1lbW9yeSBmb290cHJpbnQgZm9yIGJhY2tncm91bmQg
dGFicworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1
MDA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hl
biBhIFdlYkNvbnRlbnQgcHJvY2VzcyBjb250YWlucyBvbmx5IG5vbi12aXNpYmxlIHBhZ2VzIChl
LmcuIGlmIGl0IGlzIGEgYmFja2dyb3VuZCB0YWIpLAorICAgICAgICB3ZSBzaG91bGQgYXR0ZW1w
dCB0byByZWR1Y2Ugb3VyIG1lbW9yeSBmb290cHJpbnQgYWZ0ZXIgc29tZSB0aW1lIGludGVydmFs
IHRvIGhlbHAgcmVsaWV2ZQorICAgICAgICBzeXN0ZW0td2lkZSBtZW1vcnkgcHJlc3N1cmUuIFRo
aXMgaXMgZW5hYmxlZCBvbmx5IG9uIE1hYyBiZWNhdXNlIGlPUyBhbHJlYWR5IGRvZXMgc29tZXRo
aW5nCisgICAgICAgIHNpbWlsYXIganVzdCBiZWZvcmUgV2ViQ29udGVudCBzdXNwZW5kcy4KKwor
ICAgICAgICAqIHd0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmg6CisKIDIwMjEtMDQtMjMgIERhcmlu
IEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBkZWNvZGVyIG1lbW9y
eSBhbGxvY2F0aW9ucyBiYXNlZCBvbiB1bnRydXN0ZWQgZGF0YSAoc2l6ZXMpIGluIHRoZSBzdHJl
YW07IHJlbGF0ZWQgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cg
Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBjYjZiZjU2M2RmOWViZWZhMGQ1NjlkMzdl
YjJjNGU0ZmY5NDM1YzQzLi44MmZmZTJlOGI1NzBlNmFhZWI1MWMwZjJkMzMwMDM5MzA5MjU4NzA2
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA0LTIzICBCZW4gTmhhbSAgPG5oYW1A
YXBwbGUuY29tPgorCisgICAgICAgIFJlZHVjZSBtZW1vcnkgZm9vdHByaW50IGZvciBiYWNrZ3Jv
dW5kIHRhYnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyNTAwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IFdoZW4gYSBXZWJDb250ZW50IHByb2Nlc3MgY29udGFpbnMgb25seSBub24tdmlzaWJsZSBwYWdl
cyAoZS5nLiBpZiBpdCBpcyBhIGJhY2tncm91bmQgdGFiKSwKKyAgICAgICAgd2Ugc2hvdWxkIGF0
dGVtcHQgdG8gcmVkdWNlIG91ciBtZW1vcnkgZm9vdHByaW50IGFmdGVyIHNvbWUgdGltZSBpbnRl
cnZhbCB0byBoZWxwIHJlbGlldmUKKyAgICAgICAgc3lzdGVtLXdpZGUgbWVtb3J5IHByZXNzdXJl
LiBUaGlzIGlzIGVuYWJsZWQgb25seSBvbiBNYWMgYmVjYXVzZSBpT1MgYWxyZWFkeSBkb2VzIHNv
bWV0aGluZworICAgICAgICBzaW1pbGFyIGp1c3QgYmVmb3JlIFdlYkNvbnRlbnQgc3VzcGVuZHMu
CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0
OjpXZWJQcm9jZXNzOjpwYWdlRGlkRW50ZXJXaW5kb3cpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ
cm9jZXNzOjpwYWdlV2lsbExlYXZlV2luZG93KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz
czo6bm9uVmlzaWJsZVByb2Nlc3NHcmFwaGljc0NsZWFudXBUaW1lckZpcmVkKToKKyAgICAgICAg
KFdlYktpdDo6V2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwVGltZXJG
aXJlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6Om5vblZpc2libGVQcm9jZXNzQ2xl
YW51cFRpbWVyRmlyZWQpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vz
cy5oOgorCiAyMDIxLTA0LTIzICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9y
Zz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NTU2Mi4KZGlmZiAtLWdpdCBh
L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaCBiL1NvdXJjZS9XVEYvd3RmL1Bs
YXRmb3JtRW5hYmxlQ29jb2EuaAppbmRleCA4NWY0ZTBhYzQ5NTk3MWNlNTM1NjYzMTgxMDg1OTg2
NTczMjFhNDFkLi5jODgxNGVlNjg1ZTUzZmNlOGMxODdhMjhiNTZjN2U2NTIzOWRmMWZlIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKKysrIGIvU291cmNl
L1dURi93dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCkBAIC0zOTAsNiArMzkwLDEwIEBACiAjZGVm
aW5lIEVOQUJMRV9ORVRXT1JLX0NBQ0hFX1NUQUxFX1dISUxFX1JFVkFMSURBVEUgMQogI2VuZGlm
CiAKKyNpZiAhZGVmaW5lZChFTkFCTEVfTk9OX1ZJU0lCTEVfV0VCUFJPQ0VTU19NRU1PUllfQ0xF
QU5VUF9USU1FUikgJiYgKFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oTUFDQ0FUQUxZU1QpKQor
I2RlZmluZSBFTkFCTEVfTk9OX1ZJU0lCTEVfV0VCUFJPQ0VTU19NRU1PUllfQ0xFQU5VUF9USU1F
UiAxCisjZW5kaWYKKwogI2lmICFkZWZpbmVkKEVOQUJMRV9OT1RJRklDQVRJT05TKSAmJiBQTEFU
Rk9STShNQUMpCiAjZGVmaW5lIEVOQUJMRV9OT1RJRklDQVRJT05TIDEKICNlbmRpZgpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCmluZGV4IGJiNGNjZGI2ZjkzMzE5YWU1ZGVj
YmQ1NmJkNmEwZTAwNTVkNzQ2NGMuLjgyNTMzY2U3MmNlMWZlYzQxMGJhNzYwNGNjYmFlZmI4YWY0
MjIwNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNw
cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKQEAgLTIzMCw3
ICsyMzAsMTMgQEAKIHN0YXRpYyBjb25zdCBTZWNvbmRzIHBsdWdJbkF1dG9TdGFydEV4cGlyYXRp
b25UaW1lVXBkYXRlVGhyZXNob2xkIHsgMjkgKiAyNCAqIDYwICogNjAgfTsKIAogLy8gVGhpcyBz
aG91bGQgYmUgZ3JlYXRlciB0aGFuIHRpbGVSZXZhbGlkYXRpb25UaW1lb3V0IGluIFRpbGVDb250
cm9sbGVyLgotc3RhdGljIGNvbnN0IFNlY29uZHMgbm9uVmlzaWJsZVByb2Nlc3NDbGVhbnVwRGVs
YXkgeyAxMF9zIH07CitzdGF0aWMgY29uc3QgU2Vjb25kcyBub25WaXNpYmxlUHJvY2Vzc0dyYXBo
aWNzQ2xlYW51cERlbGF5IHsgMTBfcyB9OworCisjaWYgRU5BQkxFKE5PTl9WSVNJQkxFX1dFQlBS
T0NFU1NfTUVNT1JZX0NMRUFOVVBfVElNRVIpCisvLyBUaGlzIHNob3VsZCBiZSBsb25nIGVub3Vn
aCB0byBzdXBwb3J0IGEgd29ya2xvYWQgd2hlcmUgYSB1c2VyIGlzIGFjdGl2ZWx5IHN3aXRjaGlu
ZyBiZXR3ZWVuIG11bHRpcGxlIHRhYnMsCisvLyBzaW5jZSBvdXIgbWVtb3J5IGNsZWFudXAgcm91
dGluZSBjb3VsZCBwb3RlbnRpYWxseSBkZWxldGUgYSBnb29kIGFtb3VudCBvZiBKSVQgY29kZS4K
K3N0YXRpYyBjb25zdCBTZWNvbmRzIG5vblZpc2libGVQcm9jZXNzTWVtb3J5Q2xlYW51cERlbGF5
IHsgMTIwX3MgfTsKKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFj
ZSBKU0M7CkBAIC0yNjUsNyArMjcxLDEwIEBAIFdlYlByb2Nlc3M6OldlYlByb2Nlc3MoKQogI2lm
IEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgICwgbV9wbHVnaW5Qcm9jZXNzQ29ubmVj
dGlvbk1hbmFnZXIoUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb25NYW5hZ2VyOjpjcmVhdGUoKSkKICNl
bmRpZgotICAgICwgbV9ub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lcigqdGhpcywgJldlYlBy
b2Nlc3M6Om5vblZpc2libGVQcm9jZXNzQ2xlYW51cFRpbWVyRmlyZWQpCisgICAgLCBtX25vblZp
c2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwVGltZXIoKnRoaXMsICZXZWJQcm9jZXNzOjpub25W
aXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xlYW51cFRpbWVyRmlyZWQpCisjaWYgRU5BQkxFKE5PTl9W
SVNJQkxFX1dFQlBST0NFU1NfTUVNT1JZX0NMRUFOVVBfVElNRVIpCisgICAgLCBtX25vblZpc2li
bGVQcm9jZXNzTWVtb3J5Q2xlYW51cFRpbWVyKCp0aGlzLCAmV2ViUHJvY2Vzczo6bm9uVmlzaWJs
ZVByb2Nlc3NNZW1vcnlDbGVhbnVwVGltZXJGaXJlZCkKKyNlbmRpZgogI2lmIFBMQVRGT1JNKElP
U19GQU1JTFkpCiAgICAgLCBtX3dlYlNRTGl0ZURhdGFiYXNlVHJhY2tlcihbdGhpc10oYm9vbCBp
c0hvbGRpbmdMb2NrZWRGaWxlcykgeyBwYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1l
c3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OlNldElzSG9sZGluZ0xvY2tlZEZpbGVzKGlzSG9sZGlu
Z0xvY2tlZEZpbGVzKSwgMCk7IH0pCiAjZW5kaWYKQEAgLTE1NDgsMTggKzE1NTcsMjkgQEAgdm9p
ZCBXZWJQcm9jZXNzOjpzZW5kUHJld2FybUluZm9ybWF0aW9uKGNvbnN0IFVSTCYgdXJsKQogdm9p
ZCBXZWJQcm9jZXNzOjpwYWdlRGlkRW50ZXJXaW5kb3coUGFnZUlkZW50aWZpZXIgcGFnZUlEKQog
ewogICAgIG1fcGFnZXNJbldpbmRvd3MuYWRkKHBhZ2VJRCk7Ci0gICAgbV9ub25WaXNpYmxlUHJv
Y2Vzc0NsZWFudXBUaW1lci5zdG9wKCk7CisgICAgbV9ub25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNz
Q2xlYW51cFRpbWVyLnN0b3AoKTsKKworI2lmIEVOQUJMRShOT05fVklTSUJMRV9XRUJQUk9DRVNT
X01FTU9SWV9DTEVBTlVQX1RJTUVSKQorICAgIG1fbm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVh
bnVwVGltZXIuc3RvcCgpOworI2VuZGlmCiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6cGFnZVdpbGxM
ZWF2ZVdpbmRvdyhQYWdlSWRlbnRpZmllciBwYWdlSUQpCiB7CiAgICAgbV9wYWdlc0luV2luZG93
cy5yZW1vdmUocGFnZUlEKTsKIAotICAgIGlmIChtX3BhZ2VzSW5XaW5kb3dzLmlzRW1wdHkoKSAm
JiAhbV9ub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lci5pc0FjdGl2ZSgpKQotICAgICAgICBt
X25vblZpc2libGVQcm9jZXNzQ2xlYW51cFRpbWVyLnN0YXJ0T25lU2hvdChub25WaXNpYmxlUHJv
Y2Vzc0NsZWFudXBEZWxheSk7CisgICAgaWYgKG1fcGFnZXNJbldpbmRvd3MuaXNFbXB0eSgpKSB7
CisgICAgICAgIGlmICghbV9ub25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xlYW51cFRpbWVyLmlz
QWN0aXZlKCkpCisgICAgICAgICAgICBtX25vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVw
VGltZXIuc3RhcnRPbmVTaG90KG5vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwRGVsYXkp
OworCisjaWYgRU5BQkxFKE5PTl9WSVNJQkxFX1dFQlBST0NFU1NfTUVNT1JZX0NMRUFOVVBfVElN
RVIpCisgICAgICAgIGlmICghbV9ub25WaXNpYmxlUHJvY2Vzc01lbW9yeUNsZWFudXBUaW1lci5p
c0FjdGl2ZSgpKQorICAgICAgICAgICAgbV9ub25WaXNpYmxlUHJvY2Vzc01lbW9yeUNsZWFudXBU
aW1lci5zdGFydE9uZVNob3Qobm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwRGVsYXkpOwor
I2VuZGlmCisgICAgfQogfQogICAgIAotdm9pZCBXZWJQcm9jZXNzOjpub25WaXNpYmxlUHJvY2Vz
c0NsZWFudXBUaW1lckZpcmVkKCkKK3ZvaWQgV2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NH
cmFwaGljc0NsZWFudXBUaW1lckZpcmVkKCkKIHsKICAgICBBU1NFUlQobV9wYWdlc0luV2luZG93
cy5pc0VtcHR5KCkpOwogICAgIGlmICghbV9wYWdlc0luV2luZG93cy5pc0VtcHR5KCkpCkBAIC0x
NTcwLDYgKzE1OTAsMTkgQEAgdm9pZCBXZWJQcm9jZXNzOjpub25WaXNpYmxlUHJvY2Vzc0NsZWFu
dXBUaW1lckZpcmVkKCkKICNlbmRpZgogfQogCisjaWYgRU5BQkxFKE5PTl9WSVNJQkxFX1dFQlBS
T0NFU1NfTUVNT1JZX0NMRUFOVVBfVElNRVIpCit2b2lkIFdlYlByb2Nlc3M6Om5vblZpc2libGVQ
cm9jZXNzTWVtb3J5Q2xlYW51cFRpbWVyRmlyZWQoKQoreworICAgIEFTU0VSVChtX3BhZ2VzSW5X
aW5kb3dzLmlzRW1wdHkoKSk7CisgICAgaWYgKCFtX3BhZ2VzSW5XaW5kb3dzLmlzRW1wdHkoKSkK
KyAgICAgICAgcmV0dXJuOworCisgICAgV2ViQ29yZTo6cmVsZWFzZU1lbW9yeShXVEY6OkNyaXRp
Y2FsOjpZZXMsIFdURjo6U3luY2hyb25vdXM6Ok5vLCBXZWJDb3JlOjpNYWludGFpbkJhY2tGb3J3
YXJkQ2FjaGU6OlllcywgV2ViQ29yZTo6TWFpbnRhaW5NZW1vcnlDYWNoZTo6Tm8pOworICAgIGZv
ciAoYXV0byYgcGFnZSA6IG1fcGFnZU1hcC52YWx1ZXMoKSkKKyAgICAgICAgcGFnZS0+cmVsZWFz
ZU1lbW9yeShXVEY6OkNyaXRpY2FsOjpZZXMpOworfQorI2VuZGlmCisKIHZvaWQgV2ViUHJvY2Vz
czo6cmVnaXN0ZXJTdG9yYWdlQXJlYU1hcChTdG9yYWdlQXJlYU1hcCYgc3RvcmFnZUFyZWFNYXAp
CiB7CiAgICAgQVNTRVJUKHN0b3JhZ2VBcmVhTWFwLmlkZW50aWZpZXIoKSk7CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAppbmRleCA4MzA5ZGI4ZDUwNTUxMDcwMWU0ZWM4NTZmM2Rj
ODdiNjAxMWVkODgzLi45NDc2OTYxZWI3OGQ0ODlmMTNhY2UwZWQxZjIzYzVmNzk1YzE0MmQ4IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCisrKyBiL1Nv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKQEAgLTI2NSw3ICsyNjUsMTEgQEAg
cHVibGljOgogICAgIHZvaWQgcGFnZURpZEVudGVyV2luZG93KFdlYkNvcmU6OlBhZ2VJZGVudGlm
aWVyKTsKICAgICB2b2lkIHBhZ2VXaWxsTGVhdmVXaW5kb3coV2ViQ29yZTo6UGFnZUlkZW50aWZp
ZXIpOwogCi0gICAgdm9pZCBub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lckZpcmVkKCk7Cisg
ICAgdm9pZCBub25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xlYW51cFRpbWVyRmlyZWQoKTsKKwor
I2lmIEVOQUJMRShOT05fVklTSUJMRV9XRUJQUk9DRVNTX01FTU9SWV9DTEVBTlVQX1RJTUVSKQor
ICAgIHZvaWQgbm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwVGltZXJGaXJlZCgpOworI2Vu
ZGlmCiAKICAgICB2b2lkIHJlZ2lzdGVyU3RvcmFnZUFyZWFNYXAoU3RvcmFnZUFyZWFNYXAmKTsK
ICAgICB2b2lkIHVucmVnaXN0ZXJTdG9yYWdlQXJlYU1hcChTdG9yYWdlQXJlYU1hcCYpOwpAQCAt
NjYyLDcgKzY2NiwxMSBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9wcm9jZXNzSXNTdXNwZW5kZWQg
eyBmYWxzZSB9OwogCiAgICAgSGFzaFNldDxXZWJDb3JlOjpQYWdlSWRlbnRpZmllcj4gbV9wYWdl
c0luV2luZG93czsKLSAgICBXZWJDb3JlOjpUaW1lciBtX25vblZpc2libGVQcm9jZXNzQ2xlYW51
cFRpbWVyOworICAgIFdlYkNvcmU6OlRpbWVyIG1fbm9uVmlzaWJsZVByb2Nlc3NHcmFwaGljc0Ns
ZWFudXBUaW1lcjsKKworI2lmIEVOQUJMRShOT05fVklTSUJMRV9XRUJQUk9DRVNTX01FTU9SWV9D
TEVBTlVQX1RJTUVSKQorICAgIFdlYkNvcmU6OlRpbWVyIG1fbm9uVmlzaWJsZVByb2Nlc3NNZW1v
cnlDbGVhbnVwVGltZXI7CisjZW5kaWYKIAogICAgIFJlZlB0cjxXZWJDb3JlOjpBcHBsaWNhdGlv
bkNhY2hlU3RvcmFnZT4gbV9hcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTsKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427088</attachid>
            <date>2021-04-26 13:57:02 -0700</date>
            <delta_ts>2021-04-29 09:41:21 -0700</delta_ts>
            <desc>patch for landing</desc>
            <filename>bug-225007-20210426135701.patch</filename>
            <type>text/plain</type>
            <size>7832</size>
            <attacher name="Ben Nham">nham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDYxZDhhZmFjOGM2MmUwZDlmMTI3NTFj
ZGNmNjFhNDUzMzEwOGNiYzcuLjdlMzEzZWZmM2YyYTUzMDI5ZjdiYzliNjFlMjFiYmU0OGVlYjIz
NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDQtMjMgIEJlbiBOaGFtICA8bmhhbUBhcHBs
ZS5jb20+CisKKyAgICAgICAgUmVkdWNlIG1lbW9yeSBmb290cHJpbnQgZm9yIGJhY2tncm91bmQg
dGFicworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1
MDA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAgV2hlbiBh
IFdlYkNvbnRlbnQgcHJvY2VzcyBjb250YWlucyBvbmx5IG5vbi12aXNpYmxlIHBhZ2VzIChlLmcu
IGlmIGl0IGlzIGEgYmFja2dyb3VuZCB0YWIpLAorICAgICAgICB3ZSBzaG91bGQgYXR0ZW1wdCB0
byByZWR1Y2Ugb3VyIG1lbW9yeSBmb290cHJpbnQgYWZ0ZXIgc29tZSB0aW1lIGludGVydmFsIHRv
IGhlbHAgcmVsaWV2ZQorICAgICAgICBzeXN0ZW0td2lkZSBtZW1vcnkgcHJlc3N1cmUuIFRoaXMg
aXMgZW5hYmxlZCBvbmx5IG9uIE1hYyBiZWNhdXNlIGlPUyBhbHJlYWR5IGRvZXMgc29tZXRoaW5n
CisgICAgICAgIHNpbWlsYXIganVzdCBiZWZvcmUgV2ViQ29udGVudCBzdXNwZW5kcy4KKworICAg
ICAgICAqIHd0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmg6CisKIDIwMjEtMDQtMjMgIERhcmluIEFk
bGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBkZWNvZGVyIG1lbW9yeSBh
bGxvY2F0aW9ucyBiYXNlZCBvbiB1bnRydXN0ZWQgZGF0YSAoc2l6ZXMpIGluIHRoZSBzdHJlYW07
IHJlbGF0ZWQgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9T
b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBjYjZiZjU2M2RmOWViZWZhMGQ1NjlkMzdlYjJj
NGU0ZmY5NDM1YzQzLi4xMmIyOTYxOTRlMmEwMjc4NjExODFlODg0OGE3ZWVhYWMwODUzNmUxIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA0LTIzICBCZW4gTmhhbSAgPG5oYW1AYXBw
bGUuY29tPgorCisgICAgICAgIFJlZHVjZSBtZW1vcnkgZm9vdHByaW50IGZvciBiYWNrZ3JvdW5k
IHRhYnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
NTAwNworCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFdoZW4g
YSBXZWJDb250ZW50IHByb2Nlc3MgY29udGFpbnMgb25seSBub24tdmlzaWJsZSBwYWdlcyAoZS5n
LiBpZiBpdCBpcyBhIGJhY2tncm91bmQgdGFiKSwKKyAgICAgICAgd2Ugc2hvdWxkIGF0dGVtcHQg
dG8gcmVkdWNlIG91ciBtZW1vcnkgZm9vdHByaW50IGFmdGVyIHNvbWUgdGltZSBpbnRlcnZhbCB0
byBoZWxwIHJlbGlldmUKKyAgICAgICAgc3lzdGVtLXdpZGUgbWVtb3J5IHByZXNzdXJlLiBUaGlz
IGlzIGVuYWJsZWQgb25seSBvbiBNYWMgYmVjYXVzZSBpT1MgYWxyZWFkeSBkb2VzIHNvbWV0aGlu
ZworICAgICAgICBzaW1pbGFyIGp1c3QgYmVmb3JlIFdlYkNvbnRlbnQgc3VzcGVuZHMuCisKKyAg
ICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ
cm9jZXNzOjpwYWdlRGlkRW50ZXJXaW5kb3cpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz
OjpwYWdlV2lsbExlYXZlV2luZG93KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6bm9u
VmlzaWJsZVByb2Nlc3NHcmFwaGljc0NsZWFudXBUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYktp
dDo6V2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwVGltZXJGaXJlZCk6
CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6Om5vblZpc2libGVQcm9jZXNzQ2xlYW51cFRp
bWVyRmlyZWQpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgor
CiAyMDIxLTA0LTIzICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAog
ICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NTU2Mi4KZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3Jt
RW5hYmxlQ29jb2EuaAppbmRleCA4NWY0ZTBhYzQ5NTk3MWNlNTM1NjYzMTgxMDg1OTg2NTczMjFh
NDFkLi5jODgxNGVlNjg1ZTUzZmNlOGMxODdhMjhiNTZjN2U2NTIzOWRmMWZlIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKKysrIGIvU291cmNlL1dURi93
dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCkBAIC0zOTAsNiArMzkwLDEwIEBACiAjZGVmaW5lIEVO
QUJMRV9ORVRXT1JLX0NBQ0hFX1NUQUxFX1dISUxFX1JFVkFMSURBVEUgMQogI2VuZGlmCiAKKyNp
ZiAhZGVmaW5lZChFTkFCTEVfTk9OX1ZJU0lCTEVfV0VCUFJPQ0VTU19NRU1PUllfQ0xFQU5VUF9U
SU1FUikgJiYgKFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oTUFDQ0FUQUxZU1QpKQorI2RlZmlu
ZSBFTkFCTEVfTk9OX1ZJU0lCTEVfV0VCUFJPQ0VTU19NRU1PUllfQ0xFQU5VUF9USU1FUiAxCisj
ZW5kaWYKKwogI2lmICFkZWZpbmVkKEVOQUJMRV9OT1RJRklDQVRJT05TKSAmJiBQTEFURk9STShN
QUMpCiAjZGVmaW5lIEVOQUJMRV9OT1RJRklDQVRJT05TIDEKICNlbmRpZgpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCmluZGV4IGJiNGNjZGI2ZjkzMzE5YWU1ZGVjYmQ1NmJk
NmEwZTAwNTVkNzQ2NGMuLjM0YjY1YmVjNjVlNTc2MmZmNWM2NTA3OGFhMTZkYjllMjdmMjBjNWIg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAorKysg
Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKQEAgLTIzMCw3ICsyMzAs
MTMgQEAKIHN0YXRpYyBjb25zdCBTZWNvbmRzIHBsdWdJbkF1dG9TdGFydEV4cGlyYXRpb25UaW1l
VXBkYXRlVGhyZXNob2xkIHsgMjkgKiAyNCAqIDYwICogNjAgfTsKIAogLy8gVGhpcyBzaG91bGQg
YmUgZ3JlYXRlciB0aGFuIHRpbGVSZXZhbGlkYXRpb25UaW1lb3V0IGluIFRpbGVDb250cm9sbGVy
Lgotc3RhdGljIGNvbnN0IFNlY29uZHMgbm9uVmlzaWJsZVByb2Nlc3NDbGVhbnVwRGVsYXkgeyAx
MF9zIH07CitzdGF0aWMgY29uc3QgU2Vjb25kcyBub25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xl
YW51cERlbGF5IHsgMTBfcyB9OworCisjaWYgRU5BQkxFKE5PTl9WSVNJQkxFX1dFQlBST0NFU1Nf
TUVNT1JZX0NMRUFOVVBfVElNRVIpCisvLyBUaGlzIHNob3VsZCBiZSBsb25nIGVub3VnaCB0byBz
dXBwb3J0IGEgd29ya2xvYWQgd2hlcmUgYSB1c2VyIGlzIGFjdGl2ZWx5IHN3aXRjaGluZyBiZXR3
ZWVuIG11bHRpcGxlIHRhYnMsCisvLyBzaW5jZSBvdXIgbWVtb3J5IGNsZWFudXAgcm91dGluZSBj
b3VsZCBwb3RlbnRpYWxseSBkZWxldGUgYSBnb29kIGFtb3VudCBvZiBKSVQgY29kZS4KK3N0YXRp
YyBjb25zdCBTZWNvbmRzIG5vblZpc2libGVQcm9jZXNzTWVtb3J5Q2xlYW51cERlbGF5IHsgMTIw
X3MgfTsKKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBKU0M7
CkBAIC0yNjUsNyArMjcxLDEwIEBAIFdlYlByb2Nlc3M6OldlYlByb2Nlc3MoKQogI2lmIEVOQUJM
RShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgICwgbV9wbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbk1h
bmFnZXIoUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb25NYW5hZ2VyOjpjcmVhdGUoKSkKICNlbmRpZgot
ICAgICwgbV9ub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lcigqdGhpcywgJldlYlByb2Nlc3M6
Om5vblZpc2libGVQcm9jZXNzQ2xlYW51cFRpbWVyRmlyZWQpCisgICAgLCBtX25vblZpc2libGVQ
cm9jZXNzR3JhcGhpY3NDbGVhbnVwVGltZXIoKnRoaXMsICZXZWJQcm9jZXNzOjpub25WaXNpYmxl
UHJvY2Vzc0dyYXBoaWNzQ2xlYW51cFRpbWVyRmlyZWQpCisjaWYgRU5BQkxFKE5PTl9WSVNJQkxF
X1dFQlBST0NFU1NfTUVNT1JZX0NMRUFOVVBfVElNRVIpCisgICAgLCBtX25vblZpc2libGVQcm9j
ZXNzTWVtb3J5Q2xlYW51cFRpbWVyKCp0aGlzLCAmV2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nl
c3NNZW1vcnlDbGVhbnVwVGltZXJGaXJlZCkKKyNlbmRpZgogI2lmIFBMQVRGT1JNKElPU19GQU1J
TFkpCiAgICAgLCBtX3dlYlNRTGl0ZURhdGFiYXNlVHJhY2tlcihbdGhpc10oYm9vbCBpc0hvbGRp
bmdMb2NrZWRGaWxlcykgeyBwYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz
OjpXZWJQcm9jZXNzUHJveHk6OlNldElzSG9sZGluZ0xvY2tlZEZpbGVzKGlzSG9sZGluZ0xvY2tl
ZEZpbGVzKSwgMCk7IH0pCiAjZW5kaWYKQEAgLTE1NDgsMTggKzE1NTcsMjkgQEAgdm9pZCBXZWJQ
cm9jZXNzOjpzZW5kUHJld2FybUluZm9ybWF0aW9uKGNvbnN0IFVSTCYgdXJsKQogdm9pZCBXZWJQ
cm9jZXNzOjpwYWdlRGlkRW50ZXJXaW5kb3coUGFnZUlkZW50aWZpZXIgcGFnZUlEKQogewogICAg
IG1fcGFnZXNJbldpbmRvd3MuYWRkKHBhZ2VJRCk7Ci0gICAgbV9ub25WaXNpYmxlUHJvY2Vzc0Ns
ZWFudXBUaW1lci5zdG9wKCk7CisgICAgbV9ub25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xlYW51
cFRpbWVyLnN0b3AoKTsKKworI2lmIEVOQUJMRShOT05fVklTSUJMRV9XRUJQUk9DRVNTX01FTU9S
WV9DTEVBTlVQX1RJTUVSKQorICAgIG1fbm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwVGlt
ZXIuc3RvcCgpOworI2VuZGlmCiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6cGFnZVdpbGxMZWF2ZVdp
bmRvdyhQYWdlSWRlbnRpZmllciBwYWdlSUQpCiB7CiAgICAgbV9wYWdlc0luV2luZG93cy5yZW1v
dmUocGFnZUlEKTsKIAotICAgIGlmIChtX3BhZ2VzSW5XaW5kb3dzLmlzRW1wdHkoKSAmJiAhbV9u
b25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lci5pc0FjdGl2ZSgpKQotICAgICAgICBtX25vblZp
c2libGVQcm9jZXNzQ2xlYW51cFRpbWVyLnN0YXJ0T25lU2hvdChub25WaXNpYmxlUHJvY2Vzc0Ns
ZWFudXBEZWxheSk7CisgICAgaWYgKG1fcGFnZXNJbldpbmRvd3MuaXNFbXB0eSgpKSB7CisgICAg
ICAgIGlmICghbV9ub25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xlYW51cFRpbWVyLmlzQWN0aXZl
KCkpCisgICAgICAgICAgICBtX25vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwVGltZXIu
c3RhcnRPbmVTaG90KG5vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwRGVsYXkpOworCisj
aWYgRU5BQkxFKE5PTl9WSVNJQkxFX1dFQlBST0NFU1NfTUVNT1JZX0NMRUFOVVBfVElNRVIpCisg
ICAgICAgIGlmICghbV9ub25WaXNpYmxlUHJvY2Vzc01lbW9yeUNsZWFudXBUaW1lci5pc0FjdGl2
ZSgpKQorICAgICAgICAgICAgbV9ub25WaXNpYmxlUHJvY2Vzc01lbW9yeUNsZWFudXBUaW1lci5z
dGFydE9uZVNob3Qobm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwRGVsYXkpOworI2VuZGlm
CisgICAgfQogfQogICAgIAotdm9pZCBXZWJQcm9jZXNzOjpub25WaXNpYmxlUHJvY2Vzc0NsZWFu
dXBUaW1lckZpcmVkKCkKK3ZvaWQgV2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NHcmFwaGlj
c0NsZWFudXBUaW1lckZpcmVkKCkKIHsKICAgICBBU1NFUlQobV9wYWdlc0luV2luZG93cy5pc0Vt
cHR5KCkpOwogICAgIGlmICghbV9wYWdlc0luV2luZG93cy5pc0VtcHR5KCkpCkBAIC0xNTcwLDYg
KzE1OTAsMTkgQEAgdm9pZCBXZWJQcm9jZXNzOjpub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1l
ckZpcmVkKCkKICNlbmRpZgogfQogCisjaWYgRU5BQkxFKE5PTl9WSVNJQkxFX1dFQlBST0NFU1Nf
TUVNT1JZX0NMRUFOVVBfVElNRVIpCit2b2lkIFdlYlByb2Nlc3M6Om5vblZpc2libGVQcm9jZXNz
TWVtb3J5Q2xlYW51cFRpbWVyRmlyZWQoKQoreworICAgIEFTU0VSVChtX3BhZ2VzSW5XaW5kb3dz
LmlzRW1wdHkoKSk7CisgICAgaWYgKCFtX3BhZ2VzSW5XaW5kb3dzLmlzRW1wdHkoKSkKKyAgICAg
ICAgcmV0dXJuOworCisgICAgV2ViQ29yZTo6cmVsZWFzZU1lbW9yeShDcml0aWNhbDo6WWVzLCBT
eW5jaHJvbm91czo6Tm8sIFdlYkNvcmU6Ok1haW50YWluQmFja0ZvcndhcmRDYWNoZTo6WWVzLCBX
ZWJDb3JlOjpNYWludGFpbk1lbW9yeUNhY2hlOjpObyk7CisgICAgZm9yIChhdXRvJiBwYWdlIDog
bV9wYWdlTWFwLnZhbHVlcygpKQorICAgICAgICBwYWdlLT5yZWxlYXNlTWVtb3J5KENyaXRpY2Fs
OjpZZXMpOworfQorI2VuZGlmCisKIHZvaWQgV2ViUHJvY2Vzczo6cmVnaXN0ZXJTdG9yYWdlQXJl
YU1hcChTdG9yYWdlQXJlYU1hcCYgc3RvcmFnZUFyZWFNYXApCiB7CiAgICAgQVNTRVJUKHN0b3Jh
Z2VBcmVhTWFwLmlkZW50aWZpZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvV2ViUHJvY2Vzcy5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu
aAppbmRleCA4MzA5ZGI4ZDUwNTUxMDcwMWU0ZWM4NTZmM2RjODdiNjAxMWVkODgzLi45NDc2OTYx
ZWI3OGQ0ODlmMTNhY2UwZWQxZjIzYzVmNzk1YzE0MmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9XZWJQcm9jZXNzLmgKQEAgLTI2NSw3ICsyNjUsMTEgQEAgcHVibGljOgogICAgIHZvaWQgcGFn
ZURpZEVudGVyV2luZG93KFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyKTsKICAgICB2b2lkIHBhZ2VX
aWxsTGVhdmVXaW5kb3coV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIpOwogCi0gICAgdm9pZCBub25W
aXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lckZpcmVkKCk7CisgICAgdm9pZCBub25WaXNpYmxlUHJv
Y2Vzc0dyYXBoaWNzQ2xlYW51cFRpbWVyRmlyZWQoKTsKKworI2lmIEVOQUJMRShOT05fVklTSUJM
RV9XRUJQUk9DRVNTX01FTU9SWV9DTEVBTlVQX1RJTUVSKQorICAgIHZvaWQgbm9uVmlzaWJsZVBy
b2Nlc3NNZW1vcnlDbGVhbnVwVGltZXJGaXJlZCgpOworI2VuZGlmCiAKICAgICB2b2lkIHJlZ2lz
dGVyU3RvcmFnZUFyZWFNYXAoU3RvcmFnZUFyZWFNYXAmKTsKICAgICB2b2lkIHVucmVnaXN0ZXJT
dG9yYWdlQXJlYU1hcChTdG9yYWdlQXJlYU1hcCYpOwpAQCAtNjYyLDcgKzY2NiwxMSBAQCBwcml2
YXRlOgogICAgIGJvb2wgbV9wcm9jZXNzSXNTdXNwZW5kZWQgeyBmYWxzZSB9OwogCiAgICAgSGFz
aFNldDxXZWJDb3JlOjpQYWdlSWRlbnRpZmllcj4gbV9wYWdlc0luV2luZG93czsKLSAgICBXZWJD
b3JlOjpUaW1lciBtX25vblZpc2libGVQcm9jZXNzQ2xlYW51cFRpbWVyOworICAgIFdlYkNvcmU6
OlRpbWVyIG1fbm9uVmlzaWJsZVByb2Nlc3NHcmFwaGljc0NsZWFudXBUaW1lcjsKKworI2lmIEVO
QUJMRShOT05fVklTSUJMRV9XRUJQUk9DRVNTX01FTU9SWV9DTEVBTlVQX1RJTUVSKQorICAgIFdl
YkNvcmU6OlRpbWVyIG1fbm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwVGltZXI7CisjZW5k
aWYKIAogICAgIFJlZlB0cjxXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZT4gbV9hcHBs
aWNhdGlvbkNhY2hlU3RvcmFnZTsKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427351</attachid>
            <date>2021-04-29 09:41:23 -0700</date>
            <delta_ts>2021-04-29 12:02:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225007-20210429094122.patch</filename>
            <type>text/plain</type>
            <size>8301</size>
            <attacher name="Ben Nham">nham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2Nzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGIzNjk1ZGQ0MTliNjVkZWNmZWI3NTVi
ZDEzYTRkYmVmZDJiYzUwMzkuLjhlNjBjMWNmNGM0Y2QxZWU4MTRkYmI0NTgyNjliMDgyZDdlMmEz
ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDQtMjkgIEJlbiBOaGFtICA8bmhhbUBhcHBs
ZS5jb20+CisKKyAgICAgICAgUmVkdWNlIG1lbW9yeSBmb290cHJpbnQgZm9yIGJhY2tncm91bmQg
dGFicworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1
MDA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAgQWRkIGFu
IG9wdGlvbiB0byBzbGltIGJhY2tncm91bmQgdGFicyBieSBwcm9hY3RpdmVseSBjYWxsaW5nIFdl
YkNvcmU6OnJlbGVhc2VNZW1vcnkgb24gTWFjcy4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybUVu
YWJsZUNvY29hLmg6CisKIDIwMjEtMDQtMjkgIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CiAK
ICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzY2MTkuCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFmYWE5
NzAxYzc1MjRhOWE2MzQwYWYyNWMxNzA2YTFkNjMzY2Q5MjguLjYyYTE0Yjk4ODdkMGJjM2M0ZGZl
ZjQwMzk5NzZkZjE2Mzc1ZWVmYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n
CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMDQt
MjkgIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVkdWNlIG1lbW9yeSBm
b290cHJpbnQgZm9yIGJhY2tncm91bmQgdGFicworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MDA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMg
RHVtZXouCisKKyAgICAgICAgV2hlbiBhIFdlYkNvbnRlbnQgcHJvY2VzcyBjb250YWlucyBvbmx5
IG5vbi12aXNpYmxlIHBhZ2VzIChlLmcuIGlmIGl0IGlzIGEgYmFja2dyb3VuZCB0YWIpLAorICAg
ICAgICB3ZSBzaG91bGQgYXR0ZW1wdCB0byByZWR1Y2Ugb3VyIG1lbW9yeSBmb290cHJpbnQgYWZ0
ZXIgc29tZSB0aW1lIGludGVydmFsIHRvIGhlbHAgcmVsaWV2ZQorICAgICAgICBzeXN0ZW0td2lk
ZSBtZW1vcnkgcHJlc3N1cmUuIFRoaXMgaXMgZW5hYmxlZCBvbmx5IG9uIE1hYyBiZWNhdXNlIGlP
UyBhbHJlYWR5IGRvZXMgc29tZXRoaW5nCisgICAgICAgIHNpbWlsYXIganVzdCBiZWZvcmUgV2Vi
Q29udGVudCBzdXNwZW5kcy4KKworICAgICAgICBPbmUgZXhjZXB0aW9uIHRvIHRoaXMgaXMgdGhh
dCB3ZSBkb24ndCBkbyB0aGlzIHByb2FjdGl2ZSBzbGltbWluZyBmb3IgcHJvY2Vzc2VzIHRoYXQg
YXJlIGluCisgICAgICAgIHRoZSBiYWNrL2ZvcndhcmQgY2FjaGUgb3IgaW4gdGhlIFdlYlByb2Nl
c3MgY2FjaGUuIFRoaXMgaXMgYmVjYXVzZSBkcm9wcGluZyB0aGUgbWVtb3J5IGNhY2hlCisgICAg
ICAgIGluIHRob3NlIHR5cGVzIG9mIHByb2Nlc3NlcyBsZWFkcyB0byBwZXJmIHJlZ3Jlc3Npb25z
IGluIGJlbmNobWFya3MgdGhhdCBkbyBjZXJ0YWluIHR5cGVzIG9mCisgICAgICAgIGNyb3NzLW9y
aWdpbiBuYXZpZ2F0aW9ucy4gV2UnbGwgdXNlIGEgc2VwYXJhdGUgbWVjaGFuaXNtIGZvciBjb250
cm9sbGluZyB0aGUgbWVtb3J5IHVzYWdlIG9mCisgICAgICAgIHRob3NlIHByb2Nlc3Nlczsgb3Vy
IGN1cnJlbnQgbG9naWMga2VlcHMgdGhvc2UgcHJvY2Vzc2VzIGFyb3VuZCB1bnRpbCB3ZSBhcmUg
YXQgdGhlIHdhcm5pbmcKKyAgICAgICAgb3IgY3JpdGljYWwgbWVtb3J5IHByZXNzdXJlIGxldmVs
LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktp
dDo6V2ViUHJvY2Vzczo6cGFnZURpZEVudGVyV2luZG93KToKKyAgICAgICAgKFdlYktpdDo6V2Vi
UHJvY2Vzczo6cGFnZVdpbGxMZWF2ZVdpbmRvdyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl
c3M6Om5vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwVGltZXJGaXJlZCk6CisgICAgICAg
IChXZWJLaXQ6OldlYlByb2Nlc3M6Om5vblZpc2libGVQcm9jZXNzTWVtb3J5Q2xlYW51cFRpbWVy
RmlyZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpub25WaXNpYmxlUHJvY2Vzc0Ns
ZWFudXBUaW1lckZpcmVkKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nl
c3MuaDoKKwogMjAyMS0wNC0yOSAgQmVuIE5oYW0gIDxuaGFtQGFwcGxlLmNvbT4KIAogICAgICAg
ICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NjYxOS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYv
d3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxl
Q29jb2EuaAppbmRleCBmZjBhZTg4OGJkZDQ0YzFkNTU3MTljZmQyMGUxNGU4ZTQyOWYyZGYzLi5j
OGNjNDBmZTRkNTVkZjRjMDkyMWJjMTdhMzQyNDFiM2NlNmI4NGYzIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKKysrIGIvU291cmNlL1dURi93dGYvUGxh
dGZvcm1FbmFibGVDb2NvYS5oCkBAIC0zOTAsNiArMzkwLDEwIEBACiAjZGVmaW5lIEVOQUJMRV9O
RVRXT1JLX0NBQ0hFX1NUQUxFX1dISUxFX1JFVkFMSURBVEUgMQogI2VuZGlmCiAKKyNpZiAhZGVm
aW5lZChFTkFCTEVfTk9OX1ZJU0lCTEVfV0VCUFJPQ0VTU19NRU1PUllfQ0xFQU5VUF9USU1FUikg
JiYgKFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oTUFDQ0FUQUxZU1QpKQorI2RlZmluZSBFTkFC
TEVfTk9OX1ZJU0lCTEVfV0VCUFJPQ0VTU19NRU1PUllfQ0xFQU5VUF9USU1FUiAxCisjZW5kaWYK
KwogI2lmICFkZWZpbmVkKEVOQUJMRV9OT1RJRklDQVRJT05TKSAmJiBQTEFURk9STShNQUMpCiAj
ZGVmaW5lIEVOQUJMRV9OT1RJRklDQVRJT05TIDEKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL1dlYlByb2Nlc3MuY3BwCmluZGV4IDQ0YjAxYWFmNzBmY2M3ZDEyNGRkYzU2NTlhNDU3ODM1
ZGY0Y2QyMjUuLmNhOWE5NzgwNjU5NzA2MjI5MDYzYjAxYTI0YjFhODczOGJjOTQ3NmYgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKQEAgLTIzMCw3ICsyMzAsMTMgQEAK
IHN0YXRpYyBjb25zdCBTZWNvbmRzIHBsdWdJbkF1dG9TdGFydEV4cGlyYXRpb25UaW1lVXBkYXRl
VGhyZXNob2xkIHsgMjkgKiAyNCAqIDYwICogNjAgfTsKIAogLy8gVGhpcyBzaG91bGQgYmUgZ3Jl
YXRlciB0aGFuIHRpbGVSZXZhbGlkYXRpb25UaW1lb3V0IGluIFRpbGVDb250cm9sbGVyLgotc3Rh
dGljIGNvbnN0IFNlY29uZHMgbm9uVmlzaWJsZVByb2Nlc3NDbGVhbnVwRGVsYXkgeyAxMF9zIH07
CitzdGF0aWMgY29uc3QgU2Vjb25kcyBub25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xlYW51cERl
bGF5IHsgMTBfcyB9OworCisjaWYgRU5BQkxFKE5PTl9WSVNJQkxFX1dFQlBST0NFU1NfTUVNT1JZ
X0NMRUFOVVBfVElNRVIpCisvLyBUaGlzIHNob3VsZCBiZSBsb25nIGVub3VnaCB0byBzdXBwb3J0
IGEgd29ya2xvYWQgd2hlcmUgYSB1c2VyIGlzIGFjdGl2ZWx5IHN3aXRjaGluZyBiZXR3ZWVuIG11
bHRpcGxlIHRhYnMsCisvLyBzaW5jZSBvdXIgbWVtb3J5IGNsZWFudXAgcm91dGluZSBjb3VsZCBw
b3RlbnRpYWxseSBkZWxldGUgYSBnb29kIGFtb3VudCBvZiBKSVQgY29kZS4KK3N0YXRpYyBjb25z
dCBTZWNvbmRzIG5vblZpc2libGVQcm9jZXNzTWVtb3J5Q2xlYW51cERlbGF5IHsgMTIwX3MgfTsK
KyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBKU0M7CkBAIC0y
NjUsNyArMjcxLDEwIEBAIFdlYlByb2Nlc3M6OldlYlByb2Nlc3MoKQogI2lmIEVOQUJMRShORVRT
Q0FQRV9QTFVHSU5fQVBJKQogICAgICwgbV9wbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbk1hbmFnZXIo
UGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb25NYW5hZ2VyOjpjcmVhdGUoKSkKICNlbmRpZgotICAgICwg
bV9ub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lcigqdGhpcywgJldlYlByb2Nlc3M6Om5vblZp
c2libGVQcm9jZXNzQ2xlYW51cFRpbWVyRmlyZWQpCisgICAgLCBtX25vblZpc2libGVQcm9jZXNz
R3JhcGhpY3NDbGVhbnVwVGltZXIoKnRoaXMsICZXZWJQcm9jZXNzOjpub25WaXNpYmxlUHJvY2Vz
c0dyYXBoaWNzQ2xlYW51cFRpbWVyRmlyZWQpCisjaWYgRU5BQkxFKE5PTl9WSVNJQkxFX1dFQlBS
T0NFU1NfTUVNT1JZX0NMRUFOVVBfVElNRVIpCisgICAgLCBtX25vblZpc2libGVQcm9jZXNzTWVt
b3J5Q2xlYW51cFRpbWVyKCp0aGlzLCAmV2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NNZW1v
cnlDbGVhbnVwVGltZXJGaXJlZCkKKyNlbmRpZgogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAg
ICAgLCBtX3dlYlNRTGl0ZURhdGFiYXNlVHJhY2tlcihbdGhpc10oYm9vbCBpc0hvbGRpbmdMb2Nr
ZWRGaWxlcykgeyBwYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ
cm9jZXNzUHJveHk6OlNldElzSG9sZGluZ0xvY2tlZEZpbGVzKGlzSG9sZGluZ0xvY2tlZEZpbGVz
KSwgMCk7IH0pCiAjZW5kaWYKQEAgLTE1NTQsMTggKzE1NjMsMjkgQEAgdm9pZCBXZWJQcm9jZXNz
OjpzZW5kUHJld2FybUluZm9ybWF0aW9uKGNvbnN0IFVSTCYgdXJsKQogdm9pZCBXZWJQcm9jZXNz
OjpwYWdlRGlkRW50ZXJXaW5kb3coUGFnZUlkZW50aWZpZXIgcGFnZUlEKQogewogICAgIG1fcGFn
ZXNJbldpbmRvd3MuYWRkKHBhZ2VJRCk7Ci0gICAgbV9ub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBU
aW1lci5zdG9wKCk7CisgICAgbV9ub25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xlYW51cFRpbWVy
LnN0b3AoKTsKKworI2lmIEVOQUJMRShOT05fVklTSUJMRV9XRUJQUk9DRVNTX01FTU9SWV9DTEVB
TlVQX1RJTUVSKQorICAgIG1fbm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwVGltZXIuc3Rv
cCgpOworI2VuZGlmCiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6cGFnZVdpbGxMZWF2ZVdpbmRvdyhQ
YWdlSWRlbnRpZmllciBwYWdlSUQpCiB7CiAgICAgbV9wYWdlc0luV2luZG93cy5yZW1vdmUocGFn
ZUlEKTsKIAotICAgIGlmIChtX3BhZ2VzSW5XaW5kb3dzLmlzRW1wdHkoKSAmJiAhbV9ub25WaXNp
YmxlUHJvY2Vzc0NsZWFudXBUaW1lci5pc0FjdGl2ZSgpKQotICAgICAgICBtX25vblZpc2libGVQ
cm9jZXNzQ2xlYW51cFRpbWVyLnN0YXJ0T25lU2hvdChub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBE
ZWxheSk7CisgICAgaWYgKG1fcGFnZXNJbldpbmRvd3MuaXNFbXB0eSgpKSB7CisgICAgICAgIGlm
ICghbV9ub25WaXNpYmxlUHJvY2Vzc0dyYXBoaWNzQ2xlYW51cFRpbWVyLmlzQWN0aXZlKCkpCisg
ICAgICAgICAgICBtX25vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwVGltZXIuc3RhcnRP
bmVTaG90KG5vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwRGVsYXkpOworCisjaWYgRU5B
QkxFKE5PTl9WSVNJQkxFX1dFQlBST0NFU1NfTUVNT1JZX0NMRUFOVVBfVElNRVIpCisgICAgICAg
IGlmICghbV9ub25WaXNpYmxlUHJvY2Vzc01lbW9yeUNsZWFudXBUaW1lci5pc0FjdGl2ZSgpKQor
ICAgICAgICAgICAgbV9ub25WaXNpYmxlUHJvY2Vzc01lbW9yeUNsZWFudXBUaW1lci5zdGFydE9u
ZVNob3Qobm9uVmlzaWJsZVByb2Nlc3NNZW1vcnlDbGVhbnVwRGVsYXkpOworI2VuZGlmCisgICAg
fQogfQogICAgIAotdm9pZCBXZWJQcm9jZXNzOjpub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1l
ckZpcmVkKCkKK3ZvaWQgV2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NHcmFwaGljc0NsZWFu
dXBUaW1lckZpcmVkKCkKIHsKICAgICBBU1NFUlQobV9wYWdlc0luV2luZG93cy5pc0VtcHR5KCkp
OwogICAgIGlmICghbV9wYWdlc0luV2luZG93cy5pc0VtcHR5KCkpCkBAIC0xNTc2LDYgKzE1OTYs
MjMgQEAgdm9pZCBXZWJQcm9jZXNzOjpub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lckZpcmVk
KCkKICNlbmRpZgogfQogCisjaWYgRU5BQkxFKE5PTl9WSVNJQkxFX1dFQlBST0NFU1NfTUVNT1JZ
X0NMRUFOVVBfVElNRVIpCit2b2lkIFdlYlByb2Nlc3M6Om5vblZpc2libGVQcm9jZXNzTWVtb3J5
Q2xlYW51cFRpbWVyRmlyZWQoKQoreworICAgIEFTU0VSVChtX3BhZ2VzSW5XaW5kb3dzLmlzRW1w
dHkoKSk7CisgICAgaWYgKCFtX3BhZ2VzSW5XaW5kb3dzLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0
dXJuOworCisgICAgLy8gSWYgdGhpcyBpcyBhIHByb2Nlc3MgdGhhdCB3ZSBrZWVwIGFyb3VuZCBm
b3IgcGVyZm9ybWFuY2UsIHRoZW4gZG9uJ3QgcHJvYWN0aXZlbHkgc2xpbSBpdCBkb3duIHVudGls
IGFic29sdXRlbHkgbmVjZXNzYXJ5IChpbiB0aGUgbWVtb3J5IHByZXNzdXJlIGhhbmRsZXIpLgor
ICAgIGlmIChtX3Byb2Nlc3NUeXBlID09IFByb2Nlc3NUeXBlOjpDYWNoZWRXZWJDb250ZW50IHx8
IGFyZUFsbFBhZ2VzU3VzcGVuZGVkKCkpCisgICAgICAgIHJldHVybjsKKworICAgIFdlYkNvcmU6
OnJlbGVhc2VNZW1vcnkoQ3JpdGljYWw6OlllcywgU3luY2hyb25vdXM6Ok5vLCBNYWludGFpbkJh
Y2tGb3J3YXJkQ2FjaGU6OlllcywgTWFpbnRhaW5NZW1vcnlDYWNoZTo6Tm8pOworICAgIGZvciAo
YXV0byYgcGFnZSA6IG1fcGFnZU1hcC52YWx1ZXMoKSkKKyAgICAgICAgcGFnZS0+cmVsZWFzZU1l
bW9yeShDcml0aWNhbDo6WWVzKTsKK30KKyNlbmRpZgorCiB2b2lkIFdlYlByb2Nlc3M6OnJlZ2lz
dGVyU3RvcmFnZUFyZWFNYXAoU3RvcmFnZUFyZWFNYXAmIHN0b3JhZ2VBcmVhTWFwKQogewogICAg
IEFTU0VSVChzdG9yYWdlQXJlYU1hcC5pZGVudGlmaWVyKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9XZWJQcm9jZXNzLmgKaW5kZXggODMwOWRiOGQ1MDU1MTA3MDFlNGVjODU2ZjNkYzg3YjYwMTFl
ZDg4My4uOTQ3Njk2MWViNzhkNDg5ZjEzYWNlMGVkMWYyM2M1Zjc5NWMxNDJkOCAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCkBAIC0yNjUsNyArMjY1LDExIEBAIHB1YmxpYzoK
ICAgICB2b2lkIHBhZ2VEaWRFbnRlcldpbmRvdyhXZWJDb3JlOjpQYWdlSWRlbnRpZmllcik7CiAg
ICAgdm9pZCBwYWdlV2lsbExlYXZlV2luZG93KFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyKTsKIAot
ICAgIHZvaWQgbm9uVmlzaWJsZVByb2Nlc3NDbGVhbnVwVGltZXJGaXJlZCgpOworICAgIHZvaWQg
bm9uVmlzaWJsZVByb2Nlc3NHcmFwaGljc0NsZWFudXBUaW1lckZpcmVkKCk7CisKKyNpZiBFTkFC
TEUoTk9OX1ZJU0lCTEVfV0VCUFJPQ0VTU19NRU1PUllfQ0xFQU5VUF9USU1FUikKKyAgICB2b2lk
IG5vblZpc2libGVQcm9jZXNzTWVtb3J5Q2xlYW51cFRpbWVyRmlyZWQoKTsKKyNlbmRpZgogCiAg
ICAgdm9pZCByZWdpc3RlclN0b3JhZ2VBcmVhTWFwKFN0b3JhZ2VBcmVhTWFwJik7CiAgICAgdm9p
ZCB1bnJlZ2lzdGVyU3RvcmFnZUFyZWFNYXAoU3RvcmFnZUFyZWFNYXAmKTsKQEAgLTY2Miw3ICs2
NjYsMTEgQEAgcHJpdmF0ZToKICAgICBib29sIG1fcHJvY2Vzc0lzU3VzcGVuZGVkIHsgZmFsc2Ug
fTsKIAogICAgIEhhc2hTZXQ8V2ViQ29yZTo6UGFnZUlkZW50aWZpZXI+IG1fcGFnZXNJbldpbmRv
d3M7Ci0gICAgV2ViQ29yZTo6VGltZXIgbV9ub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lcjsK
KyAgICBXZWJDb3JlOjpUaW1lciBtX25vblZpc2libGVQcm9jZXNzR3JhcGhpY3NDbGVhbnVwVGlt
ZXI7CisKKyNpZiBFTkFCTEUoTk9OX1ZJU0lCTEVfV0VCUFJPQ0VTU19NRU1PUllfQ0xFQU5VUF9U
SU1FUikKKyAgICBXZWJDb3JlOjpUaW1lciBtX25vblZpc2libGVQcm9jZXNzTWVtb3J5Q2xlYW51
cFRpbWVyOworI2VuZGlmCiAKICAgICBSZWZQdHI8V2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZVN0
b3JhZ2U+IG1fYXBwbGljYXRpb25DYWNoZVN0b3JhZ2U7CiAK
</data>

          </attachment>
      

    </bug>

</bugzilla>