<?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>199695</bug_id>
          
          <creation_ts>2019-07-10 18:17:39 -0700</creation_ts>
          <short_desc>[WHLSL] Optional&lt;UniqueRef&lt;T&gt;&gt; -&gt; std::unique_ptr in Return/IfStatement/ForLoop</short_desc>
          <delta_ts>2019-07-10 19:10:26 -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>WebGPU</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>
          <dependson>199389</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Robin Morisset">rmorisset</reporter>
          <assigned_to name="Robin Morisset">rmorisset</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>dino</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1551925</commentid>
    <comment_count>0</comment_count>
    <who name="Robin Morisset">rmorisset</who>
    <bug_when>2019-07-10 18:17:39 -0700</bug_when>
    <thetext>Same reasoning as https://bugs.webkit.org/show_bug.cgi?id=199389
Saves 8 bytes per If/Return, 16 bytes per For, and the patch is trivial.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551931</commentid>
    <comment_count>1</comment_count>
      <attachid>373886</attachid>
    <who name="Robin Morisset">rmorisset</who>
    <bug_when>2019-07-10 18:21:05 -0700</bug_when>
    <thetext>Created attachment 373886
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551933</commentid>
    <comment_count>2</comment_count>
      <attachid>373887</attachid>
    <who name="Robin Morisset">rmorisset</who>
    <bug_when>2019-07-10 18:22:56 -0700</bug_when>
    <thetext>Created attachment 373887
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551950</commentid>
    <comment_count>3</comment_count>
      <attachid>373887</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-07-10 19:09:58 -0700</bug_when>
    <thetext>Comment on attachment 373887
Patch

Clearing flags on attachment: 373887

Committed r247341: &lt;https://trac.webkit.org/changeset/247341&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551951</commentid>
    <comment_count>4</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-07-10 19:09:59 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551952</commentid>
    <comment_count>5</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2019-07-10 19:10:26 -0700</bug_when>
    <thetext>&lt;rdar://problem/52927323&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373886</attachid>
            <date>2019-07-10 18:21:05 -0700</date>
            <delta_ts>2019-07-10 18:21:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-199695-20190710182104.patch</filename>
            <type>text/plain</type>
            <size>7356</size>
            <attacher name="Robin Morisset">rmorisset</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xGb3JMb29wLmggYi9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xGb3JMb29wLmgKaW5kZXggZDc4MjM5NzMzYWJi
NTkzZDRhOGUzZmQ2NDRjNjlhNzRhMTc1M2RmMC4uZjQ1Yjk3NDdhMmZkYTI4MGUyMDQwMjVlMjg5
NTZjZGMwZjNkMDg4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUv
V0hMU0wvQVNUL1dITFNMRm9yTG9vcC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi
Z3B1L1dITFNML0FTVC9XSExTTEZvckxvb3AuaApAQCAtNDQsNyArNDQsNyBAQCBuYW1lc3BhY2Ug
QVNUIHsKIAogY2xhc3MgRm9yTG9vcCA6IHB1YmxpYyBTdGF0ZW1lbnQgewogcHVibGljOgotICAg
IEZvckxvb3AoQ29kZUxvY2F0aW9uIGxvY2F0aW9uLCBWYXJpYW50PFVuaXF1ZVJlZjxTdGF0ZW1l
bnQ+LCBVbmlxdWVSZWY8RXhwcmVzc2lvbj4+JiYgaW5pdGlhbGl6YXRpb24sIE9wdGlvbmFsPFVu
aXF1ZVJlZjxFeHByZXNzaW9uPj4mJiBjb25kaXRpb24sIE9wdGlvbmFsPFVuaXF1ZVJlZjxFeHBy
ZXNzaW9uPj4mJiBpbmNyZW1lbnQsIFVuaXF1ZVJlZjxTdGF0ZW1lbnQ+JiYgYm9keSkKKyAgICBG
b3JMb29wKENvZGVMb2NhdGlvbiBsb2NhdGlvbiwgVmFyaWFudDxVbmlxdWVSZWY8U3RhdGVtZW50
PiwgVW5pcXVlUmVmPEV4cHJlc3Npb24+PiYmIGluaXRpYWxpemF0aW9uLCBzdGQ6OnVuaXF1ZV9w
dHI8RXhwcmVzc2lvbj4mJiBjb25kaXRpb24sIHN0ZDo6dW5pcXVlX3B0cjxFeHByZXNzaW9uPiYm
IGluY3JlbWVudCwgVW5pcXVlUmVmPFN0YXRlbWVudD4mJiBib2R5KQogICAgICAgICA6IFN0YXRl
bWVudChsb2NhdGlvbikKICAgICAgICAgLCBtX2luaXRpYWxpemF0aW9uKFdURk1vdmUoaW5pdGlh
bGl6YXRpb24pKQogICAgICAgICAsIG1fY29uZGl0aW9uKFdURk1vdmUoY29uZGl0aW9uKSkKQEAg
LTYzLDE0ICs2MywxNCBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0Zvckxvb3AoKSBjb25zdCBvdmVy
cmlkZSB7IHJldHVybiB0cnVlOyB9CiAKICAgICBWYXJpYW50PFVuaXF1ZVJlZjxTdGF0ZW1lbnQ+
LCBVbmlxdWVSZWY8RXhwcmVzc2lvbj4+JiBpbml0aWFsaXphdGlvbigpIHsgcmV0dXJuIG1faW5p
dGlhbGl6YXRpb247IH0KLSAgICBFeHByZXNzaW9uKiBjb25kaXRpb24oKSB7IHJldHVybiBtX2Nv
bmRpdGlvbiA/ICYqbV9jb25kaXRpb24gOiBudWxscHRyOyB9Ci0gICAgRXhwcmVzc2lvbiogaW5j
cmVtZW50KCkgeyByZXR1cm4gbV9pbmNyZW1lbnQgPyAmKm1faW5jcmVtZW50IDogbnVsbHB0cjsg
fQorICAgIEV4cHJlc3Npb24qIGNvbmRpdGlvbigpIHsgcmV0dXJuIG1fY29uZGl0aW9uLmdldCgp
OyB9CisgICAgRXhwcmVzc2lvbiogaW5jcmVtZW50KCkgeyByZXR1cm4gbV9pbmNyZW1lbnQuZ2V0
KCk7IH0KICAgICBTdGF0ZW1lbnQmIGJvZHkoKSB7IHJldHVybiBtX2JvZHk7IH0KIAogcHJpdmF0
ZToKICAgICBWYXJpYW50PFVuaXF1ZVJlZjxTdGF0ZW1lbnQ+LCBVbmlxdWVSZWY8RXhwcmVzc2lv
bj4+IG1faW5pdGlhbGl6YXRpb247Ci0gICAgT3B0aW9uYWw8VW5pcXVlUmVmPEV4cHJlc3Npb24+
PiBtX2NvbmRpdGlvbjsKLSAgICBPcHRpb25hbDxVbmlxdWVSZWY8RXhwcmVzc2lvbj4+IG1faW5j
cmVtZW50OworICAgIHN0ZDo6dW5pcXVlX3B0cjxFeHByZXNzaW9uPiBtX2NvbmRpdGlvbjsKKyAg
ICBzdGQ6OnVuaXF1ZV9wdHI8RXhwcmVzc2lvbj4gbV9pbmNyZW1lbnQ7CiAgICAgVW5pcXVlUmVm
PFN0YXRlbWVudD4gbV9ib2R5OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k
dWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMSWZTdGF0ZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3Jl
L01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTElmU3RhdGVtZW50LmgKaW5kZXggZGY3YWIw
OWJkMWZmYjQxZjRhNDBiZDZmZDBlODM5MGM0MGJlYmNjNy4uYWI4MGM5MzA5OTNjMjgwYTdkODg4
MDhlYjMyOWYxMzIzMGU1ZThjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93
ZWJncHUvV0hMU0wvQVNUL1dITFNMSWZTdGF0ZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xJZlN0YXRlbWVudC5oCkBAIC00MSw3ICs0MSw3
IEBAIG5hbWVzcGFjZSBBU1QgewogCiBjbGFzcyBJZlN0YXRlbWVudCA6IHB1YmxpYyBTdGF0ZW1l
bnQgewogcHVibGljOgotICAgIElmU3RhdGVtZW50KENvZGVMb2NhdGlvbiBsb2NhdGlvbiwgVW5p
cXVlUmVmPEV4cHJlc3Npb24+JiYgY29uZGl0aW9uYWwsIFVuaXF1ZVJlZjxTdGF0ZW1lbnQ+JiYg
Ym9keSwgT3B0aW9uYWw8VW5pcXVlUmVmPFN0YXRlbWVudD4+JiYgZWxzZUJvZHkpCisgICAgSWZT
dGF0ZW1lbnQoQ29kZUxvY2F0aW9uIGxvY2F0aW9uLCBVbmlxdWVSZWY8RXhwcmVzc2lvbj4mJiBj
b25kaXRpb25hbCwgVW5pcXVlUmVmPFN0YXRlbWVudD4mJiBib2R5LCBzdGQ6OnVuaXF1ZV9wdHI8
U3RhdGVtZW50PiYmIGVsc2VCb2R5KQogICAgICAgICA6IFN0YXRlbWVudChsb2NhdGlvbikKICAg
ICAgICAgLCBtX2NvbmRpdGlvbmFsKFdURk1vdmUoY29uZGl0aW9uYWwpKQogICAgICAgICAsIG1f
Ym9keShXVEZNb3ZlKGJvZHkpKQpAQCAtNTgsMTIgKzU4LDEyIEBAIHB1YmxpYzoKIAogICAgIEV4
cHJlc3Npb24mIGNvbmRpdGlvbmFsKCkgeyByZXR1cm4gbV9jb25kaXRpb25hbDsgfQogICAgIFN0
YXRlbWVudCYgYm9keSgpIHsgcmV0dXJuIG1fYm9keTsgfQotICAgIFN0YXRlbWVudCogZWxzZUJv
ZHkoKSB7IHJldHVybiBtX2Vsc2VCb2R5ID8gJiptX2Vsc2VCb2R5IDogbnVsbHB0cjsgfQorICAg
IFN0YXRlbWVudCogZWxzZUJvZHkoKSB7IHJldHVybiBtX2Vsc2VCb2R5LmdldCgpOyB9CiAKIHBy
aXZhdGU6CiAgICAgVW5pcXVlUmVmPEV4cHJlc3Npb24+IG1fY29uZGl0aW9uYWw7CiAgICAgVW5p
cXVlUmVmPFN0YXRlbWVudD4gbV9ib2R5OwotICAgIE9wdGlvbmFsPFVuaXF1ZVJlZjxTdGF0ZW1l
bnQ+PiBtX2Vsc2VCb2R5OworICAgIHN0ZDo6dW5pcXVlX3B0cjxTdGF0ZW1lbnQ+IG1fZWxzZUJv
ZHk7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBBU1QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTFJldHVybi5oIGIvU291cmNlL1dlYkNvcmUv
TW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMUmV0dXJuLmgKaW5kZXggZjQ2ODA4YzYwZGFm
MjIxY2ZkMDEzMGFjZDUwZGFlOTFmNTMzNjVjZC4uYTczYjRiMTAzNWY0ZjBjOTkyZTg1OGYzZmY5
NDNjZmEyYzRhNTE4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUv
V0hMU0wvQVNUL1dITFNMUmV0dXJuLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJn
cHUvV0hMU0wvQVNUL1dITFNMUmV0dXJuLmgKQEAgLTQxLDcgKzQxLDcgQEAgbmFtZXNwYWNlIEFT
VCB7CiAKIGNsYXNzIFJldHVybiA6IHB1YmxpYyBTdGF0ZW1lbnQgewogcHVibGljOgotICAgIFJl
dHVybihDb2RlTG9jYXRpb24gbG9jYXRpb24sIE9wdGlvbmFsPFVuaXF1ZVJlZjxFeHByZXNzaW9u
Pj4mJiB2YWx1ZSkKKyAgICBSZXR1cm4oQ29kZUxvY2F0aW9uIGxvY2F0aW9uLCBzdGQ6OnVuaXF1
ZV9wdHI8RXhwcmVzc2lvbj4mJiB2YWx1ZSkKICAgICAgICAgOiBTdGF0ZW1lbnQobG9jYXRpb24p
CiAgICAgICAgICwgbV92YWx1ZShXVEZNb3ZlKHZhbHVlKSkKICAgICB7CkBAIC01NCwxMyArNTQs
MTMgQEAgcHVibGljOgogCiAgICAgYm9vbCBpc1JldHVybigpIGNvbnN0IG92ZXJyaWRlIHsgcmV0
dXJuIHRydWU7IH0KIAotICAgIEV4cHJlc3Npb24qIHZhbHVlKCkgeyByZXR1cm4gbV92YWx1ZSA/
ICYqbV92YWx1ZSA6IG51bGxwdHI7IH0KKyAgICBFeHByZXNzaW9uKiB2YWx1ZSgpIHsgcmV0dXJu
IG1fdmFsdWUuZ2V0KCk7IH0KIAogICAgIEZ1bmN0aW9uRGVmaW5pdGlvbiogZnVuY3Rpb24oKSB7
IHJldHVybiBtX2Z1bmN0aW9uOyB9CiAgICAgdm9pZCBzZXRGdW5jdGlvbihGdW5jdGlvbkRlZmlu
aXRpb24qIGZ1bmN0aW9uRGVmaW5pdGlvbikgeyBtX2Z1bmN0aW9uID0gZnVuY3Rpb25EZWZpbml0
aW9uOyB9CiAKIHByaXZhdGU6Ci0gICAgT3B0aW9uYWw8VW5pcXVlUmVmPEV4cHJlc3Npb24+PiBt
X3ZhbHVlOworICAgIHN0ZDo6dW5pcXVlX3B0cjxFeHByZXNzaW9uPiBtX3ZhbHVlOwogICAgIEZ1
bmN0aW9uRGVmaW5pdGlvbiogbV9mdW5jdGlvbiB7IG51bGxwdHIgfTsKIH07CiAKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMUGFyc2VyLmNwcCBi
L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMUGFyc2VyLmNwcAppbmRl
eCA4ZjFiOTQ1ZTA2MTBkNjE4NTU2YjlhZDZlMjJmZTEzMzI2MDhhNzljLi4yMGNiOTM5MTA0YWYy
OTcxNjE4OTY4YmI1ODk1YzZiNWQ1YWY4NzM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv
TW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xQYXJzZXIuY3BwCkBAIC0xMDgwLDEwICsxMDgwLDEw
IEBAIGF1dG8gUGFyc2VyOjpwYXJzZUlmU3RhdGVtZW50KCkgLT4gRXhwZWN0ZWQ8QVNUOjpJZlN0
YXRlbWVudCwgRXJyb3I+CiAgICAgQ09OU1VNRV9UWVBFKHJpZ2h0UGFyZW50aGVzaXMsIFJpZ2h0
UGFyZW50aGVzaXMpOwogICAgIFBBUlNFKGJvZHksIFN0YXRlbWVudCk7CiAKLSAgICBPcHRpb25h
bDxVbmlxdWVSZWY8QVNUOjpTdGF0ZW1lbnQ+PiBlbHNlQm9keTsKKyAgICBzdGQ6OnVuaXF1ZV9w
dHI8QVNUOjpTdGF0ZW1lbnQ+IGVsc2VCb2R5KG51bGxwdHIpOwogICAgIGlmICh0cnlUeXBlKFRv
a2VuOjpUeXBlOjpFbHNlKSkgewogICAgICAgICBQQVJTRShwYXJzZWRFbHNlQm9keSwgU3RhdGVt
ZW50KTsKLSAgICAgICAgZWxzZUJvZHkgPSBXVEZNb3ZlKCpwYXJzZWRFbHNlQm9keSk7CisgICAg
ICAgIGVsc2VCb2R5ID0gKCpwYXJzZWRFbHNlQm9keSkubW92ZVRvVW5pcXVlUHRyKCk7CiAgICAg
fQogCiAgICAgYXV0byBlbmRPZmZzZXQgPSBtX2xleGVyLnBlZWsoKS5zdGFydE9mZnNldCgpOwpA
QCAtMTE1MCwxOSArMTE1MCwxOSBAQCBhdXRvIFBhcnNlcjo6cGFyc2VGb3JMb29wKCkgLT4gRXhw
ZWN0ZWQ8QVNUOjpGb3JMb29wLCBFcnJvcj4KICAgICBhdXRvIHBhcnNlUmVtYWluZGVyID0gWyZd
KFZhcmlhbnQ8VW5pcXVlUmVmPEFTVDo6U3RhdGVtZW50PiwgVW5pcXVlUmVmPEFTVDo6RXhwcmVz
c2lvbj4+JiYgaW5pdGlhbGl6YXRpb24pIC0+IEV4cGVjdGVkPEFTVDo6Rm9yTG9vcCwgRXJyb3I+
IHsKICAgICAgICAgQ09OU1VNRV9UWVBFKHNlbWljb2xvbiwgU2VtaWNvbG9uKTsKIAotICAgICAg
ICBPcHRpb25hbDxVbmlxdWVSZWY8QVNUOjpFeHByZXNzaW9uPj4gY29uZGl0aW9uID0gV1RGOjpu
dWxsb3B0OworICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8QVNUOjpFeHByZXNzaW9uPiBjb25kaXRp
b24obnVsbHB0cik7CiAgICAgICAgIGlmICghdHJ5VHlwZShUb2tlbjo6VHlwZTo6U2VtaWNvbG9u
KSkgewogICAgICAgICAgICAgaWYgKGF1dG8gZXhwcmVzc2lvbiA9IHBhcnNlRXhwcmVzc2lvbigp
KQotICAgICAgICAgICAgICAgIGNvbmRpdGlvbiA9IHsgV1RGTW92ZSgqZXhwcmVzc2lvbikgfTsK
KyAgICAgICAgICAgICAgICBjb25kaXRpb24gPSAoKmV4cHJlc3Npb24pLm1vdmVUb1VuaXF1ZVB0
cigpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHJldHVybiBVbmV4cGVjdGVk
PEVycm9yPihleHByZXNzaW9uLmVycm9yKCkpOwogICAgICAgICAgICAgQ09OU1VNRV9UWVBFKHNl
Y29uZFNlbWljb2xvbiwgU2VtaWNvbG9uKTsKICAgICAgICAgfQogCi0gICAgICAgIE9wdGlvbmFs
PFVuaXF1ZVJlZjxBU1Q6OkV4cHJlc3Npb24+PiBpbmNyZW1lbnQgPSBXVEY6Om51bGxvcHQ7Cisg
ICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxBU1Q6OkV4cHJlc3Npb24+IGluY3JlbWVudChudWxscHRy
KTsKICAgICAgICAgaWYgKCF0cnlUeXBlKFRva2VuOjpUeXBlOjpSaWdodFBhcmVudGhlc2lzKSkg
ewogICAgICAgICAgICAgaWYgKGF1dG8gZXhwcmVzc2lvbiA9IHBhcnNlRXhwcmVzc2lvbigpKQot
ICAgICAgICAgICAgICAgIGluY3JlbWVudCA9IHsgV1RGTW92ZSgqZXhwcmVzc2lvbikgfTsKKyAg
ICAgICAgICAgICAgICBpbmNyZW1lbnQgPSAoKmV4cHJlc3Npb24pLm1vdmVUb1VuaXF1ZVB0cigp
OwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHJldHVybiBVbmV4cGVjdGVkPEVy
cm9yPihleHByZXNzaW9uLmVycm9yKCkpOwogICAgICAgICAgICAgQ09OU1VNRV9UWVBFKHJpZ2h0
UGFyZW50aGVzaXMsIFJpZ2h0UGFyZW50aGVzaXMpOwpAQCAtMTMwOSwxMiArMTMwOSwxMiBAQCBh
dXRvIFBhcnNlcjo6cGFyc2VTdGF0ZW1lbnQoKSAtPiBFeHBlY3RlZDxVbmlxdWVSZWY8QVNUOjpT
dGF0ZW1lbnQ+LCBFcnJvcj4KICAgICBjYXNlIFRva2VuOjpUeXBlOjpSZXR1cm46IHsKICAgICAg
ICAgYXV0byByZXR1cm5Ub2tlbiA9IG1fbGV4ZXIuY29uc3VtZVRva2VuKCk7CiAgICAgICAgIGlm
IChhdXRvIHNlbWljb2xvbiA9IHRyeVR5cGUoVG9rZW46OlR5cGU6OlNlbWljb2xvbikpIHsKLSAg
ICAgICAgICAgIGF1dG8gcmV0dXJuT2JqZWN0ID0gQVNUOjpSZXR1cm4oV1RGTW92ZShyZXR1cm5U
b2tlbiksIFdURjo6bnVsbG9wdCk7CisgICAgICAgICAgICBhdXRvIHJldHVybk9iamVjdCA9IEFT
VDo6UmV0dXJuKFdURk1vdmUocmV0dXJuVG9rZW4pLCBudWxscHRyKTsKICAgICAgICAgICAgIHJl
dHVybiB7IG1ha2VVbmlxdWVSZWY8QVNUOjpSZXR1cm4+KFdURk1vdmUocmV0dXJuT2JqZWN0KSkg
fTsKICAgICAgICAgfQogICAgICAgICBQQVJTRShleHByZXNzaW9uLCBFeHByZXNzaW9uKTsKICAg
ICAgICAgQ09OU1VNRV9UWVBFKGZpbmFsU2VtaWNvbG9uLCBTZW1pY29sb24pOwotICAgICAgICBh
dXRvIHJldHVybk9iamVjdCA9IEFTVDo6UmV0dXJuKFdURk1vdmUocmV0dXJuVG9rZW4pLCB7IFdU
Rk1vdmUoKmV4cHJlc3Npb24pIH0pOworICAgICAgICBhdXRvIHJldHVybk9iamVjdCA9IEFTVDo6
UmV0dXJuKFdURk1vdmUocmV0dXJuVG9rZW4pLCAoKmV4cHJlc3Npb24pLm1vdmVUb1VuaXF1ZVB0
cigpKTsKICAgICAgICAgcmV0dXJuIHsgbWFrZVVuaXF1ZVJlZjxBU1Q6OlJldHVybj4oV1RGTW92
ZShyZXR1cm5PYmplY3QpKSB9OwogICAgIH0KICAgICBjYXNlIFRva2VuOjpUeXBlOjpDb25zdGFu
dDoK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373887</attachid>
            <date>2019-07-10 18:22:56 -0700</date>
            <delta_ts>2019-07-10 19:09:58 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>patch199695</filename>
            <type>text/plain</type>
            <size>8501</size>
            <attacher name="Robin Morisset">rmorisset</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZwppbmRleCBjYzc0ZGNjODFiNS4uNDEwMzRlYTA5NWMgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyOSBAQAorMjAxOS0wNy0xMCAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu
Y29tPgorCisgICAgICAgIFtXSExTTF0gT3B0aW9uYWw8VW5pcXVlUmVmPFQ+PiAtPiBzdGQ6OnVu
aXF1ZV9wdHIgaW4gUmV0dXJuL0lmU3RhdGVtZW50L0Zvckxvb3AKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTY5NQorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRyaXZpYWwgcGF0Y2ggdGhhdCBzYXZlcyA4
IGJ5dGVzIHBlciBSZXR1cm4vSWYsIGFuZCAxNiBieXRlcyBwZXIgRm9yIGxvb3AuCisKKyAgICAg
ICAgTm8gbmV3IHRlc3RzIGFzIHRoZXJlIGlzIG5vIGludGVuZGVkIGZ1bmN0aW9uYWwgY2hhbmdl
LgorCisgICAgICAgICogTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMRm9yTG9vcC5oOgor
ICAgICAgICAoV2ViQ29yZTo6V0hMU0w6OkFTVDo6Rm9yTG9vcDo6Rm9yTG9vcCk6CisgICAgICAg
IChXZWJDb3JlOjpXSExTTDo6QVNUOjpGb3JMb29wOjpjb25kaXRpb24pOgorICAgICAgICAoV2Vi
Q29yZTo6V0hMU0w6OkFTVDo6Rm9yTG9vcDo6aW5jcmVtZW50KToKKyAgICAgICAgKiBNb2R1bGVz
L3dlYmdwdS9XSExTTC9BU1QvV0hMU0xJZlN0YXRlbWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6
V0hMU0w6OkFTVDo6SWZTdGF0ZW1lbnQ6OklmU3RhdGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6
OldITFNMOjpBU1Q6OklmU3RhdGVtZW50OjplbHNlQm9keSk6CisgICAgICAgICogTW9kdWxlcy93
ZWJncHUvV0hMU0wvQVNUL1dITFNMUmV0dXJuLmg6CisgICAgICAgIChXZWJDb3JlOjpXSExTTDo6
QVNUOjpSZXR1cm46OlJldHVybik6CisgICAgICAgIChXZWJDb3JlOjpXSExTTDo6QVNUOjpSZXR1
cm46OnZhbHVlKToKKyAgICAgICAgKiBNb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTFBhcnNlci5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpXSExTTDo6UGFyc2VyOjpwYXJzZUlmU3RhdGVtZW50KToK
KyAgICAgICAgKFdlYkNvcmU6OldITFNMOjpQYXJzZXI6OnBhcnNlRm9yTG9vcCk6CisgICAgICAg
IChXZWJDb3JlOjpXSExTTDo6UGFyc2VyOjpwYXJzZVN0YXRlbWVudCk6CisKIDIwMTktMDctMTAg
IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBTdG9wIHVzaW5nIEdl
bmVyaWNUYXNrUXVldWUgZnJvbSBtdWx0aXBsZSB0aHJlYWRzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xGb3JMb29wLmggYi9Tb3VyY2Uv
V2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xGb3JMb29wLmgKaW5kZXggZDc4
MjM5NzMzYWIuLmY0NWI5NzQ3YTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz
L3dlYmdwdS9XSExTTC9BU1QvV0hMU0xGb3JMb29wLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k
dWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMRm9yTG9vcC5oCkBAIC00NCw3ICs0NCw3IEBAIG5h
bWVzcGFjZSBBU1QgewogCiBjbGFzcyBGb3JMb29wIDogcHVibGljIFN0YXRlbWVudCB7CiBwdWJs
aWM6Ci0gICAgRm9yTG9vcChDb2RlTG9jYXRpb24gbG9jYXRpb24sIFZhcmlhbnQ8VW5pcXVlUmVm
PFN0YXRlbWVudD4sIFVuaXF1ZVJlZjxFeHByZXNzaW9uPj4mJiBpbml0aWFsaXphdGlvbiwgT3B0
aW9uYWw8VW5pcXVlUmVmPEV4cHJlc3Npb24+PiYmIGNvbmRpdGlvbiwgT3B0aW9uYWw8VW5pcXVl
UmVmPEV4cHJlc3Npb24+PiYmIGluY3JlbWVudCwgVW5pcXVlUmVmPFN0YXRlbWVudD4mJiBib2R5
KQorICAgIEZvckxvb3AoQ29kZUxvY2F0aW9uIGxvY2F0aW9uLCBWYXJpYW50PFVuaXF1ZVJlZjxT
dGF0ZW1lbnQ+LCBVbmlxdWVSZWY8RXhwcmVzc2lvbj4+JiYgaW5pdGlhbGl6YXRpb24sIHN0ZDo6
dW5pcXVlX3B0cjxFeHByZXNzaW9uPiYmIGNvbmRpdGlvbiwgc3RkOjp1bmlxdWVfcHRyPEV4cHJl
c3Npb24+JiYgaW5jcmVtZW50LCBVbmlxdWVSZWY8U3RhdGVtZW50PiYmIGJvZHkpCiAgICAgICAg
IDogU3RhdGVtZW50KGxvY2F0aW9uKQogICAgICAgICAsIG1faW5pdGlhbGl6YXRpb24oV1RGTW92
ZShpbml0aWFsaXphdGlvbikpCiAgICAgICAgICwgbV9jb25kaXRpb24oV1RGTW92ZShjb25kaXRp
b24pKQpAQCAtNjMsMTQgKzYzLDE0IEBAIHB1YmxpYzoKICAgICBib29sIGlzRm9yTG9vcCgpIGNv
bnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0KIAogICAgIFZhcmlhbnQ8VW5pcXVlUmVmPFN0
YXRlbWVudD4sIFVuaXF1ZVJlZjxFeHByZXNzaW9uPj4mIGluaXRpYWxpemF0aW9uKCkgeyByZXR1
cm4gbV9pbml0aWFsaXphdGlvbjsgfQotICAgIEV4cHJlc3Npb24qIGNvbmRpdGlvbigpIHsgcmV0
dXJuIG1fY29uZGl0aW9uID8gJiptX2NvbmRpdGlvbiA6IG51bGxwdHI7IH0KLSAgICBFeHByZXNz
aW9uKiBpbmNyZW1lbnQoKSB7IHJldHVybiBtX2luY3JlbWVudCA/ICYqbV9pbmNyZW1lbnQgOiBu
dWxscHRyOyB9CisgICAgRXhwcmVzc2lvbiogY29uZGl0aW9uKCkgeyByZXR1cm4gbV9jb25kaXRp
b24uZ2V0KCk7IH0KKyAgICBFeHByZXNzaW9uKiBpbmNyZW1lbnQoKSB7IHJldHVybiBtX2luY3Jl
bWVudC5nZXQoKTsgfQogICAgIFN0YXRlbWVudCYgYm9keSgpIHsgcmV0dXJuIG1fYm9keTsgfQog
CiBwcml2YXRlOgogICAgIFZhcmlhbnQ8VW5pcXVlUmVmPFN0YXRlbWVudD4sIFVuaXF1ZVJlZjxF
eHByZXNzaW9uPj4gbV9pbml0aWFsaXphdGlvbjsKLSAgICBPcHRpb25hbDxVbmlxdWVSZWY8RXhw
cmVzc2lvbj4+IG1fY29uZGl0aW9uOwotICAgIE9wdGlvbmFsPFVuaXF1ZVJlZjxFeHByZXNzaW9u
Pj4gbV9pbmNyZW1lbnQ7CisgICAgc3RkOjp1bmlxdWVfcHRyPEV4cHJlc3Npb24+IG1fY29uZGl0
aW9uOworICAgIHN0ZDo6dW5pcXVlX3B0cjxFeHByZXNzaW9uPiBtX2luY3JlbWVudDsKICAgICBV
bmlxdWVSZWY8U3RhdGVtZW50PiBtX2JvZHk7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xJZlN0YXRlbWVudC5oIGIvU291cmNl
L1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMSWZTdGF0ZW1lbnQuaAppbmRl
eCBkZjdhYjA5YmQxZi4uYWI4MGM5MzA5OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v
ZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTElmU3RhdGVtZW50LmgKKysrIGIvU291cmNlL1dl
YkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvQVNUL1dITFNMSWZTdGF0ZW1lbnQuaApAQCAtNDEs
NyArNDEsNyBAQCBuYW1lc3BhY2UgQVNUIHsKIAogY2xhc3MgSWZTdGF0ZW1lbnQgOiBwdWJsaWMg
U3RhdGVtZW50IHsKIHB1YmxpYzoKLSAgICBJZlN0YXRlbWVudChDb2RlTG9jYXRpb24gbG9jYXRp
b24sIFVuaXF1ZVJlZjxFeHByZXNzaW9uPiYmIGNvbmRpdGlvbmFsLCBVbmlxdWVSZWY8U3RhdGVt
ZW50PiYmIGJvZHksIE9wdGlvbmFsPFVuaXF1ZVJlZjxTdGF0ZW1lbnQ+PiYmIGVsc2VCb2R5KQor
ICAgIElmU3RhdGVtZW50KENvZGVMb2NhdGlvbiBsb2NhdGlvbiwgVW5pcXVlUmVmPEV4cHJlc3Np
b24+JiYgY29uZGl0aW9uYWwsIFVuaXF1ZVJlZjxTdGF0ZW1lbnQ+JiYgYm9keSwgc3RkOjp1bmlx
dWVfcHRyPFN0YXRlbWVudD4mJiBlbHNlQm9keSkKICAgICAgICAgOiBTdGF0ZW1lbnQobG9jYXRp
b24pCiAgICAgICAgICwgbV9jb25kaXRpb25hbChXVEZNb3ZlKGNvbmRpdGlvbmFsKSkKICAgICAg
ICAgLCBtX2JvZHkoV1RGTW92ZShib2R5KSkKQEAgLTU4LDEyICs1OCwxMiBAQCBwdWJsaWM6CiAK
ICAgICBFeHByZXNzaW9uJiBjb25kaXRpb25hbCgpIHsgcmV0dXJuIG1fY29uZGl0aW9uYWw7IH0K
ICAgICBTdGF0ZW1lbnQmIGJvZHkoKSB7IHJldHVybiBtX2JvZHk7IH0KLSAgICBTdGF0ZW1lbnQq
IGVsc2VCb2R5KCkgeyByZXR1cm4gbV9lbHNlQm9keSA/ICYqbV9lbHNlQm9keSA6IG51bGxwdHI7
IH0KKyAgICBTdGF0ZW1lbnQqIGVsc2VCb2R5KCkgeyByZXR1cm4gbV9lbHNlQm9keS5nZXQoKTsg
fQogCiBwcml2YXRlOgogICAgIFVuaXF1ZVJlZjxFeHByZXNzaW9uPiBtX2NvbmRpdGlvbmFsOwog
ICAgIFVuaXF1ZVJlZjxTdGF0ZW1lbnQ+IG1fYm9keTsKLSAgICBPcHRpb25hbDxVbmlxdWVSZWY8
U3RhdGVtZW50Pj4gbV9lbHNlQm9keTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8U3RhdGVtZW50PiBt
X2Vsc2VCb2R5OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgQVNUCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xSZXR1cm4uaCBiL1NvdXJjZS9X
ZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTFJldHVybi5oCmluZGV4IGY0Njgw
OGM2MGRhLi5hNzNiNGIxMDM1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93
ZWJncHUvV0hMU0wvQVNUL1dITFNMUmV0dXJuLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl
cy93ZWJncHUvV0hMU0wvQVNUL1dITFNMUmV0dXJuLmgKQEAgLTQxLDcgKzQxLDcgQEAgbmFtZXNw
YWNlIEFTVCB7CiAKIGNsYXNzIFJldHVybiA6IHB1YmxpYyBTdGF0ZW1lbnQgewogcHVibGljOgot
ICAgIFJldHVybihDb2RlTG9jYXRpb24gbG9jYXRpb24sIE9wdGlvbmFsPFVuaXF1ZVJlZjxFeHBy
ZXNzaW9uPj4mJiB2YWx1ZSkKKyAgICBSZXR1cm4oQ29kZUxvY2F0aW9uIGxvY2F0aW9uLCBzdGQ6
OnVuaXF1ZV9wdHI8RXhwcmVzc2lvbj4mJiB2YWx1ZSkKICAgICAgICAgOiBTdGF0ZW1lbnQobG9j
YXRpb24pCiAgICAgICAgICwgbV92YWx1ZShXVEZNb3ZlKHZhbHVlKSkKICAgICB7CkBAIC01NCwx
MyArNTQsMTMgQEAgcHVibGljOgogCiAgICAgYm9vbCBpc1JldHVybigpIGNvbnN0IG92ZXJyaWRl
IHsgcmV0dXJuIHRydWU7IH0KIAotICAgIEV4cHJlc3Npb24qIHZhbHVlKCkgeyByZXR1cm4gbV92
YWx1ZSA/ICYqbV92YWx1ZSA6IG51bGxwdHI7IH0KKyAgICBFeHByZXNzaW9uKiB2YWx1ZSgpIHsg
cmV0dXJuIG1fdmFsdWUuZ2V0KCk7IH0KIAogICAgIEZ1bmN0aW9uRGVmaW5pdGlvbiogZnVuY3Rp
b24oKSB7IHJldHVybiBtX2Z1bmN0aW9uOyB9CiAgICAgdm9pZCBzZXRGdW5jdGlvbihGdW5jdGlv
bkRlZmluaXRpb24qIGZ1bmN0aW9uRGVmaW5pdGlvbikgeyBtX2Z1bmN0aW9uID0gZnVuY3Rpb25E
ZWZpbml0aW9uOyB9CiAKIHByaXZhdGU6Ci0gICAgT3B0aW9uYWw8VW5pcXVlUmVmPEV4cHJlc3Np
b24+PiBtX3ZhbHVlOworICAgIHN0ZDo6dW5pcXVlX3B0cjxFeHByZXNzaW9uPiBtX3ZhbHVlOwog
ICAgIEZ1bmN0aW9uRGVmaW5pdGlvbiogbV9mdW5jdGlvbiB7IG51bGxwdHIgfTsKIH07CiAKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMUGFyc2Vy
LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMUGFyc2VyLmNw
cAppbmRleCA4ZjFiOTQ1ZTA2MS4uMjBjYjkzOTEwNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTFBhcnNlci5jcHAKQEAgLTEwODAsMTAgKzEw
ODAsMTAgQEAgYXV0byBQYXJzZXI6OnBhcnNlSWZTdGF0ZW1lbnQoKSAtPiBFeHBlY3RlZDxBU1Q6
OklmU3RhdGVtZW50LCBFcnJvcj4KICAgICBDT05TVU1FX1RZUEUocmlnaHRQYXJlbnRoZXNpcywg
UmlnaHRQYXJlbnRoZXNpcyk7CiAgICAgUEFSU0UoYm9keSwgU3RhdGVtZW50KTsKIAotICAgIE9w
dGlvbmFsPFVuaXF1ZVJlZjxBU1Q6OlN0YXRlbWVudD4+IGVsc2VCb2R5OworICAgIHN0ZDo6dW5p
cXVlX3B0cjxBU1Q6OlN0YXRlbWVudD4gZWxzZUJvZHkobnVsbHB0cik7CiAgICAgaWYgKHRyeVR5
cGUoVG9rZW46OlR5cGU6OkVsc2UpKSB7CiAgICAgICAgIFBBUlNFKHBhcnNlZEVsc2VCb2R5LCBT
dGF0ZW1lbnQpOwotICAgICAgICBlbHNlQm9keSA9IFdURk1vdmUoKnBhcnNlZEVsc2VCb2R5KTsK
KyAgICAgICAgZWxzZUJvZHkgPSAoKnBhcnNlZEVsc2VCb2R5KS5tb3ZlVG9VbmlxdWVQdHIoKTsK
ICAgICB9CiAKICAgICBhdXRvIGVuZE9mZnNldCA9IG1fbGV4ZXIucGVlaygpLnN0YXJ0T2Zmc2V0
KCk7CkBAIC0xMTUwLDE5ICsxMTUwLDE5IEBAIGF1dG8gUGFyc2VyOjpwYXJzZUZvckxvb3AoKSAt
PiBFeHBlY3RlZDxBU1Q6OkZvckxvb3AsIEVycm9yPgogICAgIGF1dG8gcGFyc2VSZW1haW5kZXIg
PSBbJl0oVmFyaWFudDxVbmlxdWVSZWY8QVNUOjpTdGF0ZW1lbnQ+LCBVbmlxdWVSZWY8QVNUOjpF
eHByZXNzaW9uPj4mJiBpbml0aWFsaXphdGlvbikgLT4gRXhwZWN0ZWQ8QVNUOjpGb3JMb29wLCBF
cnJvcj4gewogICAgICAgICBDT05TVU1FX1RZUEUoc2VtaWNvbG9uLCBTZW1pY29sb24pOwogCi0g
ICAgICAgIE9wdGlvbmFsPFVuaXF1ZVJlZjxBU1Q6OkV4cHJlc3Npb24+PiBjb25kaXRpb24gPSBX
VEY6Om51bGxvcHQ7CisgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxBU1Q6OkV4cHJlc3Npb24+IGNv
bmRpdGlvbihudWxscHRyKTsKICAgICAgICAgaWYgKCF0cnlUeXBlKFRva2VuOjpUeXBlOjpTZW1p
Y29sb24pKSB7CiAgICAgICAgICAgICBpZiAoYXV0byBleHByZXNzaW9uID0gcGFyc2VFeHByZXNz
aW9uKCkpCi0gICAgICAgICAgICAgICAgY29uZGl0aW9uID0geyBXVEZNb3ZlKCpleHByZXNzaW9u
KSB9OworICAgICAgICAgICAgICAgIGNvbmRpdGlvbiA9ICgqZXhwcmVzc2lvbikubW92ZVRvVW5p
cXVlUHRyKCk7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgcmV0dXJuIFVuZXhw
ZWN0ZWQ8RXJyb3I+KGV4cHJlc3Npb24uZXJyb3IoKSk7CiAgICAgICAgICAgICBDT05TVU1FX1RZ
UEUoc2Vjb25kU2VtaWNvbG9uLCBTZW1pY29sb24pOwogICAgICAgICB9CiAKLSAgICAgICAgT3B0
aW9uYWw8VW5pcXVlUmVmPEFTVDo6RXhwcmVzc2lvbj4+IGluY3JlbWVudCA9IFdURjo6bnVsbG9w
dDsKKyAgICAgICAgc3RkOjp1bmlxdWVfcHRyPEFTVDo6RXhwcmVzc2lvbj4gaW5jcmVtZW50KG51
bGxwdHIpOwogICAgICAgICBpZiAoIXRyeVR5cGUoVG9rZW46OlR5cGU6OlJpZ2h0UGFyZW50aGVz
aXMpKSB7CiAgICAgICAgICAgICBpZiAoYXV0byBleHByZXNzaW9uID0gcGFyc2VFeHByZXNzaW9u
KCkpCi0gICAgICAgICAgICAgICAgaW5jcmVtZW50ID0geyBXVEZNb3ZlKCpleHByZXNzaW9uKSB9
OworICAgICAgICAgICAgICAgIGluY3JlbWVudCA9ICgqZXhwcmVzc2lvbikubW92ZVRvVW5pcXVl
UHRyKCk7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgcmV0dXJuIFVuZXhwZWN0
ZWQ8RXJyb3I+KGV4cHJlc3Npb24uZXJyb3IoKSk7CiAgICAgICAgICAgICBDT05TVU1FX1RZUEUo
cmlnaHRQYXJlbnRoZXNpcywgUmlnaHRQYXJlbnRoZXNpcyk7CkBAIC0xMzA5LDEyICsxMzA5LDEy
IEBAIGF1dG8gUGFyc2VyOjpwYXJzZVN0YXRlbWVudCgpIC0+IEV4cGVjdGVkPFVuaXF1ZVJlZjxB
U1Q6OlN0YXRlbWVudD4sIEVycm9yPgogICAgIGNhc2UgVG9rZW46OlR5cGU6OlJldHVybjogewog
ICAgICAgICBhdXRvIHJldHVyblRva2VuID0gbV9sZXhlci5jb25zdW1lVG9rZW4oKTsKICAgICAg
ICAgaWYgKGF1dG8gc2VtaWNvbG9uID0gdHJ5VHlwZShUb2tlbjo6VHlwZTo6U2VtaWNvbG9uKSkg
ewotICAgICAgICAgICAgYXV0byByZXR1cm5PYmplY3QgPSBBU1Q6OlJldHVybihXVEZNb3ZlKHJl
dHVyblRva2VuKSwgV1RGOjpudWxsb3B0KTsKKyAgICAgICAgICAgIGF1dG8gcmV0dXJuT2JqZWN0
ID0gQVNUOjpSZXR1cm4oV1RGTW92ZShyZXR1cm5Ub2tlbiksIG51bGxwdHIpOwogICAgICAgICAg
ICAgcmV0dXJuIHsgbWFrZVVuaXF1ZVJlZjxBU1Q6OlJldHVybj4oV1RGTW92ZShyZXR1cm5PYmpl
Y3QpKSB9OwogICAgICAgICB9CiAgICAgICAgIFBBUlNFKGV4cHJlc3Npb24sIEV4cHJlc3Npb24p
OwogICAgICAgICBDT05TVU1FX1RZUEUoZmluYWxTZW1pY29sb24sIFNlbWljb2xvbik7Ci0gICAg
ICAgIGF1dG8gcmV0dXJuT2JqZWN0ID0gQVNUOjpSZXR1cm4oV1RGTW92ZShyZXR1cm5Ub2tlbiks
IHsgV1RGTW92ZSgqZXhwcmVzc2lvbikgfSk7CisgICAgICAgIGF1dG8gcmV0dXJuT2JqZWN0ID0g
QVNUOjpSZXR1cm4oV1RGTW92ZShyZXR1cm5Ub2tlbiksICgqZXhwcmVzc2lvbikubW92ZVRvVW5p
cXVlUHRyKCkpOwogICAgICAgICByZXR1cm4geyBtYWtlVW5pcXVlUmVmPEFTVDo6UmV0dXJuPihX
VEZNb3ZlKHJldHVybk9iamVjdCkpIH07CiAgICAgfQogICAgIGNhc2UgVG9rZW46OlR5cGU6OkNv
bnN0YW50Ogo=
</data>

          </attachment>
      

    </bug>

</bugzilla>