<?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>209317</bug_id>
          
          <creation_ts>2020-03-19 15:38:55 -0700</creation_ts>
          <short_desc>Unable to build WebKit with iOS 13.4 SDK</short_desc>
          <delta_ts>2020-03-27 12:43:43 -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="Ryan Haddad">ryanhaddad</reporter>
          <assigned_to name="Tim Horton">thorton</assigned_to>
          <cc>aestes</cc>
    
    <cc>ap</cc>
    
    <cc>dino</cc>
    
    <cc>jbedard</cc>
    
    <cc>megan_gardner</cc>
    
    <cc>mitz</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bot-watchers-bugzilla</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1631881</commentid>
    <comment_count>0</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2020-03-19 15:38:55 -0700</bug_when>
    <thetext>Unable to build WebKit with iOS 13.4 SDK</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1631883</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-03-19 15:39:37 -0700</bug_when>
    <thetext>&lt;rdar://problem/60656534&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1631937</commentid>
    <comment_count>2</comment_count>
      <attachid>394051</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-19 18:11:26 -0700</bug_when>
    <thetext>Created attachment 394051
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1631998</commentid>
    <comment_count>3</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-03-19 21:41:30 -0700</bug_when>
    <thetext>Committed r258751: &lt;https://trac.webkit.org/changeset/258751&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 394051.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634073</commentid>
    <comment_count>4</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-25 15:35:30 -0700</bug_when>
    <thetext>Reopening for one follow-up</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634074</commentid>
    <comment_count>5</comment_count>
      <attachid>394552</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-25 15:38:30 -0700</bug_when>
    <thetext>Created attachment 394552
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634075</commentid>
    <comment_count>6</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-25 15:38:51 -0700</bug_when>
    <thetext>I disagree with all of the stylebot complaints in this case, so I&apos;m gonna ignore it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634087</commentid>
    <comment_count>7</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2020-03-25 15:59:07 -0700</bug_when>
    <thetext>Hmm, how is a bunch of numeric version checks throughout the code better than a HAVE macro with a descriptive name?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634109</commentid>
    <comment_count>8</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-25 16:28:24 -0700</bug_when>
    <thetext>(In reply to Alexey Proskuryakov from comment #7)
&gt; Hmm, how is a bunch of numeric version checks throughout the code better
&gt; than a HAVE macro with a descriptive name?

Because as we currently use it, the HAVE() macro would also be true before? We had it! It just was SPI! Now it&apos;s not! Maybe we&apos;d want a bunch of them with names like HAVE(WHATEVER_AS_API)? I think that this is unprecedented, but could go either way.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634111</commentid>
    <comment_count>9</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-25 16:29:02 -0700</bug_when>
    <thetext>(In reply to Tim Horton from comment #8)
&gt; (In reply to Alexey Proskuryakov from comment #7)
&gt; &gt; Hmm, how is a bunch of numeric version checks throughout the code better
&gt; &gt; than a HAVE macro with a descriptive name?
&gt; 
&gt; Because as we currently use it, the HAVE() macro would also be true before?
&gt; We had it! It just was SPI! Now it&apos;s not! Maybe we&apos;d want a bunch of them
&gt; with names like HAVE(WHATEVER_AS_API)? I think that this is unprecedented,
&gt; but could go either way.

Also, I feel like SPI headers are a very special case, not &quot;throughout the code&quot;...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634122</commentid>
    <comment_count>10</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2020-03-25 16:49:51 -0700</bug_when>
    <thetext>&gt; Also, I feel like SPI headers are a very special case, not &quot;throughout the code&quot;...

There is some truth to that...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634130</commentid>
    <comment_count>11</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-03-25 17:32:06 -0700</bug_when>
    <thetext>Committed r259025: &lt;https://trac.webkit.org/changeset/259025&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 394552.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634177</commentid>
    <comment_count>12</comment_count>
      <attachid>394552</attachid>
    <who name="">mitz</who>
    <bug_when>2020-03-25 19:32:38 -0700</bug_when>
    <thetext>Comment on attachment 394552
Patch

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

&gt; Source/WebKit/Platform/spi/ios/UIKitSPI.h:233
&gt; +#if PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &lt; 130400

This should me MAX_ALLOWED, since the presence of the definitions in the SDK depends on the SDK version used at build time, not the deployment target.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634179</commentid>
    <comment_count>13</comment_count>
    <who name="">mitz</who>
    <bug_when>2020-03-25 19:34:53 -0700</bug_when>
    <thetext>(In reply to Tim Horton from comment #9)

&gt; Also, I feel like SPI headers are a very special case, not &quot;throughout the
&gt; code&quot;...

Yes, since those headers mimic SDK content, as a rule they should be using SDK version conditionals.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634189</commentid>
    <comment_count>14</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-25 20:18:38 -0700</bug_when>
    <thetext>(In reply to mitz from comment #13)
&gt; (In reply to Tim Horton from comment #9)
&gt; 
&gt; &gt; Also, I feel like SPI headers are a very special case, not &quot;throughout the
&gt; &gt; code&quot;...
&gt; 
&gt; Yes, since those headers mimic SDK content, as a rule they should be using
&gt; SDK version conditionals.

Haha.

(In reply to mitz from comment #12)
&gt; Comment on attachment 394552 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=394552&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/Platform/spi/ios/UIKitSPI.h:233
&gt; &gt; +#if PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &lt; 130400
&gt; 
&gt; This should me MAX_ALLOWED, since the presence of the definitions in the SDK
&gt; depends on the SDK version used at build time, not the deployment target.

Yes, good point! I will fix.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634895</commentid>
    <comment_count>15</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-27 11:12:27 -0700</bug_when>
    <thetext>(In reply to Tim Horton from comment #14)
&gt; (In reply to mitz from comment #13)
&gt; &gt; &gt; Source/WebKit/Platform/spi/ios/UIKitSPI.h:233
&gt; &gt; &gt; +#if PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &lt; 130400
&gt; &gt; 
&gt; &gt; This should me MAX_ALLOWED, since the presence of the definitions in the SDK
&gt; &gt; depends on the SDK version used at build time, not the deployment target.
&gt; 
&gt; Yes, good point! I will fix.

Hmm, this is actually not working...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634902</commentid>
    <comment_count>16</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-27 11:20:22 -0700</bug_when>
    <thetext>(In reply to Tim Horton from comment #15)
&gt; (In reply to Tim Horton from comment #14)
&gt; &gt; (In reply to mitz from comment #13)
&gt; &gt; &gt; &gt; Source/WebKit/Platform/spi/ios/UIKitSPI.h:233
&gt; &gt; &gt; &gt; +#if PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &lt; 130400
&gt; &gt; &gt; 
&gt; &gt; &gt; This should me MAX_ALLOWED, since the presence of the definitions in the SDK
&gt; &gt; &gt; depends on the SDK version used at build time, not the deployment target.
&gt; &gt; 
&gt; &gt; Yes, good point! I will fix.
&gt; 
&gt; Hmm, this is actually not working...

Looks like MAX_ALLOWED remains at 130000</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634918</commentid>
    <comment_count>17</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-27 11:43:01 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634919</commentid>
    <comment_count>18</comment_count>
      <attachid>394737</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-03-27 11:43:02 -0700</bug_when>
    <thetext>Created attachment 394737
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1634958</commentid>
    <comment_count>19</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-03-27 12:43:42 -0700</bug_when>
    <thetext>Committed r259133: &lt;https://trac.webkit.org/changeset/259133&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 394737.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>394051</attachid>
            <date>2020-03-19 18:11:26 -0700</date>
            <delta_ts>2020-03-25 15:38:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-209317-20200319181126.patch</filename>
            <type>text/plain</type>
            <size>4555</size>
            <attacher name="Tim Horton">thorton</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiNDA4Yzc0Y2YzMTM4YTg0
ZGZiM2EyNmFmZTllNjBmNTY5NGEyZmUuLjM1YTI2NDNjZjk4ZWYxZTg1N2ZiODI5ZjE4NWI4YTI3
MmUzNjIzZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDMtMTkgIFRpbSBIb3J0
b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVW5hYmxlIHRvIGJ1aWxk
IFdlYktpdCB3aXRoIGlPUyAxMy40IFNESworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MzE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisgICAgICAg
ICogVUlQcm9jZXNzL2lvcy9XS01vdXNlR2VzdHVyZVJlY29nbml6ZXIubW06CisKIDIwMjAtMDMt
MTkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAg
ICBTYW5pdGl6ZSBzdWdnZXN0ZWQgZG93bmxvYWQgZmlsZW5hbWUgcmVjZWl2ZWQgZnJvbSB3ZWIg
cHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0
U1BJLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaAppbmRleCA4
NzdmM2MzMWU3YmRlYTAxM2RlZTQ1M2U4ZjY1YzQ1YzkxZjljZTllLi44MmNhNGU5MGQ5ODliNmZj
MzFhNGU3MzliZjIzZjNkYzEzMmFhODI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRm
b3JtL3NwaS9pb3MvVUlLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9p
b3MvVUlLaXRTUEkuaApAQCAtMjI4LDExICsyMjgsMTcgQEAgdHlwZWRlZiBlbnVtIHsKICAgICBr
VUlLZXlib2FyZElucHV0UHJlUHJvY2Vzc2VkICAgICAgICAgICA9IDEgPDwgNywKIH0gVUlLZXli
b2FyZElucHV0RmxhZ3M7CiAKK3R5cGVkZWYgTlNfT1BUSU9OUyhOU0ludGVnZXIsIFVJRXZlbnRC
dXR0b25NYXNrKSB7CisgICAgVUlFdmVudEJ1dHRvbk1hc2tQcmltYXJ5ID0gMSA8PCAwLAorICAg
IFVJRXZlbnRCdXR0b25NYXNrU2Vjb25kYXJ5ID0gMSA8PCAxLAorfTsKKwogQGludGVyZmFjZSBV
SUV2ZW50ICgpCiAtICh2b2lkICopX2hpZEV2ZW50OwogLSAoTlNTdHJpbmcgKilfdW5tb2RpZmll
ZElucHV0OwogLSAoTlNTdHJpbmcgKilfbW9kaWZpZWRJbnB1dDsKIC0gKEJPT0wpX2lzS2V5RG93
bjsKKy0gKFVJRXZlbnRCdXR0b25NYXNrKV9idXR0b25NYXNrOwogQGVuZAogCiB0eXBlZGVmIGVu
dW0gewpAQCAtNDA0LDYgKzQxMCwxMSBAQCB0eXBlZGVmIGVudW0gewogCiBAaW50ZXJmYWNlIFVJ
R2VzdHVyZVJlY29nbml6ZXIgKCkKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSwgZ2V0
dGVyPV9tb2RpZmllckZsYWdzKSBVSUtleU1vZGlmaWVyRmxhZ3MgbW9kaWZpZXJGbGFnczsKKwor
LSAodm9pZClfaG92ZXJFbnRlcmVkOihOU1NldDxVSVRvdWNoICo+ICopdG91Y2hlcyB3aXRoRXZl
bnQ6KFVJRXZlbnQgKilldmVudDsKKy0gKHZvaWQpX2hvdmVyTW92ZWQ6KE5TU2V0PFVJVG91Y2gg
Kj4gKil0b3VjaGVzIHdpdGhFdmVudDooVUlFdmVudCAqKWV2ZW50OworLSAodm9pZClfaG92ZXJF
eGl0ZWQ6KE5TU2V0PFVJVG91Y2ggKj4gKil0b3VjaGVzIHdpdGhFdmVudDooVUlFdmVudCAqKWV2
ZW50OworLSAodm9pZClfaG92ZXJDYW5jZWxsZWQ6KE5TU2V0PFVJVG91Y2ggKj4gKil0b3VjaGVz
IHdpdGhFdmVudDooVUlFdmVudCAqKWV2ZW50OwogQGVuZAogCiBAaW50ZXJmYWNlIFVJVGFwR2Vz
dHVyZVJlY29nbml6ZXIgKCkKQEAgLTk5Nyw2ICsxMDA4LDcgQEAgdHlwZWRlZiBOU19PUFRJT05T
KE5TVUludGVnZXIsIFVJRHJhZ09wZXJhdGlvbikKIAogQGludGVyZmFjZSBVSURyYWdJbnRlcmFj
dGlvbiAoKQogQHByb3BlcnR5IChub25hdG9taWMsIGFzc2lnbiwgZ2V0dGVyPV9saWZ0RGVsYXks
IHNldHRlcj1fc2V0TGlmdERlbGF5OikgTlNUaW1lSW50ZXJ2YWwgbGlmdERlbGF5OworLSAodm9p
ZClfc2V0QWxsb3dzUG9pbnRlckRyYWdCZWZvcmVMaWZ0RGVsYXk6KEJPT0wpYWxsb3dzUG9pbnRl
ckRyYWdCZWZvcmVMaWZ0RGVsYXk7CiBAZW5kCiAKIEBpbnRlcmZhY2UgVUlEcmFnSXRlbSAoKQpA
QCAtMTAxNSw2ICsxMDI3LDkgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5TVUludGVnZXIsIFVJRHJh
Z09wZXJhdGlvbikKICsgKGluc3RhbmNldHlwZSl2aWV3V2l0aFRpdGxlOihOU1N0cmluZyAqKXRp
dGxlIFVSTDooTlNVUkwgKil1cmw7CiBAZW5kCiAKK0BpbnRlcmZhY2UgX1VJUGFyYWxsYXhUcmFu
c2l0aW9uUGFuR2VzdHVyZVJlY29nbml6ZXIgOiBVSVNjcmVlbkVkZ2VQYW5HZXN0dXJlUmVjb2du
aXplcgorQGVuZAorCiAjZW5kaWYKIAogQGludGVyZmFjZSBVSUtleWJvYXJkUHJlZmVyZW5jZXND
b250cm9sbGVyIDogTlNPYmplY3QKQEAgLTExNDksNyArMTE2NCw4IEBAIHR5cGVkZWYgTlNfRU5V
TShOU1VJbnRlZ2VyLCBfVUlDb250ZXh0TWVudUxheW91dCkgewogQHByb3BlcnR5IChyZWFkb25s
eSkgQk9PTCBpc0xvd0NvbmZpZGVuY2U7CiBAZW5kCiAKLUBwcm90b2NvbCBfVUlDdXJzb3JJbnRl
cmFjdGlvbkRlbGVnYXRlOworQHByb3RvY29sIF9VSUN1cnNvckludGVyYWN0aW9uRGVsZWdhdGUK
K0BlbmQKIAogQGludGVyZmFjZSBfVUlDdXJzb3JJbnRlcmFjdGlvbiA6IE5TT2JqZWN0IDxVSUlu
dGVyYWN0aW9uPgogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRGVsZWdhdGU6KGlkIDxfVUlDdXJz
b3JJbnRlcmFjdGlvbkRlbGVnYXRlPilkZWxlZ2F0ZTsKQEAgLTExNTksNiArMTE3NSw3IEBAIHR5
cGVkZWYgTlNfRU5VTShOU1VJbnRlZ2VyLCBfVUlDb250ZXh0TWVudUxheW91dCkgewogCiBAaW50
ZXJmYWNlIF9VSUN1cnNvclJlZ2lvbiA6IE5TT2JqZWN0IDxOU0NvcHlpbmc+CiArIChpbnN0YW5j
ZXR5cGUpcmVnaW9uV2l0aElkZW50aWZpZXI6KGlkIDxOU09iamVjdD4paWRlbnRpZmllciByZWN0
OihDR1JlY3QpcmVjdDsKKy0gKGlkIDxOU09iamVjdD4paWRlbnRpZmllcjsKIEBlbmQKIAogQGlu
dGVyZmFjZSBfVUlDdXJzb3IgOiBOU09iamVjdApAQCAtMTE2Niw2ICsxMTgzLDE0IEBAIHR5cGVk
ZWYgTlNfRU5VTShOU1VJbnRlZ2VyLCBfVUlDb250ZXh0TWVudUxheW91dCkgewogKyAoaW5zdGFu
Y2V0eXBlKWxpbmtDdXJzb3I7CiBAZW5kCiAKK0BpbnRlcmZhY2UgX1VJQ3Vyc29yU3R5bGUgOiBO
U09iamVjdAorKyAoaW5zdGFuY2V0eXBlKXN0eWxlV2l0aEN1cnNvcjooX1VJQ3Vyc29yICopY3Vy
c29yIGNvbnN0cmFpbmVkQXhlczooVUlBeGlzKWF4ZXM7CitAZW5kCisKK0BpbnRlcmZhY2UgVUlU
b3VjaCAoKQorLSAoQk9PTClfaXNQb2ludGVyVG91Y2g7CitAZW5kCisKICNlbmRpZiAvLyBVU0Uo
QVBQTEVfSU5URVJOQUxfU0RLKQogCiAjZGVmaW5lIFVJV0tEb2N1bWVudFJlcXVlc3RNYXJrZWRU
ZXh0UmVjdHMgKDEgPDwgNSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv
cy9XS01vdXNlR2VzdHVyZVJlY29nbml6ZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p
b3MvV0tNb3VzZUdlc3R1cmVSZWNvZ25pemVyLm1tCmluZGV4IDg1MTQ5OTIwODhlNGE2M2QyMmVk
NWRiOGI3NmVlMjIxNDRjMDFjZTcuLjhjYjg3Y2U3NjQ1NjEzZDQ4NDBkNThmZGI1ZjljZmI3Mjk3
YzY2YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS01vdXNlR2Vz
dHVyZVJlY29nbml6ZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLTW91
c2VHZXN0dXJlUmVjb2duaXplci5tbQpAQCAtMzAsNiArMzAsNyBAQAogCiAjaW1wb3J0ICJOYXRp
dmVXZWJNb3VzZUV2ZW50LmgiCiAjaW1wb3J0ICJVSUtpdFNQSS5oIgorI2ltcG9ydCA8cGFsL3Nw
aS9pb3MvR3JhcGhpY3NTZXJ2aWNlc1NQSS5oPgogI2ltcG9ydCA8d3RmL09wdGlvbmFsLmg+CiAK
IHN0YXRpYyBPcHRpb25TZXQ8V2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI+IHdlYkV2ZW50TW9k
aWZpZXJzRm9yVUlLZXlNb2RpZmllckZsYWdzKFVJS2V5TW9kaWZpZXJGbGFncyBmbGFncykKQEAg
LTc3LDggKzc4LDggQEAgLSAodm9pZClzZXRWaWV3OihVSVZpZXcgKil2aWV3CiAKICAgICBbc3Vw
ZXIgc2V0Vmlldzp2aWV3XTsKIAotICAgIGlmICh2aWV3Ll93aW5kb3cpIHsKLSAgICAgICAgVUlI
b3ZlckV2ZW50ICpob3ZlckV2ZW50ID0gW1VJQXBwIF9ob3ZlckV2ZW50Rm9yV2luZG93OnZpZXcu
X3dpbmRvd107CisgICAgaWYgKHZpZXcud2luZG93KSB7CisgICAgICAgIFVJSG92ZXJFdmVudCAq
aG92ZXJFdmVudCA9IFtVSUFwcCBfaG92ZXJFdmVudEZvcldpbmRvdzp2aWV3LndpbmRvd107CiAg
ICAgICAgIFtob3ZlckV2ZW50IHNldE5lZWRzSGl0VGVzdFJlc2V0XTsKICAgICB9CiB9Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>394552</attachid>
            <date>2020-03-25 15:38:30 -0700</date>
            <delta_ts>2020-03-27 11:42:59 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-209317-20200325153829.patch</filename>
            <type>text/plain</type>
            <size>2196</size>
            <attacher name="Tim Horton">thorton</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZlOGE5MjRmYjYzODFlNWYz
Nzk3YzdjMjI4MGEwZDg1NGViZmM0NzYuLmQ1NzAzOTUxMTI5Y2JlOGEzNDcyNTRlOGU2NjVmNWM1
NTQ3OGNiOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDMtMjUgIFRpbSBIb3J0
b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVW5hYmxlIHRvIGJ1aWxk
IFdlYktpdCB3aXRoIGlPUyAxMy40IFNESworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MzE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisgICAgICAg
IFN0b3AgZGVmaW5pbmcgc29tZSBVSUtpdCBTUEkgdGhhdCBpcyBub3cgQVBJIChodXJyYXkhKS4K
KwogMjAyMC0wMy0yNSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAg
ICAgU29tZSBXS1dlYlZpZXcuaCBoZWFkZXIgZG9jIGNsZWFudXAuCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxh
dGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IGY1MzFlNDQyMDAyMjIwZjgxYjZkMDdhOTc0
Zjg0NjJjNGU5NDhiZTkuLmM1YmM2YWUyY2Q4MGU4Yjg3NDI5YjY4NzE4MjllYjg5NmUxODY0MzQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCisr
KyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCkBAIC0yMzAsMTAg
KzIzMCwxMiBAQCB0eXBlZGVmIGVudW0gewogICAgIGtVSUtleWJvYXJkSW5wdXRQcmVQcm9jZXNz
ZWQgICAgICAgICAgID0gMSA8PCA3LAogfSBVSUtleWJvYXJkSW5wdXRGbGFnczsKIAorI2lmIFBM
QVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMzA0MDAK
IHR5cGVkZWYgTlNfT1BUSU9OUyhOU0ludGVnZXIsIFVJRXZlbnRCdXR0b25NYXNrKSB7CiAgICAg
VUlFdmVudEJ1dHRvbk1hc2tQcmltYXJ5ID0gMSA8PCAwLAogICAgIFVJRXZlbnRCdXR0b25NYXNr
U2Vjb25kYXJ5ID0gMSA8PCAxLAogfTsKKyNlbmRpZgogCiBAaW50ZXJmYWNlIFVJRXZlbnQgKCkK
IC0gKHZvaWQgKilfaGlkRXZlbnQ7CkBAIC0zNzksMTIgKzM4MSwxNCBAQCB0eXBlZGVmIE5TX0VO
VU0oTlNJbnRlZ2VyLCBVSVNjcm9sbFZpZXdJbmRpY2F0b3JJbnNldEFkanVzdG1lbnRCZWhhdmlv
cikgewogICAgIFVJU2Nyb2xsVmlld0luZGljYXRvckluc2V0QWRqdXN0bWVudE5ldmVyCiB9Owog
CisjaWYgUExBVEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8
IDEzMDQwMAogdHlwZWRlZiBlbnVtIHsKICAgICBVSUF4aXNOZWl0aGVyID0gMCwKICAgICBVSUF4
aXNIb3Jpem9udGFsID0gMSA8PCAwLAogICAgIFVJQXhpc1ZlcnRpY2FsID0gMSA8PCAxLAogICAg
IFVJQXhpc0JvdGggPSAoVUlBeGlzSG9yaXpvbnRhbCB8IFVJQXhpc1ZlcnRpY2FsKSwKIH0gVUlB
eGlzOworI2VuZGlmCiAKIEBpbnRlcmZhY2UgVUlTY3JvbGxWaWV3ICgpCiAtICh2b2lkKV9zdG9w
U2Nyb2xsaW5nQW5kWm9vbWluZ0FuaW1hdGlvbnM7CkBAIC00MTEsNyArNDE1LDkgQEAgdHlwZWRl
ZiBlbnVtIHsKIEBlbmQKIAogQGludGVyZmFjZSBVSUdlc3R1cmVSZWNvZ25pemVyICgpCisjaWYg
UExBVEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEzMDQw
MAogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBnZXR0ZXI9X21vZGlmaWVyRmxhZ3Mp
IFVJS2V5TW9kaWZpZXJGbGFncyBtb2RpZmllckZsYWdzOworI2VuZGlmCiAKIC0gKHZvaWQpX2hv
dmVyRW50ZXJlZDooTlNTZXQ8VUlUb3VjaCAqPiAqKXRvdWNoZXMgd2l0aEV2ZW50OihVSUV2ZW50
ICopZXZlbnQ7CiAtICh2b2lkKV9ob3Zlck1vdmVkOihOU1NldDxVSVRvdWNoICo+ICopdG91Y2hl
cyB3aXRoRXZlbnQ6KFVJRXZlbnQgKilldmVudDsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>394737</attachid>
            <date>2020-03-27 11:43:02 -0700</date>
            <delta_ts>2020-03-27 12:43:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-209317-20200327114301.patch</filename>
            <type>text/plain</type>
            <size>1987</size>
            <attacher name="Tim Horton">thorton</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkyODE5MzRkMWVmM2EyNjYx
NzExYjcwN2UwNWE0ODZiOGYyM2Y0ZWQuLjExYTA0OWMwM2RmYTIyMDU0OTBiNjllZWNkZjM1OTIx
YTYzZmQzNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDMtMjcgIFRpbSBIb3J0
b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVW5hYmxlIHRvIGJ1aWxk
IFdlYktpdCB3aXRoIGlPUyAxMy40IFNESworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MzE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisgICAgICAg
IE9uZSBtb3JlIGF0dGVtcHQuIF9fSVBIT05FX09TX1ZFUlNJT05fTUFYX0FMTE9XRUQgaXMgaW5h
Y2N1cmF0ZS4KKwogMjAyMC0wMy0yNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxl
LmNvbT4KIAogICAgICAgICBEcmFnRGF0YTo6Y29udGFpbnNVUkwoKSBzaG91bGQgYXZvaWQgcmVh
ZGluZyBVUkwgc3RyaW5ncyBmcm9tIHRoZSBwYXN0ZWJvYXJkCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZv
cm0vc3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IDk0ZGZmZDFjYjMxN2I3YmRhMTljNjc5YzQ2NDYx
ODc3ODlhNjVkY2IuLjg0ZThhMjZhZTRmZjYyNjk0ZDEyZjQwYzcxMjI5OGE3MzdjYjU0MTMgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCisrKyBi
L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCkBAIC0yMzEsNyArMjMx
LDcgQEAgdHlwZWRlZiBlbnVtIHsKICAgICBrVUlLZXlib2FyZElucHV0UHJlUHJvY2Vzc2VkICAg
ICAgICAgICA9IDEgPDwgNywKIH0gVUlLZXlib2FyZElucHV0RmxhZ3M7CiAKLSNpZiBQTEFURk9S
TShJT1MpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUFYX0FMTE9XRUQgPCAxMzA0MDAKKyNpZiBQ
TEFURk9STShJT1MpICYmICFkZWZpbmVkKF9fSVBIT05FXzEzXzQpCiB0eXBlZGVmIE5TX09QVElP
TlMoTlNJbnRlZ2VyLCBVSUV2ZW50QnV0dG9uTWFzaykgewogICAgIFVJRXZlbnRCdXR0b25NYXNr
UHJpbWFyeSA9IDEgPDwgMCwKICAgICBVSUV2ZW50QnV0dG9uTWFza1NlY29uZGFyeSA9IDEgPDwg
MSwKQEAgLTM4Miw3ICszODIsNyBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBVSVNjcm9s
bFZpZXdJbmRpY2F0b3JJbnNldEFkanVzdG1lbnRCZWhhdmlvcikgewogICAgIFVJU2Nyb2xsVmll
d0luZGljYXRvckluc2V0QWRqdXN0bWVudE5ldmVyCiB9OwogCi0jaWYgUExBVEZPUk0oSU9TKSAm
JiBfX0lQSE9ORV9PU19WRVJTSU9OX01BWF9BTExPV0VEIDwgMTMwNDAwCisjaWYgUExBVEZPUk0o
SU9TKSAmJiAhZGVmaW5lZChfX0lQSE9ORV8xM180KQogdHlwZWRlZiBlbnVtIHsKICAgICBVSUF4
aXNOZWl0aGVyID0gMCwKICAgICBVSUF4aXNIb3Jpem9udGFsID0gMSA8PCAwLApAQCAtNDE2LDcg
KzQxNiw3IEBAIHR5cGVkZWYgZW51bSB7CiBAZW5kCiAKIEBpbnRlcmZhY2UgVUlHZXN0dXJlUmVj
b2duaXplciAoKQotI2lmIFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhf
QUxMT1dFRCA8IDEzMDQwMAorI2lmIFBMQVRGT1JNKElPUykgJiYgIWRlZmluZWQoX19JUEhPTkVf
MTNfNCkKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSwgZ2V0dGVyPV9tb2RpZmllckZs
YWdzKSBVSUtleU1vZGlmaWVyRmxhZ3MgbW9kaWZpZXJGbGFnczsKICNlbmRpZgogCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>