<?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>225113</bug_id>
          
          <creation_ts>2021-04-27 11:05:18 -0700</creation_ts>
          <short_desc>StructureStubInfo and PolymorphicAccess should account for their non-GC memory</short_desc>
          <delta_ts>2021-05-18 12:44:27 -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>REOPENED</bug_status>
          <resolution></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>
          <dependson>225930</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Keith Miller">keith_miller</reporter>
          <assigned_to name="Keith Miller">keith_miller</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>mark.lam</cc>
    
    <cc>msaboff</cc>
    
    <cc>saam</cc>
    
    <cc>tzagallo</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1754699</commentid>
    <comment_count>0</comment_count>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2021-04-27 11:05:18 -0700</bug_when>
    <thetext>StructureStubInfo and PolyMorphicAccess should account for their non-GC memory</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754704</commentid>
    <comment_count>1</comment_count>
      <attachid>427172</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2021-04-27 11:10:27 -0700</bug_when>
    <thetext>Created attachment 427172
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754711</commentid>
    <comment_count>2</comment_count>
      <attachid>427175</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2021-04-27 11:20:48 -0700</bug_when>
    <thetext>Created attachment 427175
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754722</commentid>
    <comment_count>3</comment_count>
      <attachid>427175</attachid>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2021-04-27 11:46:41 -0700</bug_when>
    <thetext>Comment on attachment 427175
Patch

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

r=me

&gt; Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp:389
&gt; +        size += sizeof(WatchpointsOnStructureStubInfo);

m_watchpoints has a Bag of stuff.  Do we need to add that size?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754729</commentid>
    <comment_count>4</comment_count>
      <attachid>427175</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2021-04-27 11:55:20 -0700</bug_when>
    <thetext>Comment on attachment 427175
Patch

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

&gt;&gt; Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp:389
&gt;&gt; +        size += sizeof(WatchpointsOnStructureStubInfo);
&gt; 
&gt; m_watchpoints has a Bag of stuff.  Do we need to add that size?

Yeah, for some reason I thought the watchpoints were owned by the code block but that doesn&apos;t make sense since they are not references or pointers in the Bag.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754736</commentid>
    <comment_count>5</comment_count>
      <attachid>427179</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2021-04-27 12:04:46 -0700</bug_when>
    <thetext>Created attachment 427179
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754745</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-27 12:49:52 -0700</bug_when>
    <thetext>Committed r276655 (237082@main): &lt;https://commits.webkit.org/237082@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 427179.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754746</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-04-27 12:50:20 -0700</bug_when>
    <thetext>&lt;rdar://problem/77224968&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1761250</commentid>
    <comment_count>8</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2021-05-18 12:44:27 -0700</bug_when>
    <thetext>Re-opened since this is blocked by bug 225930</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427172</attachid>
            <date>2021-04-27 11:10:27 -0700</date>
            <delta_ts>2021-04-27 11:21:50 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225113-20210427141026.patch</filename>
            <type>text/plain</type>
            <size>5748</size>
            <attacher name="Keith Miller">keith_miller</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1
YzE4OTliNmQyM2RjYzFhODA0YzczYmMyODdlZjZkZjkwNTkxOGQxLi40ZDI1YjNiMWU2MTk0Yjg5
N2FjYTUwYTBhMDAzZDVkZWI0ODZlMDk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyMyBAQAorMjAyMS0wNC0yNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl
LmNvbT4KKworICAgICAgICBTdHJ1Y3R1cmVTdHViSW5mbyBhbmQgUG9seW1vcnBoaWNBY2Nlc3Mg
c2hvdWxkIGFjY291bnQgZm9yIHRoZWlyIG5vbi1HQyBtZW1vcnkKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTExMworCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGRvbid0IHBhc3MgdGhlIENvbmN1cnJl
bnRKU0xvY2tlciB0byB0aGUgaGVscGVyIG1ldGhvZHMgaGVyZSBzaW5jZSB0aGUKKyAgICAgICAg
REVDTEFSRV9WSVNJVF9BR0dSRUdBVEUgbWFjcm8gZG9lcyBub3QgYWxsb3cgZm9yIGV4dHJhIHBh
cmFtZXRlcnMgdG8gYmUgcGFzc2VkLgorICAgICAgICBJIGZpbGVkIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxMTQgdG8gdHJhY2sgdGhhdC4KKworICAgICAgICAq
IGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6SklURGF0
YTo6c2l6ZSBjb25zdCk6CisgICAgICAgICogYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3Bw
OgorICAgICAgICAoSlNDOjpQb2x5bW9ycGhpY0FjY2Vzczo6ZXh0cmFNZW1vcnlJbkJ5dGVzIGNv
bnN0KToKKyAgICAgICAgKiBieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oOgorICAgICAgICAq
IGJ5dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmNwcDoKKyAgICAgICAgKEpTQzo6U3RydWN0dXJl
U3R1YkluZm86OmV4dHJhTWVtb3J5SW5CeXRlcyk6CisgICAgICAgICogYnl0ZWNvZGUvU3RydWN0
dXJlU3R1YkluZm8uaDoKKwogMjAyMS0wNC0yNiAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVy
QGFwcGxlLmNvbT4KIAogICAgICAgICBVbmxpbmtlZENvZGVCbG9jayBzaG91bGQgaGF2ZSBiZXR0
ZXIgYWNjb3VudGluZyBmb3IgZXh0cmEgbWVtb3J5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj
cmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i
eXRlY29kZS9Db2RlQmxvY2suY3BwCmluZGV4IDgyNTE1YTZlZGQwNjM1N2ZmMzBlYmJhODVmOTM2
ZTk2NThiOGY1YzMuLmI0NjUyNWYwMDRjZWIyMzgwYTUxZTI3MTc1OGQ4N2Q1NTVmYmNkNDggMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCisr
KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCkBAIC0xMDM0
LDYgKzEwMzQsOCBAQCBzaXplX3QgQ29kZUJsb2NrOjpKSVREYXRhOjpzaXplKGNvbnN0IENvbmN1
cnJlbnRKU0xvY2tlciYpIGNvbnN0CiB7CiAgICAgc2l6ZV90IHNpemUgPSBzaXplb2YoSklURGF0
YSk7CiAgICAgc2l6ZSArPSBtX3N0dWJJbmZvcy5lc3RpbWF0ZWRBbGxvY2F0aW9uU2l6ZUluQnl0
ZXMoKTsKKyAgICBmb3IgKFN0cnVjdHVyZVN0dWJJbmZvKiBzdHViIDogbV9zdHViSW5mb3MpCisg
ICAgICAgIHNpemUgKz0gc3R1Yi0+ZXh0cmFNZW1vcnlJbkJ5dGVzKCk7CiAgICAgc2l6ZSArPSBt
X2FkZElDcy5lc3RpbWF0ZWRBbGxvY2F0aW9uU2l6ZUluQnl0ZXMoKTsKICAgICBzaXplICs9IG1f
bXVsSUNzLmVzdGltYXRlZEFsbG9jYXRpb25TaXplSW5CeXRlcygpOwogICAgIHNpemUgKz0gbV9u
ZWdJQ3MuZXN0aW1hdGVkQWxsb2NhdGlvblNpemVJbkJ5dGVzKCk7CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwIGIvU291cmNl
L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNjZXNzLmNwcAppbmRleCA2ZGNj
Mjk1OWFkMDEzYzA4NmJiN2FlYmM0ZGJlM2Q3ZWNiMWZjMDc5Li43MDkxZjcwNDU0MTlhY2Y1ZmE2
ZTdlMzhiZGIxYzAwZWZiYjUzN2FjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv
Ynl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y
ZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAKQEAgLTM3Nyw2ICszNzcsMjAgQEAgdm9p
ZCBQb2x5bW9ycGhpY0FjY2Vzczo6dmlzaXRBZ2dyZWdhdGVJbXBsKFZpc2l0b3ImIHZpc2l0b3Ip
CiAKIERFRklORV9WSVNJVF9BR0dSRUdBVEUoUG9seW1vcnBoaWNBY2Nlc3MpOwogCitzaXplX3Qg
UG9seW1vcnBoaWNBY2Nlc3M6OmV4dHJhTWVtb3J5SW5CeXRlcygpIGNvbnN0Cit7CisgICAgc2l6
ZV90IHNpemUgPSAwOworICAgIHNpemUgKz0gbV9saXN0LnNpemVJbkJ5dGVzKCk7CisgICAgLy8g
RklYTUU6IEFjY291bnQgZm9yIHRoZSBzaXplIG9mIHRoZSB2YXJpb3VzIGFjY2VzcyBjYXNlcy4K
KyAgICBzaXplICs9IG1fbGlzdC5zaXplKCkgKiBzaXplb2YoQWNjZXNzQ2FzZSk7CisgICAgaWYg
KG1fc3R1YlJvdXRpbmUpCisgICAgICAgIHNpemUgKz0gc2l6ZW9mKEpJVFN0dWJSb3V0aW5lKSAr
IG1fc3R1YlJvdXRpbmUtPmNvZGUoKS5zaXplKCk7CisgICAgaWYgKG1fd2F0Y2hwb2ludHMpCisg
ICAgICAgIHNpemUgKz0gc2l6ZW9mKFdhdGNocG9pbnRzT25TdHJ1Y3R1cmVTdHViSW5mbyk7Cisg
ICAgc2l6ZSArPSBtX3dlYWtSZWZlcmVuY2VzLnNpemVJbkJ5dGVzKCk7CisgICAgcmV0dXJuIHNp
emU7Cit9CisKIHZvaWQgUG9seW1vcnBoaWNBY2Nlc3M6OmR1bXAoUHJpbnRTdHJlYW0mIG91dCkg
Y29uc3QKIHsKICAgICBvdXQucHJpbnQoUmF3UG9pbnRlcih0aGlzKSwgIjpbIik7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuaCBi
L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCmluZGV4
IDI5MjAzMjZkY2M5MTU0NzRiM2YxZWViN2Y3MjVlNmFiMzRhZWNiNDEuLjgxMDU3YzZlMDc4ZDU2
M2QxMWY1ODZmMWE3MDIxNWY0MThlMTQ0YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0
Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0
Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCkBAIC0xNTcsNiArMTU3LDggQEAgcHVi
bGljOgogCiAgICAgLy8gSWYgdGhpcyByZXR1cm5zIGZhbHNlIHRoZW4gd2UgYXJlIHJlcXVlc3Rp
bmcgYSByZXNldCBvZiB0aGUgb3duaW5nIFN0cnVjdHVyZVN0dWJJbmZvLgogICAgIGJvb2wgdmlz
aXRXZWFrKFZNJikgY29uc3Q7CisKKyAgICBzaXplX3QgZXh0cmFNZW1vcnlJbkJ5dGVzKCkgY29u
c3Q7CiAgICAgCiAgICAgLy8gVGhpcyByZXR1cm5zIHRydWUgaWYgaXQgaGFzIG1hcmtlZCBldmVy
eXRoaW5nIGl0IHdpbGwgZXZlciBtYXJrZWQuIFRoaXMgY2FuIGJlIHVzZWQgYXMgYW4KICAgICAv
LyBvcHRpbWl6YXRpb24gdG8gdGhlbiBhdm9pZCBjYWxsaW5nIHRoaXMgbWV0aG9kIGFnYWluIGR1
cmluZyB0aGUgZml4cG9pbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0
ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj
b2RlL1N0cnVjdHVyZVN0dWJJbmZvLmNwcAppbmRleCBhZmQ4MzliZWI0MTZiOWJhZGQ2NjhkZGJh
ZDc1MTM2ZDBhMGRkNzE5Li4wNWU2OTUxNzRiOWRlOGRkOTkzNzlmZjkxMGMwMTJmYzdlMjliMWI0
IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1
YkluZm8uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVT
dHViSW5mby5jcHAKQEAgLTM1NSw2ICszNTUsMTkgQEAgdm9pZCBTdHJ1Y3R1cmVTdHViSW5mbzo6
dmlzaXRXZWFrUmVmZXJlbmNlcyhjb25zdCBDb25jdXJyZW50SlNMb2NrZXJCYXNlJiBsb2NrZXIK
ICAgICByZXNldEJ5R0MgPSB0cnVlOwogfQogCitzaXplX3QgU3RydWN0dXJlU3R1YkluZm86OmV4
dHJhTWVtb3J5SW5CeXRlcygpCit7CisgICAgc2l6ZV90IGV4dHJhTWVtb3J5ID0gMDsKKyAgICAv
LyBDYWNoZWFibGUgSWRlbnRpZmllciBuZXZlciBvd25zIGV4dHJhIG1lbW9yeSBiZWNhdXNlIFVJ
RHMgYXJlIG93bmVkIGJ5IHRoZSB1bmlxdWUgc3RyaW5nIHRhYmxlLgorICAgIHsKKyAgICAgICAg
YXV0byBsb2NrZXIgPSBob2xkTG9jayhtX2J1ZmZlcmVkU3RydWN0dXJlc0xvY2spOworICAgICAg
ICBleHRyYU1lbW9yeSArPSBtX2J1ZmZlcmVkU3RydWN0dXJlcy5jYXBhY2l0eSgpICogc2l6ZW9m
KEJ1ZmZlcmVkU3RydWN0dXJlKTsKKyAgICB9CisgICAgaWYgKGNhY2hlVHlwZSgpID09IENhY2hl
VHlwZTo6U3R1YikKKyAgICAgICAgZXh0cmFNZW1vcnkgKz0gdS5zdHViLT5leHRyYU1lbW9yeUlu
Qnl0ZXMoKTsKKyAgICByZXR1cm4gZXh0cmFNZW1vcnk7Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1l
IFZpc2l0b3I+CiBib29sIFN0cnVjdHVyZVN0dWJJbmZvOjpwcm9wYWdhdGVUcmFuc2l0aW9ucyhW
aXNpdG9yJiB2aXNpdG9yKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5
dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv
ZGUvU3RydWN0dXJlU3R1YkluZm8uaAppbmRleCAyNDYxOWJhZDc1MjYwZGM5MmM0YTRkODk5NzY2
ZjIzYzk4Y2ZjNjY1Li4yY2E2OTY3Yzc3NDYwMmRiYzkyNmJjZjZhYmQ0M2UzY2U1MWQ2ZDFiIDEw
MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1Yklu
Zm8uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1Yklu
Zm8uaApAQCAtOTgsNiArOTgsOSBAQCBwdWJsaWM6CiAgICAgLy8gQ2hlY2sgaWYgdGhlIHN0dWIg
aGFzIHdlYWsgcmVmZXJlbmNlcyB0aGF0IGFyZSBkZWFkLiBJZiBpdCBkb2VzLCB0aGVuIGl0IHJl
c2V0cyBpdHNlbGYsCiAgICAgLy8gZWl0aGVyIGVudGlyZWx5IG9yIGp1c3QgZW5vdWdoIHRvIGVu
c3VyZSB0aGF0IHRob3NlIGRlYWQgcG9pbnRlcnMgZG9uJ3QgZ2V0IHVzZWQgYW55bW9yZS4KICAg
ICB2b2lkIHZpc2l0V2Vha1JlZmVyZW5jZXMoY29uc3QgQ29uY3VycmVudEpTTG9ja2VyQmFzZSYs
IENvZGVCbG9jayopOworCisgICAgLy8gQ29tcHV0ZXMgdGhlIG5vbi1HQyBtZW1vcnkgb3duZWQg
YnkgdGhpcyBvYmplY3QgaW4gYnl0ZXMsIHJlY3Vyc2l2ZWx5IHJlcXVlc3RpbmcgdGhlIG5vbi1H
QyBtZW1vcnkgc2l6ZSBvZiBvd25lZCBvYmplY3RzLgorICAgIHNpemVfdCBleHRyYU1lbW9yeUlu
Qnl0ZXMoKTsKICAgICAKICAgICAvLyBUaGlzIHJldHVybnMgdHJ1ZSBpZiBpdCBoYXMgbWFya2Vk
IGV2ZXJ5dGhpbmcgdGhhdCBpdCB3aWxsIGV2ZXIgbWFyay4KICAgICB0ZW1wbGF0ZTx0eXBlbmFt
ZSBWaXNpdG9yPiBib29sIHByb3BhZ2F0ZVRyYW5zaXRpb25zKFZpc2l0b3ImKTsK
</data>
<flag name="commit-queue"
          id="447692"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427175</attachid>
            <date>2021-04-27 11:20:48 -0700</date>
            <delta_ts>2021-04-27 12:04:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225113-20210427142047.patch</filename>
            <type>text/plain</type>
            <size>5745</size>
            <attacher name="Keith Miller">keith_miller</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1
YzE4OTliNmQyM2RjYzFhODA0YzczYmMyODdlZjZkZjkwNTkxOGQxLi40ZDI1YjNiMWU2MTk0Yjg5
N2FjYTUwYTBhMDAzZDVkZWI0ODZlMDk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyMyBAQAorMjAyMS0wNC0yNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl
LmNvbT4KKworICAgICAgICBTdHJ1Y3R1cmVTdHViSW5mbyBhbmQgUG9seW1vcnBoaWNBY2Nlc3Mg
c2hvdWxkIGFjY291bnQgZm9yIHRoZWlyIG5vbi1HQyBtZW1vcnkKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTExMworCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGRvbid0IHBhc3MgdGhlIENvbmN1cnJl
bnRKU0xvY2tlciB0byB0aGUgaGVscGVyIG1ldGhvZHMgaGVyZSBzaW5jZSB0aGUKKyAgICAgICAg
REVDTEFSRV9WSVNJVF9BR0dSRUdBVEUgbWFjcm8gZG9lcyBub3QgYWxsb3cgZm9yIGV4dHJhIHBh
cmFtZXRlcnMgdG8gYmUgcGFzc2VkLgorICAgICAgICBJIGZpbGVkIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUxMTQgdG8gdHJhY2sgdGhhdC4KKworICAgICAgICAq
IGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6SklURGF0
YTo6c2l6ZSBjb25zdCk6CisgICAgICAgICogYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3Bw
OgorICAgICAgICAoSlNDOjpQb2x5bW9ycGhpY0FjY2Vzczo6ZXh0cmFNZW1vcnlJbkJ5dGVzIGNv
bnN0KToKKyAgICAgICAgKiBieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oOgorICAgICAgICAq
IGJ5dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmNwcDoKKyAgICAgICAgKEpTQzo6U3RydWN0dXJl
U3R1YkluZm86OmV4dHJhTWVtb3J5SW5CeXRlcyk6CisgICAgICAgICogYnl0ZWNvZGUvU3RydWN0
dXJlU3R1YkluZm8uaDoKKwogMjAyMS0wNC0yNiAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVy
QGFwcGxlLmNvbT4KIAogICAgICAgICBVbmxpbmtlZENvZGVCbG9jayBzaG91bGQgaGF2ZSBiZXR0
ZXIgYWNjb3VudGluZyBmb3IgZXh0cmEgbWVtb3J5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj
cmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i
eXRlY29kZS9Db2RlQmxvY2suY3BwCmluZGV4IDgyNTE1YTZlZGQwNjM1N2ZmMzBlYmJhODVmOTM2
ZTk2NThiOGY1YzMuLmI0NjUyNWYwMDRjZWIyMzgwYTUxZTI3MTc1OGQ4N2Q1NTVmYmNkNDggMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCisr
KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCkBAIC0xMDM0
LDYgKzEwMzQsOCBAQCBzaXplX3QgQ29kZUJsb2NrOjpKSVREYXRhOjpzaXplKGNvbnN0IENvbmN1
cnJlbnRKU0xvY2tlciYpIGNvbnN0CiB7CiAgICAgc2l6ZV90IHNpemUgPSBzaXplb2YoSklURGF0
YSk7CiAgICAgc2l6ZSArPSBtX3N0dWJJbmZvcy5lc3RpbWF0ZWRBbGxvY2F0aW9uU2l6ZUluQnl0
ZXMoKTsKKyAgICBmb3IgKFN0cnVjdHVyZVN0dWJJbmZvKiBzdHViIDogbV9zdHViSW5mb3MpCisg
ICAgICAgIHNpemUgKz0gc3R1Yi0+ZXh0cmFNZW1vcnlJbkJ5dGVzKCk7CiAgICAgc2l6ZSArPSBt
X2FkZElDcy5lc3RpbWF0ZWRBbGxvY2F0aW9uU2l6ZUluQnl0ZXMoKTsKICAgICBzaXplICs9IG1f
bXVsSUNzLmVzdGltYXRlZEFsbG9jYXRpb25TaXplSW5CeXRlcygpOwogICAgIHNpemUgKz0gbV9u
ZWdJQ3MuZXN0aW1hdGVkQWxsb2NhdGlvblNpemVJbkJ5dGVzKCk7CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwIGIvU291cmNl
L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNjZXNzLmNwcAppbmRleCA2ZGNj
Mjk1OWFkMDEzYzA4NmJiN2FlYmM0ZGJlM2Q3ZWNiMWZjMDc5Li5kNGU2MTkyYmU4MjIzMzNmMGFi
MWEwNzIzNjBjZGI4MDc0MGE4NmRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv
Ynl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y
ZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAKQEAgLTM3Nyw2ICszNzcsMjAgQEAgdm9p
ZCBQb2x5bW9ycGhpY0FjY2Vzczo6dmlzaXRBZ2dyZWdhdGVJbXBsKFZpc2l0b3ImIHZpc2l0b3Ip
CiAKIERFRklORV9WSVNJVF9BR0dSRUdBVEUoUG9seW1vcnBoaWNBY2Nlc3MpOwogCitzaXplX3Qg
UG9seW1vcnBoaWNBY2Nlc3M6OmV4dHJhTWVtb3J5SW5CeXRlcygpIGNvbnN0Cit7CisgICAgc2l6
ZV90IHNpemUgPSAwOworICAgIHNpemUgKz0gbV9saXN0LnNpemVJbkJ5dGVzKCk7CisgICAgLy8g
RklYTUU6IEFjY291bnQgZm9yIHRoZSBzaXplIG9mIHRoZSB2YXJpb3VzIGFjY2VzcyBjYXNlcy4K
KyAgICBzaXplICs9IG1fbGlzdC5zaXplKCkgKiBzaXplb2YoQWNjZXNzQ2FzZSk7CisgICAgaWYg
KG1fc3R1YlJvdXRpbmUpCisgICAgICAgIHNpemUgKz0gc2l6ZW9mKEpJVFN0dWJSb3V0aW5lKSAr
IG1fc3R1YlJvdXRpbmUtPmNvZGUoKS5zaXplKCk7CisgICAgaWYgKG1fd2F0Y2hwb2ludHMpCisg
ICAgICAgIHNpemUgKz0gc2l6ZW9mKFdhdGNocG9pbnRzT25TdHJ1Y3R1cmVTdHViSW5mbyk7Cisg
ICAgc2l6ZSArPSBtX3dlYWtSZWZlcmVuY2VzLmJ5dGVTaXplKCk7CisgICAgcmV0dXJuIHNpemU7
Cit9CisKIHZvaWQgUG9seW1vcnBoaWNBY2Nlc3M6OmR1bXAoUHJpbnRTdHJlYW0mIG91dCkgY29u
c3QKIHsKICAgICBvdXQucHJpbnQoUmF3UG9pbnRlcih0aGlzKSwgIjpbIik7CmRpZmYgLS1naXQg
YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuaCBiL1Nv
dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCmluZGV4IDI5
MjAzMjZkY2M5MTU0NzRiM2YxZWViN2Y3MjVlNmFiMzRhZWNiNDEuLjgxMDU3YzZlMDc4ZDU2M2Qx
MWY1ODZmMWE3MDIxNWY0MThlMTQ0YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y
ZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y
ZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCkBAIC0xNTcsNiArMTU3LDggQEAgcHVibGlj
OgogCiAgICAgLy8gSWYgdGhpcyByZXR1cm5zIGZhbHNlIHRoZW4gd2UgYXJlIHJlcXVlc3Rpbmcg
YSByZXNldCBvZiB0aGUgb3duaW5nIFN0cnVjdHVyZVN0dWJJbmZvLgogICAgIGJvb2wgdmlzaXRX
ZWFrKFZNJikgY29uc3Q7CisKKyAgICBzaXplX3QgZXh0cmFNZW1vcnlJbkJ5dGVzKCkgY29uc3Q7
CiAgICAgCiAgICAgLy8gVGhpcyByZXR1cm5zIHRydWUgaWYgaXQgaGFzIG1hcmtlZCBldmVyeXRo
aW5nIGl0IHdpbGwgZXZlciBtYXJrZWQuIFRoaXMgY2FuIGJlIHVzZWQgYXMgYW4KICAgICAvLyBv
cHRpbWl6YXRpb24gdG8gdGhlbiBhdm9pZCBjYWxsaW5nIHRoaXMgbWV0aG9kIGFnYWluIGR1cmlu
ZyB0aGUgZml4cG9pbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv
ZGUvU3RydWN0dXJlU3R1YkluZm8uY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl
L1N0cnVjdHVyZVN0dWJJbmZvLmNwcAppbmRleCBhZmQ4MzliZWI0MTZiOWJhZGQ2NjhkZGJhZDc1
MTM2ZDBhMGRkNzE5Li4wNWU2OTUxNzRiOWRlOGRkOTkzNzlmZjkxMGMwMTJmYzdlMjliMWI0IDEw
MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1Yklu
Zm8uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVTdHVi
SW5mby5jcHAKQEAgLTM1NSw2ICszNTUsMTkgQEAgdm9pZCBTdHJ1Y3R1cmVTdHViSW5mbzo6dmlz
aXRXZWFrUmVmZXJlbmNlcyhjb25zdCBDb25jdXJyZW50SlNMb2NrZXJCYXNlJiBsb2NrZXIKICAg
ICByZXNldEJ5R0MgPSB0cnVlOwogfQogCitzaXplX3QgU3RydWN0dXJlU3R1YkluZm86OmV4dHJh
TWVtb3J5SW5CeXRlcygpCit7CisgICAgc2l6ZV90IGV4dHJhTWVtb3J5ID0gMDsKKyAgICAvLyBD
YWNoZWFibGUgSWRlbnRpZmllciBuZXZlciBvd25zIGV4dHJhIG1lbW9yeSBiZWNhdXNlIFVJRHMg
YXJlIG93bmVkIGJ5IHRoZSB1bmlxdWUgc3RyaW5nIHRhYmxlLgorICAgIHsKKyAgICAgICAgYXV0
byBsb2NrZXIgPSBob2xkTG9jayhtX2J1ZmZlcmVkU3RydWN0dXJlc0xvY2spOworICAgICAgICBl
eHRyYU1lbW9yeSArPSBtX2J1ZmZlcmVkU3RydWN0dXJlcy5jYXBhY2l0eSgpICogc2l6ZW9mKEJ1
ZmZlcmVkU3RydWN0dXJlKTsKKyAgICB9CisgICAgaWYgKGNhY2hlVHlwZSgpID09IENhY2hlVHlw
ZTo6U3R1YikKKyAgICAgICAgZXh0cmFNZW1vcnkgKz0gdS5zdHViLT5leHRyYU1lbW9yeUluQnl0
ZXMoKTsKKyAgICByZXR1cm4gZXh0cmFNZW1vcnk7Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1lIFZp
c2l0b3I+CiBib29sIFN0cnVjdHVyZVN0dWJJbmZvOjpwcm9wYWdhdGVUcmFuc2l0aW9ucyhWaXNp
dG9yJiB2aXNpdG9yKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj
b2RlL1N0cnVjdHVyZVN0dWJJbmZvLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv
U3RydWN0dXJlU3R1YkluZm8uaAppbmRleCAyNDYxOWJhZDc1MjYwZGM5MmM0YTRkODk5NzY2ZjIz
Yzk4Y2ZjNjY1Li4yY2E2OTY3Yzc3NDYwMmRiYzkyNmJjZjZhYmQ0M2UzY2U1MWQ2ZDFiIDEwMDY0
NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8u
aAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8u
aApAQCAtOTgsNiArOTgsOSBAQCBwdWJsaWM6CiAgICAgLy8gQ2hlY2sgaWYgdGhlIHN0dWIgaGFz
IHdlYWsgcmVmZXJlbmNlcyB0aGF0IGFyZSBkZWFkLiBJZiBpdCBkb2VzLCB0aGVuIGl0IHJlc2V0
cyBpdHNlbGYsCiAgICAgLy8gZWl0aGVyIGVudGlyZWx5IG9yIGp1c3QgZW5vdWdoIHRvIGVuc3Vy
ZSB0aGF0IHRob3NlIGRlYWQgcG9pbnRlcnMgZG9uJ3QgZ2V0IHVzZWQgYW55bW9yZS4KICAgICB2
b2lkIHZpc2l0V2Vha1JlZmVyZW5jZXMoY29uc3QgQ29uY3VycmVudEpTTG9ja2VyQmFzZSYsIENv
ZGVCbG9jayopOworCisgICAgLy8gQ29tcHV0ZXMgdGhlIG5vbi1HQyBtZW1vcnkgb3duZWQgYnkg
dGhpcyBvYmplY3QgaW4gYnl0ZXMsIHJlY3Vyc2l2ZWx5IHJlcXVlc3RpbmcgdGhlIG5vbi1HQyBt
ZW1vcnkgc2l6ZSBvZiBvd25lZCBvYmplY3RzLgorICAgIHNpemVfdCBleHRyYU1lbW9yeUluQnl0
ZXMoKTsKICAgICAKICAgICAvLyBUaGlzIHJldHVybnMgdHJ1ZSBpZiBpdCBoYXMgbWFya2VkIGV2
ZXJ5dGhpbmcgdGhhdCBpdCB3aWxsIGV2ZXIgbWFyay4KICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBW
aXNpdG9yPiBib29sIHByb3BhZ2F0ZVRyYW5zaXRpb25zKFZpc2l0b3ImKTsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427179</attachid>
            <date>2021-04-27 12:04:46 -0700</date>
            <delta_ts>2021-04-27 12:49:53 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-225113-20210427150445.patch</filename>
            <type>text/plain</type>
            <size>7591</size>
            <attacher name="Keith Miller">keith_miller</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1
YzE4OTliNmQyM2RjYzFhODA0YzczYmMyODdlZjZkZjkwNTkxOGQxLi4zNDE3OWQwOTI2ODFlOTU4
NjgwYTIxMzhjZjNkOTZmNDA5ZTg0N2VjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyMyBAQAorMjAyMS0wNC0yNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl
LmNvbT4KKworICAgICAgICBTdHJ1Y3R1cmVTdHViSW5mbyBhbmQgUG9seW1vcnBoaWNBY2Nlc3Mg
c2hvdWxkIGFjY291bnQgZm9yIHRoZWlyIG5vbi1HQyBtZW1vcnkKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTExMworCisgICAgICAgIFJldmlld2Vk
IGJ5IE1hcmsgTGFtLgorCisgICAgICAgIFdlIGRvbid0IHBhc3MgdGhlIENvbmN1cnJlbnRKU0xv
Y2tlciB0byB0aGUgaGVscGVyIG1ldGhvZHMgaGVyZSBzaW5jZSB0aGUKKyAgICAgICAgREVDTEFS
RV9WSVNJVF9BR0dSRUdBVEUgbWFjcm8gZG9lcyBub3QgYWxsb3cgZm9yIGV4dHJhIHBhcmFtZXRl
cnMgdG8gYmUgcGFzc2VkLgorICAgICAgICBJIGZpbGVkIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjUxMTQgdG8gdHJhY2sgdGhhdC4KKworICAgICAgICAqIGJ5dGVj
b2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6SklURGF0YTo6c2l6
ZSBjb25zdCk6CisgICAgICAgICogYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwOgorICAg
ICAgICAoSlNDOjpQb2x5bW9ycGhpY0FjY2Vzczo6ZXh0cmFNZW1vcnlJbkJ5dGVzIGNvbnN0KToK
KyAgICAgICAgKiBieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oOgorICAgICAgICAqIGJ5dGVj
b2RlL1N0cnVjdHVyZVN0dWJJbmZvLmNwcDoKKyAgICAgICAgKEpTQzo6U3RydWN0dXJlU3R1Yklu
Zm86OmV4dHJhTWVtb3J5SW5CeXRlcyk6CisgICAgICAgICogYnl0ZWNvZGUvU3RydWN0dXJlU3R1
YkluZm8uaDoKKwogMjAyMS0wNC0yNiAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl
LmNvbT4KIAogICAgICAgICBVbmxpbmtlZENvZGVCbG9jayBzaG91bGQgaGF2ZSBiZXR0ZXIgYWNj
b3VudGluZyBmb3IgZXh0cmEgbWVtb3J5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k
ZS9Db2RlQmxvY2suY3BwCmluZGV4IDgyNTE1YTZlZGQwNjM1N2ZmMzBlYmJhODVmOTM2ZTk2NThi
OGY1YzMuLmI0NjUyNWYwMDRjZWIyMzgwYTUxZTI3MTc1OGQ4N2Q1NTVmYmNkNDggMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCisrKyBiL1Nv
dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCkBAIC0xMDM0LDYgKzEw
MzQsOCBAQCBzaXplX3QgQ29kZUJsb2NrOjpKSVREYXRhOjpzaXplKGNvbnN0IENvbmN1cnJlbnRK
U0xvY2tlciYpIGNvbnN0CiB7CiAgICAgc2l6ZV90IHNpemUgPSBzaXplb2YoSklURGF0YSk7CiAg
ICAgc2l6ZSArPSBtX3N0dWJJbmZvcy5lc3RpbWF0ZWRBbGxvY2F0aW9uU2l6ZUluQnl0ZXMoKTsK
KyAgICBmb3IgKFN0cnVjdHVyZVN0dWJJbmZvKiBzdHViIDogbV9zdHViSW5mb3MpCisgICAgICAg
IHNpemUgKz0gc3R1Yi0+ZXh0cmFNZW1vcnlJbkJ5dGVzKCk7CiAgICAgc2l6ZSArPSBtX2FkZElD
cy5lc3RpbWF0ZWRBbGxvY2F0aW9uU2l6ZUluQnl0ZXMoKTsKICAgICBzaXplICs9IG1fbXVsSUNz
LmVzdGltYXRlZEFsbG9jYXRpb25TaXplSW5CeXRlcygpOwogICAgIHNpemUgKz0gbV9uZWdJQ3Mu
ZXN0aW1hdGVkQWxsb2NhdGlvblNpemVJbkJ5dGVzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2
YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwIGIvU291cmNlL0phdmFT
Y3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNjZXNzLmNwcAppbmRleCA2ZGNjMjk1OWFk
MDEzYzA4NmJiN2FlYmM0ZGJlM2Q3ZWNiMWZjMDc5Li4xMmRmODY2OTBlNGIzZWYzZmE2ZDc1Zjg5
MzQ4MDljOWIzZmY1MTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv
ZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl
Y29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAKQEAgLTM3Nyw2ICszNzcsMjAgQEAgdm9pZCBQb2x5
bW9ycGhpY0FjY2Vzczo6dmlzaXRBZ2dyZWdhdGVJbXBsKFZpc2l0b3ImIHZpc2l0b3IpCiAKIERF
RklORV9WSVNJVF9BR0dSRUdBVEUoUG9seW1vcnBoaWNBY2Nlc3MpOwogCitzaXplX3QgUG9seW1v
cnBoaWNBY2Nlc3M6OmV4dHJhTWVtb3J5SW5CeXRlcygpIGNvbnN0Cit7CisgICAgc2l6ZV90IHNp
emUgPSAwOworICAgIHNpemUgKz0gbV9saXN0LnNpemVJbkJ5dGVzKCk7CisgICAgLy8gRklYTUU6
IEFjY291bnQgZm9yIHRoZSBzaXplIG9mIHRoZSB2YXJpb3VzIGFjY2VzcyBjYXNlcy4KKyAgICBz
aXplICs9IG1fbGlzdC5zaXplKCkgKiBzaXplb2YoQWNjZXNzQ2FzZSk7CisgICAgaWYgKG1fc3R1
YlJvdXRpbmUpCisgICAgICAgIHNpemUgKz0gc2l6ZW9mKEpJVFN0dWJSb3V0aW5lKSArIG1fc3R1
YlJvdXRpbmUtPmNvZGUoKS5zaXplKCk7CisgICAgaWYgKG1fd2F0Y2hwb2ludHMpCisgICAgICAg
IHNpemUgKz0gc2l6ZW9mKFdhdGNocG9pbnRzT25TdHJ1Y3R1cmVTdHViSW5mbykgKyBtX3dhdGNo
cG9pbnRzLT5leHRyYU1lbW9yeUluQnl0ZXMoKTsKKyAgICBzaXplICs9IG1fd2Vha1JlZmVyZW5j
ZXMuYnl0ZVNpemUoKTsKKyAgICByZXR1cm4gc2l6ZTsKK30KKwogdm9pZCBQb2x5bW9ycGhpY0Fj
Y2Vzczo6ZHVtcChQcmludFN0cmVhbSYgb3V0KSBjb25zdAogewogICAgIG91dC5wcmludChSYXdQ
b2ludGVyKHRoaXMpLCAiOlsiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i
eXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj
b2RlL1BvbHltb3JwaGljQWNjZXNzLmgKaW5kZXggMjkyMDMyNmRjYzkxNTQ3NGIzZjFlZWI3Zjcy
NWU2YWIzNGFlY2I0MS4uODEwNTdjNmUwNzhkNTYzZDExZjU4NmYxYTcwMjE1ZjQxOGUxNDRiZiAx
MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNj
ZXNzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljQWNj
ZXNzLmgKQEAgLTE1Nyw2ICsxNTcsOCBAQCBwdWJsaWM6CiAKICAgICAvLyBJZiB0aGlzIHJldHVy
bnMgZmFsc2UgdGhlbiB3ZSBhcmUgcmVxdWVzdGluZyBhIHJlc2V0IG9mIHRoZSBvd25pbmcgU3Ry
dWN0dXJlU3R1YkluZm8uCiAgICAgYm9vbCB2aXNpdFdlYWsoVk0mKSBjb25zdDsKKworICAgIHNp
emVfdCBleHRyYU1lbW9yeUluQnl0ZXMoKSBjb25zdDsKICAgICAKICAgICAvLyBUaGlzIHJldHVy
bnMgdHJ1ZSBpZiBpdCBoYXMgbWFya2VkIGV2ZXJ5dGhpbmcgaXQgd2lsbCBldmVyIG1hcmtlZC4g
VGhpcyBjYW4gYmUgdXNlZCBhcyBhbgogICAgIC8vIG9wdGltaXphdGlvbiB0byB0aGVuIGF2b2lk
IGNhbGxpbmcgdGhpcyBtZXRob2QgYWdhaW4gZHVyaW5nIHRoZSBmaXhwb2ludC4KZGlmZiAtLWdp
dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVTdHViQ2xlYXJpbmdX
YXRjaHBvaW50LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVT
dHViQ2xlYXJpbmdXYXRjaHBvaW50LmNwcAppbmRleCA0Njc4NDZjODU0NDgwOWMwMWM0ODY4NTM4
MjlhOWIwN2U4YzUxNGQ0Li4yYjUwYzc0MzI1NjU2MWE2NjExMzBlZGVkMzM4NWI0OTUxMGY3YzZm
IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1
YkNsZWFyaW5nV2F0Y2hwb2ludC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj
b2RlL1N0cnVjdHVyZVN0dWJDbGVhcmluZ1dhdGNocG9pbnQuY3BwCkBAIC0xMDYsNiArMTA2LDEx
IEBAIFdhdGNocG9pbnQqIFdhdGNocG9pbnRzT25TdHJ1Y3R1cmVTdHViSW5mbzo6ZW5zdXJlUmVm
ZXJlbmNlQW5kQWRkV2F0Y2hwb2ludCgKICAgICByZXR1cm4gJldURjo6Z2V0PFN0cnVjdHVyZVRy
YW5zaXRpb25TdHJ1Y3R1cmVTdHViQ2xlYXJpbmdXYXRjaHBvaW50Pihob2xkZXJSZWYtPmFkZFdh
dGNocG9pbnQoT2JqZWN0UHJvcGVydHlDb25kaXRpb24oKSkpOwogfQogCitzaXplX3QgV2F0Y2hw
b2ludHNPblN0cnVjdHVyZVN0dWJJbmZvOjpleHRyYU1lbW9yeUluQnl0ZXMoKSBjb25zdAorewor
ICAgIHJldHVybiBtX3dhdGNocG9pbnRzLmVzdGltYXRlZEFsbG9jYXRpb25TaXplSW5CeXRlcygp
OworfQorCiB2b2lkIEFkYXB0aXZlVmFsdWVTdHJ1Y3R1cmVTdHViQ2xlYXJpbmdXYXRjaHBvaW50
OjpoYW5kbGVGaXJlKFZNJiwgY29uc3QgRmlyZURldGFpbCYpCiB7CiAgICAgaWYgKCFtX2hvbGRl
ci0+aXNWYWxpZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl
L1N0cnVjdHVyZVN0dWJDbGVhcmluZ1dhdGNocG9pbnQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y
ZS9ieXRlY29kZS9TdHJ1Y3R1cmVTdHViQ2xlYXJpbmdXYXRjaHBvaW50LmgKaW5kZXggMjc1NGIz
MWVlMTZiMzg4Y2YxNzE1OWEzNjY2ZTBiYmU3NTAyY2M3Yi4uMmExZDhlMjc5Yjg0Y2JkODI5YTQ1
MDVkYWM4ZGM2NjhiNDllZjE0MSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5
dGVjb2RlL1N0cnVjdHVyZVN0dWJDbGVhcmluZ1dhdGNocG9pbnQuaAorKysgYi9Tb3VyY2UvSmF2
YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkNsZWFyaW5nV2F0Y2hwb2ludC5oCkBA
IC0xMDQsMTMgKzEwNCwxNSBAQCBwdWJsaWM6CiAgICAgU3RydWN0dXJlU3R1YkluZm8qIHN0dWJJ
bmZvKCkgY29uc3QgeyByZXR1cm4gbV9zdHViSW5mbzsgfQogCiAgICAgYm9vbCBpc1ZhbGlkKCkg
Y29uc3Q7CisKKyAgICBzaXplX3QgZXh0cmFNZW1vcnlJbkJ5dGVzKCkgY29uc3Q7CiAgICAgCiBw
cml2YXRlOgogICAgIENvZGVCbG9jayogbV9jb2RlQmxvY2s7CiAgICAgU3RydWN0dXJlU3R1Yklu
Zm8qIG1fc3R1YkluZm87CiAgICAgLy8gRklYTUU6IHVzZSBsZXNzIG1lbW9yeSBmb3IgdGhlIGVu
dHJpZXMgaW4gdGhpcyBCYWc6CiAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIwMjM4MAotICAgIEJhZzxXVEY6OlZhcmlhbnQ8U3RydWN0dXJlVHJhbnNpdGlv
blN0cnVjdHVyZVN0dWJDbGVhcmluZ1dhdGNocG9pbnQsIEFkYXB0aXZlVmFsdWVTdHJ1Y3R1cmVT
dHViQ2xlYXJpbmdXYXRjaHBvaW50Pj4gbV93YXRjaHBvaW50czsKKyAgICBCYWc8Tm9kZT4gbV93
YXRjaHBvaW50czsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIEpTQwpkaWZmIC0tZ2l0IGEvU291cmNl
L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmNwcCBiL1NvdXJjZS9K
YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVTdHViSW5mby5jcHAKaW5kZXggYWZkODM5
YmViNDE2YjliYWRkNjY4ZGRiYWQ3NTEzNmQwYTBkZDcxOS4uMDVlNjk1MTc0YjlkZThkZDk5Mzc5
ZmY5MTBjMDEyZmM3ZTI5YjFiNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5
dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv
Ynl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uY3BwCkBAIC0zNTUsNiArMzU1LDE5IEBAIHZvaWQg
U3RydWN0dXJlU3R1YkluZm86OnZpc2l0V2Vha1JlZmVyZW5jZXMoY29uc3QgQ29uY3VycmVudEpT
TG9ja2VyQmFzZSYgbG9ja2VyCiAgICAgcmVzZXRCeUdDID0gdHJ1ZTsKIH0KIAorc2l6ZV90IFN0
cnVjdHVyZVN0dWJJbmZvOjpleHRyYU1lbW9yeUluQnl0ZXMoKQoreworICAgIHNpemVfdCBleHRy
YU1lbW9yeSA9IDA7CisgICAgLy8gQ2FjaGVhYmxlIElkZW50aWZpZXIgbmV2ZXIgb3ducyBleHRy
YSBtZW1vcnkgYmVjYXVzZSBVSURzIGFyZSBvd25lZCBieSB0aGUgdW5pcXVlIHN0cmluZyB0YWJs
ZS4KKyAgICB7CisgICAgICAgIGF1dG8gbG9ja2VyID0gaG9sZExvY2sobV9idWZmZXJlZFN0cnVj
dHVyZXNMb2NrKTsKKyAgICAgICAgZXh0cmFNZW1vcnkgKz0gbV9idWZmZXJlZFN0cnVjdHVyZXMu
Y2FwYWNpdHkoKSAqIHNpemVvZihCdWZmZXJlZFN0cnVjdHVyZSk7CisgICAgfQorICAgIGlmIChj
YWNoZVR5cGUoKSA9PSBDYWNoZVR5cGU6OlN0dWIpCisgICAgICAgIGV4dHJhTWVtb3J5ICs9IHUu
c3R1Yi0+ZXh0cmFNZW1vcnlJbkJ5dGVzKCk7CisgICAgcmV0dXJuIGV4dHJhTWVtb3J5OworfQor
CiB0ZW1wbGF0ZTx0eXBlbmFtZSBWaXNpdG9yPgogYm9vbCBTdHJ1Y3R1cmVTdHViSW5mbzo6cHJv
cGFnYXRlVHJhbnNpdGlvbnMoVmlzaXRvciYgdmlzaXRvcikKIHsKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVTdHViSW5mby5oIGIvU291cmNlL0ph
dmFTY3JpcHRDb3JlL2J5dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmgKaW5kZXggMjQ2MTliYWQ3
NTI2MGRjOTJjNGE0ZDg5OTc2NmYyM2M5OGNmYzY2NS4uMmNhNjk2N2M3NzQ2MDJkYmM5MjZiY2Y2
YWJkNDNlM2NlNTFkNmQxYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj
b2RlL1N0cnVjdHVyZVN0dWJJbmZvLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj
b2RlL1N0cnVjdHVyZVN0dWJJbmZvLmgKQEAgLTk4LDYgKzk4LDkgQEAgcHVibGljOgogICAgIC8v
IENoZWNrIGlmIHRoZSBzdHViIGhhcyB3ZWFrIHJlZmVyZW5jZXMgdGhhdCBhcmUgZGVhZC4gSWYg
aXQgZG9lcywgdGhlbiBpdCByZXNldHMgaXRzZWxmLAogICAgIC8vIGVpdGhlciBlbnRpcmVseSBv
ciBqdXN0IGVub3VnaCB0byBlbnN1cmUgdGhhdCB0aG9zZSBkZWFkIHBvaW50ZXJzIGRvbid0IGdl
dCB1c2VkIGFueW1vcmUuCiAgICAgdm9pZCB2aXNpdFdlYWtSZWZlcmVuY2VzKGNvbnN0IENvbmN1
cnJlbnRKU0xvY2tlckJhc2UmLCBDb2RlQmxvY2sqKTsKKworICAgIC8vIENvbXB1dGVzIHRoZSBu
b24tR0MgbWVtb3J5IG93bmVkIGJ5IHRoaXMgb2JqZWN0IGluIGJ5dGVzLCByZWN1cnNpdmVseSBy
ZXF1ZXN0aW5nIHRoZSBub24tR0MgbWVtb3J5IHNpemUgb2Ygb3duZWQgb2JqZWN0cy4KKyAgICBz
aXplX3QgZXh0cmFNZW1vcnlJbkJ5dGVzKCk7CiAgICAgCiAgICAgLy8gVGhpcyByZXR1cm5zIHRy
dWUgaWYgaXQgaGFzIG1hcmtlZCBldmVyeXRoaW5nIHRoYXQgaXQgd2lsbCBldmVyIG1hcmsuCiAg
ICAgdGVtcGxhdGU8dHlwZW5hbWUgVmlzaXRvcj4gYm9vbCBwcm9wYWdhdGVUcmFuc2l0aW9ucyhW
aXNpdG9yJik7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>