<?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>209158</bug_id>
          
          <creation_ts>2020-03-16 16:36:00 -0700</creation_ts>
          <short_desc>AccessCase::canReplace should allow a Getter to replace an IntrinsicGetter</short_desc>
          <delta_ts>2020-03-17 12:45:12 -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>JavaScriptCore</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="Tadeu Zagallo">tzagallo</reporter>
          <assigned_to name="Tadeu Zagallo">tzagallo</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>keith_miller</cc>
    
    <cc>mark.lam</cc>
    
    <cc>msaboff</cc>
    
    <cc>saam</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1630540</commentid>
    <comment_count>0</comment_count>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2020-03-16 16:36:00 -0700</bug_when>
    <thetext>...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1630546</commentid>
    <comment_count>1</comment_count>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2020-03-16 16:44:53 -0700</bug_when>
    <thetext>&lt;rdar://problem/59222012&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1630549</commentid>
    <comment_count>2</comment_count>
      <attachid>393707</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2020-03-16 16:46:05 -0700</bug_when>
    <thetext>Created attachment 393707
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1630611</commentid>
    <comment_count>3</comment_count>
      <attachid>393707</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2020-03-16 19:41:36 -0700</bug_when>
    <thetext>Comment on attachment 393707
Patch

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

&gt; Source/JavaScriptCore/bytecode/AccessCase.cpp:681
&gt; +        if (other.type() != type() &amp;&amp; other.type() != IntrinsicGetter)

Isn&apos;t this just always false? I think you want an ||?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1630612</commentid>
    <comment_count>4</comment_count>
      <attachid>393707</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2020-03-16 19:44:00 -0700</bug_when>
    <thetext>Comment on attachment 393707
Patch

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

&gt;&gt; Source/JavaScriptCore/bytecode/AccessCase.cpp:681
&gt;&gt; +        if (other.type() != type() &amp;&amp; other.type() != IntrinsicGetter)
&gt; 
&gt; Isn&apos;t this just always false? I think you want an ||?

Nvm, I just misread this as ==.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1630653</commentid>
    <comment_count>5</comment_count>
      <attachid>393707</attachid>
    <who name="Saam Barati">saam</who>
    <bug_when>2020-03-16 23:53:24 -0700</bug_when>
    <thetext>Comment on attachment 393707
Patch

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

r=me

&gt; Source/JavaScriptCore/ChangeLog:9
&gt; +        When we override an intrinsic getter with an user defined getter, we might end up with the

&quot;an user&quot; =&gt; &quot;a user&quot;

&gt; Source/JavaScriptCore/bytecode/AccessCase.cpp:680
&gt; +    case Getter:

You&apos;re missing the other direction here, where |this| is InrinsicGetter, and the other is Getter

If you wanted to be fancy, you could have something like:

bool isInterchangeable(AccessType a, AccessType b)
{
    if (a == b)
        return true;
    if (a == Getter and b == IntrinsicGetter)
        return true;
    if (a == IntrinsicGettter and b == Getter)
      return true
}

and then just write this function in terms of that</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1630824</commentid>
    <comment_count>6</comment_count>
      <attachid>393707</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2020-03-17 11:54:34 -0700</bug_when>
    <thetext>Comment on attachment 393707
Patch

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

&gt;&gt; Source/JavaScriptCore/ChangeLog:9
&gt;&gt; +        When we override an intrinsic getter with an user defined getter, we might end up with the
&gt; 
&gt; &quot;an user&quot; =&gt; &quot;a user&quot;

I debated that, thanks.

&gt;&gt; Source/JavaScriptCore/bytecode/AccessCase.cpp:680
&gt;&gt; +    case Getter:
&gt; 
&gt; You&apos;re missing the other direction here, where |this| is InrinsicGetter, and the other is Getter
&gt; 
&gt; If you wanted to be fancy, you could have something like:
&gt; 
&gt; bool isInterchangeable(AccessType a, AccessType b)
&gt; {
&gt;     if (a == b)
&gt;         return true;
&gt;     if (a == Getter and b == IntrinsicGetter)
&gt;         return true;
&gt;     if (a == IntrinsicGettter and b == Getter)
&gt;       return true
&gt; }
&gt; 
&gt; and then just write this function in terms of that

I was unsure whether it was possible to go in the other direction. Fixed it now.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1630826</commentid>
    <comment_count>7</comment_count>
      <attachid>393773</attachid>
    <who name="Tadeu Zagallo">tzagallo</who>
    <bug_when>2020-03-17 11:56:05 -0700</bug_when>
    <thetext>Created attachment 393773
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1630846</commentid>
    <comment_count>8</comment_count>
      <attachid>393773</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-03-17 12:45:10 -0700</bug_when>
    <thetext>Comment on attachment 393773
Patch for landing

Clearing flags on attachment: 393773

Committed r258573: &lt;https://trac.webkit.org/changeset/258573&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1630847</commentid>
    <comment_count>9</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-03-17 12:45:12 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>393707</attachid>
            <date>2020-03-16 16:46:05 -0700</date>
            <delta_ts>2020-03-17 11:56:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-209158-20200316164605.patch</filename>
            <type>text/plain</type>
            <size>3766</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3
NDU1YWFmMWRmMjVkNjFlNjUzYzk4NGM3OGRmYjY3MjI4MDlkN2Q3Li5lMjdmNDA3ZDhmMmI4YjY2
OTI0NjA2ZjcyMmM1YzkxNWVlNDdmMmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxOSBAQAorMjAyMC0wMy0xNiAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBBY2Nlc3NDYXNlOjpjYW5SZXBsYWNlIHNob3VsZCBhbGxvdyBhIEdldHRl
ciB0byByZXBsYWNlIGFuIEludHJpbnNpY0dldHRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MTU4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81
OTIyMjAxMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBXaGVuIHdlIG92ZXJyaWRlIGFuIGludHJpbnNpYyBnZXR0ZXIgd2l0aCBhbiB1c2VyIGRlZmlu
ZWQgZ2V0dGVyLCB3ZSBtaWdodCBlbmQgdXAgd2l0aCB0aGUKKyAgICAgICAgc2FtZSBvZmZzZXQg
YW5kIGF0dHJpYnV0ZXMuIEluIHdoaWNoIGNhc2UsIGFuIGlubGluZSBjYWNoZSB0aGF0IGNvbnRh
aW5lZCBhbiBlbnRyeSBmb3IgdGhlCisgICAgICAgIGludHJpc2ljIGdldHRlciB3aWxsIGJlbGll
dmUgdGhhdCBpdCBpcyBzdGlsbCB2YWxpZCwgYW5kIGFkZCBhIG5ldyBnZXR0ZXIgYWNjZXNzIGNh
c2UsCisgICAgICAgIGxlYWRpbmcgdG8gZHVwbGljYXRlIGVudHJpZXMgZm9yIHRoZSBzYW1lIHN0
cnVjdHVyZS4KKworICAgICAgICAqIGJ5dGVjb2RlL0FjY2Vzc0Nhc2UuY3BwOgorICAgICAgICAo
SlNDOjpBY2Nlc3NDYXNlOjpjYW5SZXBsYWNlIGNvbnN0KToKKwogMjAyMC0wMy0xMyAgU2VyZ2lv
IFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV2ViWFJdIElE
THMsIHN0dWJzIGFuZCBidWlsZCBjb25maWd1cmF0aW9uIGZvciBXUEUKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9BY2Nlc3NDYXNlLmNwcCBiL1NvdXJjZS9KYXZh
U2NyaXB0Q29yZS9ieXRlY29kZS9BY2Nlc3NDYXNlLmNwcAppbmRleCBiZmMxNTllYzc4N2QxOTU4
MGUxOTA4ZjA0NWVjYzM4NDI4ZjEwYzRjLi43Yzg5MjFjMjE2ZGVjNDcyZmNlNjQwY2RjNDZjY2I4
ZmZmZDFkODVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQWNj
ZXNzQ2FzZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0FjY2Vzc0Nh
c2UuY3BwCkBAIC01ODcsNiArNTg3LDIzIEBAIGJvb2wgQWNjZXNzQ2FzZTo6Y2FuUmVwbGFjZShj
b25zdCBBY2Nlc3NDYXNlJiBvdGhlcikgY29uc3QKIAogICAgIGlmIChtX2lkZW50aWZpZXIgIT0g
b3RoZXIubV9pZGVudGlmaWVyKQogICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBhdXRvIGNo
ZWNrUG9seVByb3RvQW5kU3RydWN0dXJlID0gWyZdIHsKKyAgICAgICAgaWYgKG1fcG9seVByb3Rv
QWNjZXNzQ2hhaW4pIHsKKyAgICAgICAgICAgIGlmICghb3RoZXIubV9wb2x5UHJvdG9BY2Nlc3ND
aGFpbikKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICAvLyBUaGlz
IGlzIHRoZSBvbmx5IGNoZWNrIHdlIG5lZWQgc2luY2UgUG9seVByb3RvQWNjZXNzQ2hhaW4gY29u
dGFpbnMgdGhlIGJhc2Ugc3RydWN0dXJlLgorICAgICAgICAgICAgLy8gSWYgd2UgZXZlciBjaGFu
Z2UgaXQgdG8gY29udGFpbiBvbmx5IHRoZSBwcm90b3R5cGUgY2hhaW4sIHdlJ2xsIGFsc28gbmVl
ZCB0byBjaGFuZ2UKKyAgICAgICAgICAgIC8vIHRoaXMgdG8gY2hlY2sgdGhlIGJhc2Ugc3RydWN0
dXJlLgorICAgICAgICAgICAgcmV0dXJuIHN0cnVjdHVyZSgpID09IG90aGVyLnN0cnVjdHVyZSgp
CisgICAgICAgICAgICAgICAgJiYgKm1fcG9seVByb3RvQWNjZXNzQ2hhaW4gPT0gKm90aGVyLm1f
cG9seVByb3RvQWNjZXNzQ2hhaW47CisgICAgICAgIH0KKworICAgICAgICBpZiAoIWd1YXJkZWRC
eVN0cnVjdHVyZUNoZWNrU2tpcHBpbmdDb25zdGFudElkZW50aWZpZXJDaGVjaygpIHx8ICFvdGhl
ci5ndWFyZGVkQnlTdHJ1Y3R1cmVDaGVja1NraXBwaW5nQ29uc3RhbnRJZGVudGlmaWVyQ2hlY2so
KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gc3RydWN0dXJl
KCkgPT0gb3RoZXIuc3RydWN0dXJlKCk7CisgICAgfTsKICAgICAKICAgICBzd2l0Y2ggKHR5cGUo
KSkgewogICAgIGNhc2UgSW5kZXhlZEludDMyTG9hZDoKQEAgLTY0OCw3ICs2NjUsNiBAQCBib29s
IEFjY2Vzc0Nhc2U6OmNhblJlcGxhY2UoY29uc3QgQWNjZXNzQ2FzZSYgb3RoZXIpIGNvbnN0CiAg
ICAgY2FzZSBSZXBsYWNlOgogICAgIGNhc2UgTWlzczoKICAgICBjYXNlIEdldEdldHRlcjoKLSAg
ICBjYXNlIEdldHRlcjoKICAgICBjYXNlIFNldHRlcjoKICAgICBjYXNlIEN1c3RvbVZhbHVlR2V0
dGVyOgogICAgIGNhc2UgQ3VzdG9tQWNjZXNzb3JHZXR0ZXI6CkBAIC02NjAsMjAgKzY3NiwxMiBA
QCBib29sIEFjY2Vzc0Nhc2U6OmNhblJlcGxhY2UoY29uc3QgQWNjZXNzQ2FzZSYgb3RoZXIpIGNv
bnN0CiAgICAgICAgIGlmIChvdGhlci50eXBlKCkgIT0gdHlwZSgpKQogICAgICAgICAgICAgcmV0
dXJuIGZhbHNlOwogCi0gICAgICAgIGlmIChtX3BvbHlQcm90b0FjY2Vzc0NoYWluKSB7Ci0gICAg
ICAgICAgICBpZiAoIW90aGVyLm1fcG9seVByb3RvQWNjZXNzQ2hhaW4pCi0gICAgICAgICAgICAg
ICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgLy8gVGhpcyBpcyB0aGUgb25seSBjaGVjayB3
ZSBuZWVkIHNpbmNlIFBvbHlQcm90b0FjY2Vzc0NoYWluIGNvbnRhaW5zIHRoZSBiYXNlIHN0cnVj
dHVyZS4KLSAgICAgICAgICAgIC8vIElmIHdlIGV2ZXIgY2hhbmdlIGl0IHRvIGNvbnRhaW4gb25s
eSB0aGUgcHJvdG90eXBlIGNoYWluLCB3ZSdsbCBhbHNvIG5lZWQgdG8gY2hhbmdlCi0gICAgICAg
ICAgICAvLyB0aGlzIHRvIGNoZWNrIHRoZSBiYXNlIHN0cnVjdHVyZS4KLSAgICAgICAgICAgIHJl
dHVybiBzdHJ1Y3R1cmUoKSA9PSBvdGhlci5zdHJ1Y3R1cmUoKQotICAgICAgICAgICAgICAgICYm
ICptX3BvbHlQcm90b0FjY2Vzc0NoYWluID09ICpvdGhlci5tX3BvbHlQcm90b0FjY2Vzc0NoYWlu
OwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKCFndWFyZGVkQnlTdHJ1Y3R1cmVDaGVja1NraXBw
aW5nQ29uc3RhbnRJZGVudGlmaWVyQ2hlY2soKSB8fCAhb3RoZXIuZ3VhcmRlZEJ5U3RydWN0dXJl
Q2hlY2tTa2lwcGluZ0NvbnN0YW50SWRlbnRpZmllckNoZWNrKCkpCisgICAgICAgIHJldHVybiBj
aGVja1BvbHlQcm90b0FuZFN0cnVjdHVyZSgpOworICAgIGNhc2UgR2V0dGVyOgorICAgICAgICBp
ZiAob3RoZXIudHlwZSgpICE9IHR5cGUoKSAmJiBvdGhlci50eXBlKCkgIT0gSW50cmluc2ljR2V0
dGVyKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgIHJldHVybiBzdHJ1Y3R1
cmUoKSA9PSBvdGhlci5zdHJ1Y3R1cmUoKTsKKyAgICAgICAgcmV0dXJuIGNoZWNrUG9seVByb3Rv
QW5kU3RydWN0dXJlKCk7CiAgICAgfQogICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7
CiB9Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>393773</attachid>
            <date>2020-03-17 11:56:05 -0700</date>
            <delta_ts>2020-03-17 12:45:10 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-209158-20200317115604.patch</filename>
            <type>text/plain</type>
            <size>3833</size>
            <attacher name="Tadeu Zagallo">tzagallo</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3
NDU1YWFmMWRmMjVkNjFlNjUzYzk4NGM3OGRmYjY3MjI4MDlkN2Q3Li45N2ZiOWY1OTRiMDFhOTVi
NDAwOTgwMTNlNGVjZTRmOGM4NjkyODU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxOSBAQAorMjAyMC0wMy0xNiAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv
bT4KKworICAgICAgICBBY2Nlc3NDYXNlOjpjYW5SZXBsYWNlIHNob3VsZCBhbGxvdyBhIEdldHRl
ciB0byByZXBsYWNlIGFuIEludHJpbnNpY0dldHRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MTU4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81
OTIyMjAxMj4KKworICAgICAgICBSZXZpZXdlZCBieSBTYWFtIEJhcmF0aS4KKworICAgICAgICBX
aGVuIHdlIG92ZXJyaWRlIGFuIGludHJpbnNpYyBnZXR0ZXIgd2l0aCBhIHVzZXIgZGVmaW5lZCBn
ZXR0ZXIsIHdlIG1pZ2h0IGVuZCB1cCB3aXRoIHRoZQorICAgICAgICBzYW1lIG9mZnNldCBhbmQg
YXR0cmlidXRlcy4gSW4gd2hpY2ggY2FzZSwgYW4gaW5saW5lIGNhY2hlIHRoYXQgY29udGFpbmVk
IGFuIGVudHJ5IGZvciB0aGUKKyAgICAgICAgaW50cmlzaWMgZ2V0dGVyIHdpbGwgYmVsaWV2ZSB0
aGF0IGl0IGlzIHN0aWxsIHZhbGlkLCBhbmQgYWRkIGEgbmV3IGdldHRlciBhY2Nlc3MgY2FzZSwK
KyAgICAgICAgbGVhZGluZyB0byBkdXBsaWNhdGUgZW50cmllcyBmb3IgdGhlIHNhbWUgc3RydWN0
dXJlLgorCisgICAgICAgICogYnl0ZWNvZGUvQWNjZXNzQ2FzZS5jcHA6CisgICAgICAgIChKU0M6
OkFjY2Vzc0Nhc2U6OmNhblJlcGxhY2UgY29uc3QpOgorCiAyMDIwLTAzLTEzICBTZXJnaW8gVmls
bGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXZWJYUl0gSURMcywg
c3R1YnMgYW5kIGJ1aWxkIGNvbmZpZ3VyYXRpb24gZm9yIFdQRQpkaWZmIC0tZ2l0IGEvU291cmNl
L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0FjY2Vzc0Nhc2UuY3BwIGIvU291cmNlL0phdmFTY3Jp
cHRDb3JlL2J5dGVjb2RlL0FjY2Vzc0Nhc2UuY3BwCmluZGV4IGJmYzE1OWVjNzg3ZDE5NTgwZTE5
MDhmMDQ1ZWNjMzg0MjhmMTBjNGMuLjZkNTU4ZjQ4Zjg1ZWYzODU4NmJlOWJlOTQ2OWFjMzAxN2Yz
MWIyYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9BY2Nlc3ND
YXNlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQWNjZXNzQ2FzZS5j
cHAKQEAgLTU4Nyw2ICs1ODcsMjMgQEAgYm9vbCBBY2Nlc3NDYXNlOjpjYW5SZXBsYWNlKGNvbnN0
IEFjY2Vzc0Nhc2UmIG90aGVyKSBjb25zdAogCiAgICAgaWYgKG1faWRlbnRpZmllciAhPSBvdGhl
ci5tX2lkZW50aWZpZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGF1dG8gY2hlY2tQ
b2x5UHJvdG9BbmRTdHJ1Y3R1cmUgPSBbJl0geworICAgICAgICBpZiAobV9wb2x5UHJvdG9BY2Nl
c3NDaGFpbikgeworICAgICAgICAgICAgaWYgKCFvdGhlci5tX3BvbHlQcm90b0FjY2Vzc0NoYWlu
KQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIC8vIFRoaXMgaXMg
dGhlIG9ubHkgY2hlY2sgd2UgbmVlZCBzaW5jZSBQb2x5UHJvdG9BY2Nlc3NDaGFpbiBjb250YWlu
cyB0aGUgYmFzZSBzdHJ1Y3R1cmUuCisgICAgICAgICAgICAvLyBJZiB3ZSBldmVyIGNoYW5nZSBp
dCB0byBjb250YWluIG9ubHkgdGhlIHByb3RvdHlwZSBjaGFpbiwgd2UnbGwgYWxzbyBuZWVkIHRv
IGNoYW5nZQorICAgICAgICAgICAgLy8gdGhpcyB0byBjaGVjayB0aGUgYmFzZSBzdHJ1Y3R1cmUu
CisgICAgICAgICAgICByZXR1cm4gc3RydWN0dXJlKCkgPT0gb3RoZXIuc3RydWN0dXJlKCkKKyAg
ICAgICAgICAgICAgICAmJiAqbV9wb2x5UHJvdG9BY2Nlc3NDaGFpbiA9PSAqb3RoZXIubV9wb2x5
UHJvdG9BY2Nlc3NDaGFpbjsKKyAgICAgICAgfQorCisgICAgICAgIGlmICghZ3VhcmRlZEJ5U3Ry
dWN0dXJlQ2hlY2tTa2lwcGluZ0NvbnN0YW50SWRlbnRpZmllckNoZWNrKCkgfHwgIW90aGVyLmd1
YXJkZWRCeVN0cnVjdHVyZUNoZWNrU2tpcHBpbmdDb25zdGFudElkZW50aWZpZXJDaGVjaygpKQor
ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIHJldHVybiBzdHJ1Y3R1cmUoKSA9
PSBvdGhlci5zdHJ1Y3R1cmUoKTsKKyAgICB9OwogICAgIAogICAgIHN3aXRjaCAodHlwZSgpKSB7
CiAgICAgY2FzZSBJbmRleGVkSW50MzJMb2FkOgpAQCAtNjQ4LDMyICs2NjUsMjQgQEAgYm9vbCBB
Y2Nlc3NDYXNlOjpjYW5SZXBsYWNlKGNvbnN0IEFjY2Vzc0Nhc2UmIG90aGVyKSBjb25zdAogICAg
IGNhc2UgUmVwbGFjZToKICAgICBjYXNlIE1pc3M6CiAgICAgY2FzZSBHZXRHZXR0ZXI6Ci0gICAg
Y2FzZSBHZXR0ZXI6CiAgICAgY2FzZSBTZXR0ZXI6CiAgICAgY2FzZSBDdXN0b21WYWx1ZUdldHRl
cjoKICAgICBjYXNlIEN1c3RvbUFjY2Vzc29yR2V0dGVyOgogICAgIGNhc2UgQ3VzdG9tVmFsdWVT
ZXR0ZXI6CiAgICAgY2FzZSBDdXN0b21BY2Nlc3NvclNldHRlcjoKLSAgICBjYXNlIEludHJpbnNp
Y0dldHRlcjoKICAgICBjYXNlIEluSGl0OgogICAgIGNhc2UgSW5NaXNzOgogICAgICAgICBpZiAo
b3RoZXIudHlwZSgpICE9IHR5cGUoKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg
ICAgICBpZiAobV9wb2x5UHJvdG9BY2Nlc3NDaGFpbikgewotICAgICAgICAgICAgaWYgKCFvdGhl
ci5tX3BvbHlQcm90b0FjY2Vzc0NoYWluKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK
LSAgICAgICAgICAgIC8vIFRoaXMgaXMgdGhlIG9ubHkgY2hlY2sgd2UgbmVlZCBzaW5jZSBQb2x5
UHJvdG9BY2Nlc3NDaGFpbiBjb250YWlucyB0aGUgYmFzZSBzdHJ1Y3R1cmUuCi0gICAgICAgICAg
ICAvLyBJZiB3ZSBldmVyIGNoYW5nZSBpdCB0byBjb250YWluIG9ubHkgdGhlIHByb3RvdHlwZSBj
aGFpbiwgd2UnbGwgYWxzbyBuZWVkIHRvIGNoYW5nZQotICAgICAgICAgICAgLy8gdGhpcyB0byBj
aGVjayB0aGUgYmFzZSBzdHJ1Y3R1cmUuCi0gICAgICAgICAgICByZXR1cm4gc3RydWN0dXJlKCkg
PT0gb3RoZXIuc3RydWN0dXJlKCkKLSAgICAgICAgICAgICAgICAmJiAqbV9wb2x5UHJvdG9BY2Nl
c3NDaGFpbiA9PSAqb3RoZXIubV9wb2x5UHJvdG9BY2Nlc3NDaGFpbjsKLSAgICAgICAgfQorICAg
ICAgICByZXR1cm4gY2hlY2tQb2x5UHJvdG9BbmRTdHJ1Y3R1cmUoKTsKIAotICAgICAgICBpZiAo
IWd1YXJkZWRCeVN0cnVjdHVyZUNoZWNrU2tpcHBpbmdDb25zdGFudElkZW50aWZpZXJDaGVjaygp
IHx8ICFvdGhlci5ndWFyZGVkQnlTdHJ1Y3R1cmVDaGVja1NraXBwaW5nQ29uc3RhbnRJZGVudGlm
aWVyQ2hlY2soKSkKKyAgICBjYXNlIEludHJpbnNpY0dldHRlcjoKKyAgICBjYXNlIEdldHRlcjoK
KyAgICAgICAgaWYgKG90aGVyLnR5cGUoKSAhPSBHZXR0ZXIgJiYgb3RoZXIudHlwZSgpICE9IElu
dHJpbnNpY0dldHRlcikKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICByZXR1
cm4gc3RydWN0dXJlKCkgPT0gb3RoZXIuc3RydWN0dXJlKCk7CisgICAgICAgIHJldHVybiBjaGVj
a1BvbHlQcm90b0FuZFN0cnVjdHVyZSgpOwogICAgIH0KICAgICBSRUxFQVNFX0FTU0VSVF9OT1Rf
UkVBQ0hFRCgpOwogfQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>