<?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>226978</bug_id>
          
          <creation_ts>2021-06-14 09:30:50 -0700</creation_ts>
          <short_desc>[Mac] CoreMedia WrapperClass does not need alignment fixup</short_desc>
          <delta_ts>2021-06-15 06:14:05 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Media</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="Eric Carlson">eric.carlson</reporter>
          <assigned_to name="Eric Carlson">eric.carlson</assigned_to>
          <cc>ews-watchlist</cc>
    
    <cc>ggaren</cc>
    
    <cc>glenn</cc>
    
    <cc>jer.noble</cc>
    
    <cc>mitz</cc>
    
    <cc>philipj</cc>
    
    <cc>sergio</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1769430</commentid>
    <comment_count>0</comment_count>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-14 09:30:50 -0700</bug_when>
    <thetext>CoreMedia WrapperClass does not need the alignment fixup required by CMBaseClass</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769431</commentid>
    <comment_count>1</comment_count>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-14 09:31:08 -0700</bug_when>
    <thetext>rdar://78864290</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769481</commentid>
    <comment_count>2</comment_count>
      <attachid>431348</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-14 11:51:12 -0700</bug_when>
    <thetext>Created attachment 431348
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769485</commentid>
    <comment_count>3</comment_count>
      <attachid>431348</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2021-06-14 11:57:34 -0700</bug_when>
    <thetext>Comment on attachment 431348
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769486</commentid>
    <comment_count>4</comment_count>
      <attachid>431348</attachid>
    <who name="">mitz</who>
    <bug_when>2021-06-14 11:57:48 -0700</bug_when>
    <thetext>Comment on attachment 431348
Patch

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

&gt; Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h:158
&gt; +    static constexpr struct { WrapperClass derivedClass; } derivedClass { Wrapped::wrapperClass() };

Don’t really need this to be a struct anymore.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769488</commentid>
    <comment_count>5</comment_count>
      <attachid>431348</attachid>
    <who name="">mitz</who>
    <bug_when>2021-06-14 11:58:30 -0700</bug_when>
    <thetext>Comment on attachment 431348
Patch

Didn’t mean to reset Geoff’s r+ though.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769490</commentid>
    <comment_count>6</comment_count>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2021-06-14 11:59:35 -0700</bug_when>
    <thetext>&gt; &gt; Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h:158
&gt; &gt; +    static constexpr struct { WrapperClass derivedClass; } derivedClass { Wrapped::wrapperClass() };
&gt; 
&gt; Don’t really need this to be a struct anymore.

👍🏻</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769506</commentid>
    <comment_count>7</comment_count>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-14 12:46:58 -0700</bug_when>
    <thetext>(In reply to mitz from comment #4)
&gt; Comment on attachment 431348 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=431348&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h:158
&gt; &gt; +    static constexpr struct { WrapperClass derivedClass; } derivedClass { Wrapped::wrapperClass() };
&gt; 
&gt; Don’t really need this to be a struct anymore.

Good point, thanks!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769514</commentid>
    <comment_count>8</comment_count>
      <attachid>431357</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-14 13:01:05 -0700</bug_when>
    <thetext>Created attachment 431357
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769556</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-14 14:47:08 -0700</bug_when>
    <thetext>Found 1 new test failure: imported/w3c/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769768</commentid>
    <comment_count>10</comment_count>
      <attachid>431357</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-15 06:10:39 -0700</bug_when>
    <thetext>Comment on attachment 431357
Patch

Failing test is unrelated</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769774</commentid>
    <comment_count>11</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-15 06:14:03 -0700</bug_when>
    <thetext>Committed r278870 (238814@main): &lt;https://commits.webkit.org/238814@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 431357.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431348</attachid>
            <date>2021-06-14 11:51:12 -0700</date>
            <delta_ts>2021-06-14 13:01:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226978-20210614115112.patch</filename>
            <type>text/plain</type>
            <size>5927</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGNmYzFjM2JmNGIxNzU2
NWY3ZjQ2ZTljZDc2ZDEzOGEwYzI0YTEwZi4uNGU5Zjc2MTk2Y2FiNzk2NzVmNWFiMzQwZTlkYmNk
MGNjYmY3ODZhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA2LTE0ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIENvcmVN
ZWRpYSBXcmFwcGVyQ2xhc3MgZG9lcyBub3QgbmVlZCBhbGlnbm1lbnQgZml4dXAKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjk3OAorICAgICAgICBy
ZGFyOi8vNzg4NjQyOTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVEZWNvbXByZXNzaW9uU2Vz
c2lvbi5tbToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6
ZW5xdWV1ZVNhbXBsZSk6IHN0YXRpY19hc3NlcnQgQ01CdWZmZXJRdWV1ZVJlZgorICAgICAgICBj
YWxsYmFjayBzdHJ1Y3QgYWxpZ25tZW50IGFuZCB2ZXJzaW9uIHNpemUuCisKIDIwMjEtMDYtMTEg
IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBMYXppbHkgY29tcHV0
ZSBTZWN1cml0eU9yaWdpbjo6bV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkgZm9yIHBlcmZvcm1h
bmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv
Q2hhbmdlTG9nCmluZGV4IGUzM2ZkOWZkYjE4OTU4OTk2NWYxZTc2NWEyZGM2YzRkNzNiNWYxZTAu
Ljk5ZTBmNDYyNzg2OWQ5NzM5MjZlYjgyNWQ1YTBlYzM4MTJmZGRhYWQgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0x
LDMgKzEsMTYgQEAKKzIwMjEtMDYtMTQgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBs
ZS5jb20+CisKKyAgICAgICAgW01hY10gQ29yZU1lZGlhIFdyYXBwZXJDbGFzcyBkb2VzIG5vdCBu
ZWVkIGFsaWdubWVudCBmaXh1cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI2OTc4CisgICAgICAgIHJkYXI6Ly83ODg2NDI5MAorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL21hYy9NZWRpYUZv
cm1hdFJlYWRlci9Db3JlTWVkaWFXcmFwcGVkLmg6CisgICAgICAgIChXZWJLaXQ6OkNvcmVNZWRp
YVdyYXBwZWQ8V3JhcHBlZD46OnZUYWJsZSk6IERvbid0IGFkZCBwYWRkaW5nIHRvIFdyYXBwZXJD
bGFzcywKKyAgICAgICAgaXQgaXNuJ3QgbmVjZXNzYXJ5LiBzdGF0aWNfYXNzZXJ0IENNQmFzZUNs
YXNzIGFuZCBXcmFwcGVyQ2xhc3MgYWxpZ25tZW50IGFuZAorICAgICAgICAudmVyc2lvbiBzaXpl
cy4KKwogMjAyMS0wNi0xMiAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgogCiAgICAg
ICAgIFJFR1JFU1NJT04gKHIyNzgzNzQpOiBbQmlnIFN1cl0gQVNTRVJUSU9OIEZBSUxFRDogIWlz
SW5Sb3V0aW5nQXJiaXRyYXRpb25Gb3JUb2tlbih0b2tlbikgaW4gV2ViQ29yZTo6U2hhcmVkUm91
dGluZ0FyYml0cmF0b3I6OmJlZ2luUm91dGluZ0FyYml0cmF0aW9uRm9yVG9rZW4oKQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZURlY29t
cHJlc3Npb25TZXNzaW9uLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j
b2EvV2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uLm1tCmluZGV4IDA5OGVjMDlhZTNkOWE2N2Ji
MDAxMWZkMTk1YTBmNjQ5MDY0M2U4MmEuLjZkYjQyODQ5ZTI1ZjY5YTE0MWVjZmNlOWViMjBkNWIz
N2RmOTNmNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nv
Y29hL1dlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbi5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9XZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24ubW0KQEAg
LTExOSw3ICsxMTksNyBAQCB2b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6ZW5xdWV1
ZVNhbXBsZShDTVNhbXBsZUJ1ZmZlclJlZiBzYW1wbGVCdWZmZXIsCiAgICAgaWYgKCFtX3Byb2R1
Y2VyUXVldWUpIHsKICAgICAgICAgQ01CdWZmZXJRdWV1ZVJlZiBvdXRRdWV1ZSB7IG51bGxwdHIg
fTsKICNwcmFnbWEgcGFjayhwdXNoLCA0KQotICAgICAgICBzdHJ1Y3QgeyB1aW50OF90IHBhZFtw
YWRTaXplXTsgQ01CdWZmZXJDYWxsYmFja3MgY2FsbGJhY2tzOyB9IGNhbGxiYWNrcyB7IHsgfSwg
eworICAgICAgICBzdHJ1Y3QgQnVmZmVyQ2FsbGJhY2tzIHsgdWludDhfdCBwYWRbcGFkU2l6ZV07
IENNQnVmZmVyQ2FsbGJhY2tzIGNhbGxiYWNrczsgfSBjYWxsYmFja3MgeyB7IH0sIHsKICAgICAg
ICAgICAgIDAsCiAgICAgICAgICAgICBudWxscHRyLAogICAgICAgICAgICAgJmdldERlY29kZVRp
bWUsCkBAIC0xMzEsNiArMTMxLDkgQEAgdm9pZCBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246
OmVucXVldWVTYW1wbGUoQ01TYW1wbGVCdWZmZXJSZWYgc2FtcGxlQnVmZmVyLAogICAgICAgICAg
ICAgbnVsbHB0ciwKICAgICAgICAgfSB9OwogI3ByYWdtYSBwYWNrKHBvcCkKKyAgICAgICAgc3Rh
dGljX2Fzc2VydChhbGlnbm9mKEJ1ZmZlckNhbGxiYWNrcykgPT0gNCwgIkNNQnVmZmVyQ2FsbGJh
Y2tzIHN0cnVjdCBtdXN0IGhhdmUgNCBieXRlIGFsaWdubWVudCIpOworICAgICAgICBzdGF0aWNf
YXNzZXJ0KHNpemVvZihjYWxsYmFja3MuY2FsbGJhY2tzLnZlcnNpb24pID09IHNpemVvZih1aW50
MzJfdCksICJWZXJzaW9uIGZpZWxkIG11c3QgYmUgNCBieXRlcyIpOworCiAgICAgICAgIENNQnVm
ZmVyUXVldWVDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwga01heGltdW1DYXBhY2l0eSwgJmNh
bGxiYWNrcy5jYWxsYmFja3MsICZvdXRRdWV1ZSk7CiAgICAgICAgIG1fcHJvZHVjZXJRdWV1ZSA9
IGFkb3B0Q0Yob3V0UXVldWUpOwogICAgIH0KQEAgLTEzOCw3ICsxNDEsNyBAQCB2b2lkIFdlYkNv
cmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6ZW5xdWV1ZVNhbXBsZShDTVNhbXBsZUJ1ZmZlclJlZiBz
YW1wbGVCdWZmZXIsCiAgICAgaWYgKCFtX2NvbnN1bWVyUXVldWUpIHsKICAgICAgICAgQ01CdWZm
ZXJRdWV1ZVJlZiBvdXRRdWV1ZSB7IG51bGxwdHIgfTsKICNwcmFnbWEgcGFjayhwdXNoLCA0KQot
ICAgICAgICBzdHJ1Y3QgeyB1aW50OF90IHBhZFtwYWRTaXplXTsgQ01CdWZmZXJDYWxsYmFja3Mg
Y2FsbGJhY2tzOyB9IGNhbGxiYWNrcyB7IHsgfSwgeworICAgICAgICBzdHJ1Y3QgQnVmZmVyQ2Fs
bGJhY2tzIHsgdWludDhfdCBwYWRbcGFkU2l6ZV07IENNQnVmZmVyQ2FsbGJhY2tzIGNhbGxiYWNr
czsgfSBjYWxsYmFja3MgeyB7IH0sIHsKICAgICAgICAgICAgIDAsCiAgICAgICAgICAgICBudWxs
cHRyLAogICAgICAgICAgICAgJmdldERlY29kZVRpbWUsCkBAIC0xNTAsNiArMTUzLDkgQEAgdm9p
ZCBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OmVucXVldWVTYW1wbGUoQ01TYW1wbGVCdWZm
ZXJSZWYgc2FtcGxlQnVmZmVyLAogICAgICAgICAgICAgbnVsbHB0ciwKICAgICAgICAgfSB9Owog
I3ByYWdtYSBwYWNrKHBvcCkKKyAgICAgICAgc3RhdGljX2Fzc2VydChzaXplb2YoY2FsbGJhY2tz
LmNhbGxiYWNrcy52ZXJzaW9uKSA9PSBzaXplb2YodWludDMyX3QpLCAiVmVyc2lvbiBmaWVsZCBt
dXN0IGJlIDQgYnl0ZXMuIik7CisgICAgICAgIHN0YXRpY19hc3NlcnQoYWxpZ25vZihCdWZmZXJD
YWxsYmFja3MpID09IDQsICJDTUJ1ZmZlckNhbGxiYWNrcyBzdHJ1Y3QgYWxpZ25tZW50IG11c3Qg
YmUgNC4iKTsKKwogICAgICAgICBDTUJ1ZmZlclF1ZXVlQ3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1
bHQsIGtNYXhpbXVtQ2FwYWNpdHksICZjYWxsYmFja3MuY2FsbGJhY2tzLCAmb3V0UXVldWUpOwog
ICAgICAgICBtX2NvbnN1bWVyUXVldWUgPSBhZG9wdENGKG91dFF1ZXVlKTsKICAgICB9CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvQ29yZU1l
ZGlhV3JhcHBlZC5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL01lZGlhRm9ybWF0UmVhZGVy
L0NvcmVNZWRpYVdyYXBwZWQuaAppbmRleCBjZmVmZTRmZjU4ZTNmNTdlMTJiNjI2NzBjNDA5OWQ3
Njk3OGM3YjA0Li42NGE3MjBiZmM3Y2Q5N2FlYmUwYmFjNWIzMjJlZWQ0ZTRiNjc1OTMyIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvQ29yZU1l
ZGlhV3JhcHBlZC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9NZWRpYUZvcm1hdFJl
YWRlci9Db3JlTWVkaWFXcmFwcGVkLmgKQEAgLTE1NCw4ICsxNTQsMTggQEAgY29uc3QgdHlwZW5h
bWUgQ29yZU1lZGlhV3JhcHBlZDxXcmFwcGVkPjo6V3JhcHBlclZUYWJsZSYgQ29yZU1lZGlhV3Jh
cHBlZDxXcmFwcGUKIAogI3ByYWdtYSBwYWNrKHB1c2gsIDQpCiAgICAgc3RhdGljIGNvbnN0ZXhw
ciBzdHJ1Y3QgeyB1aW50OF90IHBhZFtwYWRTaXplXTsgQ01CYXNlQ2xhc3MgYmFzZUNsYXNzOyB9
IGJhc2VDbGFzcyB7IHsgfSwgd3JhcHBlckNsYXNzPHNpemVvZihXcmFwcGVkKT4oKSB9OwotICAg
IHN0YXRpYyBjb25zdGV4cHIgc3RydWN0IHsgdWludDhfdCBwYWRbcGFkU2l6ZV07IFdyYXBwZXJD
bGFzcyBkZXJpdmVkQ2xhc3M7IH0gZGVyaXZlZENsYXNzIHsgeyB9LCBXcmFwcGVkOjp3cmFwcGVy
Q2xhc3MoKSB9OwogI3ByYWdtYSBwYWNrKHBvcCkKKyAgICBzdGF0aWMgY29uc3RleHByIHN0cnVj
dCB7IFdyYXBwZXJDbGFzcyBkZXJpdmVkQ2xhc3M7IH0gZGVyaXZlZENsYXNzIHsgV3JhcHBlZDo6
d3JhcHBlckNsYXNzKCkgfTsKKworI2lmIENQVShYODZfNjQpCisgICAgc3RhdGljX2Fzc2VydChz
aXplb2YoQ01CYXNlQ2xhc3M6OnZlcnNpb24pICE9IHNpemVvZih2b2lkKiksICJGaWcgc3RydWN0
IGZpeHVwIGlzIHJlcXVpcmVkIGZvciBDTUJhc2VDbGFzcyBvbiBYODZfNjQiKTsKKyAgICBzdGF0
aWNfYXNzZXJ0KHNpemVvZihXcmFwcGVyQ2xhc3M6OnZlcnNpb24pID09IHNpemVvZih2b2lkKiks
ICJGaWcgc3RydWN0IGZpeHVwIGlzIG5vdCByZXF1aXJlZCBmb3IgV3JhcHBlckNsYXNzIG9uIFg4
Nl82NCIpOworI2Vsc2UKKyAgICBzdGF0aWNfYXNzZXJ0KHNpemVvZihDTUJhc2VDbGFzczo6dmVy
c2lvbikgPT0gc2l6ZW9mKHZvaWQqKSwgIkZpZyBzdHJ1Y3QgZml4dXAgb25seSByZXF1aXJlZCBm
b3IgQ01CYXNlQ2xhc3Mgb24gWDg2XzY0Iik7CisgICAgc3RhdGljX2Fzc2VydChzaXplb2YoV3Jh
cHBlckNsYXNzOjp2ZXJzaW9uKSA9PSBzaXplb2Yodm9pZCopLCAiRmlnIHN0cnVjdCBmaXh1cCBv
bmx5IHJlcXVpcmVkIGZvciBXcmFwcGVyQ2xhc3Mgb24gWDg2XzY0Iik7CisjZW5kaWYKKyAgICBz
dGF0aWNfYXNzZXJ0KGFsaWdub2YoQ01CYXNlQ2xhc3MpID09IDQsICJDTUJhc2VDbGFzcyBtdXN0
IGhhdmUgNCBieXRlIGFsaWdubWVudCIpOworICAgIHN0YXRpY19hc3NlcnQoYWxpZ25vZihXcmFw
cGVyQ2xhc3MpID09IHNpemVvZih2b2lkKiksICJXcmFwcGVyQ2xhc3MgbXVzdCBiZSBuYXR1YWxs
eSBhbGlnbmVkIik7CiAKIElHTk9SRV9XQVJOSU5HU19CRUdJTigibWlzc2luZy1maWVsZC1pbml0
aWFsaXplcnMiKQogICAgIHN0YXRpYyBjb25zdGV4cHIgV3JhcHBlclZUYWJsZSB2VGFibGUgewo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431357</attachid>
            <date>2021-06-14 13:01:05 -0700</date>
            <delta_ts>2021-06-15 06:14:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226978-20210614130104.patch</filename>
            <type>text/plain</type>
            <size>6088</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGNmYzFjM2JmNGIxNzU2
NWY3ZjQ2ZTljZDc2ZDEzOGEwYzI0YTEwZi4uMTBmNjE3NDUyNjNjMGFjYmNmNjRjMjhiMWNkMmM2
YjZiYTE2MWUyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA2LTE0ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIENvcmVN
ZWRpYSBXcmFwcGVyQ2xhc3MgZG9lcyBub3QgbmVlZCBhbGlnbm1lbnQgZml4dXAKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjk3OAorICAgICAgICBy
ZGFyOi8vNzg4NjQyOTAKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbiBhbmQg
RGFuIEJlcm5zdGVpbi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNv
cmVEZWNvbXByZXNzaW9uU2Vzc2lvbi5tbToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVEZWNv
bXByZXNzaW9uU2Vzc2lvbjo6ZW5xdWV1ZVNhbXBsZSk6IHN0YXRpY19hc3NlcnQgQ01CdWZmZXJR
dWV1ZVJlZgorICAgICAgICBjYWxsYmFjayBzdHJ1Y3QgYWxpZ25tZW50IGFuZCB2ZXJzaW9uIHNp
emUuCisKIDIwMjEtMDYtMTEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAg
ICAgICBMYXppbHkgY29tcHV0ZSBTZWN1cml0eU9yaWdpbjo6bV9pc1BvdGVudGlhbGx5VHJ1c3R3
b3J0aHkgZm9yIHBlcmZvcm1hbmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv
ZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUzM2ZkOWZkYjE4OTU4OTk2NWYxZTc2
NWEyZGM2YzRkNzNiNWYxZTAuLjkyMmU3YmQ5OTFiNTI5MDljNTA5ZGY1ZjhlYzQ5YTRiNWQ2YWFk
Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDYtMTQgIEVyaWMgQ2FybHNvbiAg
PGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gQ29yZU1lZGlhIFdyYXBw
ZXJDbGFzcyBkb2VzIG5vdCBuZWVkIGFsaWdubWVudCBmaXh1cAorICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2OTc4CisgICAgICAgIHJkYXI6Ly83ODg2
NDI5MAorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuIGFuZCBEYW4gQmVybnN0
ZWluLgorCisgICAgICAgICogU2hhcmVkL21hYy9NZWRpYUZvcm1hdFJlYWRlci9Db3JlTWVkaWFX
cmFwcGVkLmg6CisgICAgICAgIChXZWJLaXQ6OkNvcmVNZWRpYVdyYXBwZWQ8V3JhcHBlZD46OnZU
YWJsZSk6IERvbid0IGFkZCBwYWRkaW5nIHRvIFdyYXBwZXJDbGFzcywKKyAgICAgICAgaXQgaXNu
J3QgbmVjZXNzYXJ5LiBzdGF0aWNfYXNzZXJ0IENNQmFzZUNsYXNzIGFuZCBXcmFwcGVyQ2xhc3Mg
YWxpZ25tZW50IGFuZAorICAgICAgICAudmVyc2lvbiBzaXplcy4KKwogMjAyMS0wNi0xMiAgUGVu
ZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNzgz
NzQpOiBbQmlnIFN1cl0gQVNTRVJUSU9OIEZBSUxFRDogIWlzSW5Sb3V0aW5nQXJiaXRyYXRpb25G
b3JUb2tlbih0b2tlbikgaW4gV2ViQ29yZTo6U2hhcmVkUm91dGluZ0FyYml0cmF0b3I6OmJlZ2lu
Um91dGluZ0FyYml0cmF0aW9uRm9yVG9rZW4oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uLm1tIGIv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZURlY29tcHJlc3Np
b25TZXNzaW9uLm1tCmluZGV4IDA5OGVjMDlhZTNkOWE2N2JiMDAxMWZkMTk1YTBmNjQ5MDY0M2U4
MmEuLmNlYTE1NmFlMmZiZTI1YWRhMDA3NjY4ZTkxZDUwZTU2MWM2NDJlNGUgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVEZWNvbXByZXNz
aW9uU2Vzc2lvbi5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2Nv
YS9XZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24ubW0KQEAgLTExOSw3ICsxMTksNyBAQCB2b2lk
IFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6ZW5xdWV1ZVNhbXBsZShDTVNhbXBsZUJ1ZmZl
clJlZiBzYW1wbGVCdWZmZXIsCiAgICAgaWYgKCFtX3Byb2R1Y2VyUXVldWUpIHsKICAgICAgICAg
Q01CdWZmZXJRdWV1ZVJlZiBvdXRRdWV1ZSB7IG51bGxwdHIgfTsKICNwcmFnbWEgcGFjayhwdXNo
LCA0KQotICAgICAgICBzdHJ1Y3QgeyB1aW50OF90IHBhZFtwYWRTaXplXTsgQ01CdWZmZXJDYWxs
YmFja3MgY2FsbGJhY2tzOyB9IGNhbGxiYWNrcyB7IHsgfSwgeworICAgICAgICBzdHJ1Y3QgQnVm
ZmVyQ2FsbGJhY2tzIHsgdWludDhfdCBwYWRbcGFkU2l6ZV07IENNQnVmZmVyQ2FsbGJhY2tzIGNh
bGxiYWNrczsgfSBjYWxsYmFja3MgeyB7IH0sIHsKICAgICAgICAgICAgIDAsCiAgICAgICAgICAg
ICBudWxscHRyLAogICAgICAgICAgICAgJmdldERlY29kZVRpbWUsCkBAIC0xMzEsNiArMTMxLDkg
QEAgdm9pZCBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OmVucXVldWVTYW1wbGUoQ01TYW1w
bGVCdWZmZXJSZWYgc2FtcGxlQnVmZmVyLAogICAgICAgICAgICAgbnVsbHB0ciwKICAgICAgICAg
fSB9OwogI3ByYWdtYSBwYWNrKHBvcCkKKyAgICAgICAgc3RhdGljX2Fzc2VydChzaXplb2YoY2Fs
bGJhY2tzLmNhbGxiYWNrcy52ZXJzaW9uKSA9PSBzaXplb2YodWludDMyX3QpLCAiVmVyc2lvbiBm
aWVsZCBtdXN0IGJlIDQgYnl0ZXMiKTsKKyAgICAgICAgc3RhdGljX2Fzc2VydChhbGlnbm9mKEJ1
ZmZlckNhbGxiYWNrcykgPT0gNCwgIkNNQnVmZmVyQ2FsbGJhY2tzIHN0cnVjdCBtdXN0IGhhdmUg
NCBieXRlIGFsaWdubWVudCIpOworCiAgICAgICAgIENNQnVmZmVyUXVldWVDcmVhdGUoa0NGQWxs
b2NhdG9yRGVmYXVsdCwga01heGltdW1DYXBhY2l0eSwgJmNhbGxiYWNrcy5jYWxsYmFja3MsICZv
dXRRdWV1ZSk7CiAgICAgICAgIG1fcHJvZHVjZXJRdWV1ZSA9IGFkb3B0Q0Yob3V0UXVldWUpOwog
ICAgIH0KQEAgLTEzOCw3ICsxNDEsNyBAQCB2b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lv
bjo6ZW5xdWV1ZVNhbXBsZShDTVNhbXBsZUJ1ZmZlclJlZiBzYW1wbGVCdWZmZXIsCiAgICAgaWYg
KCFtX2NvbnN1bWVyUXVldWUpIHsKICAgICAgICAgQ01CdWZmZXJRdWV1ZVJlZiBvdXRRdWV1ZSB7
IG51bGxwdHIgfTsKICNwcmFnbWEgcGFjayhwdXNoLCA0KQotICAgICAgICBzdHJ1Y3QgeyB1aW50
OF90IHBhZFtwYWRTaXplXTsgQ01CdWZmZXJDYWxsYmFja3MgY2FsbGJhY2tzOyB9IGNhbGxiYWNr
cyB7IHsgfSwgeworICAgICAgICBzdHJ1Y3QgQnVmZmVyQ2FsbGJhY2tzIHsgdWludDhfdCBwYWRb
cGFkU2l6ZV07IENNQnVmZmVyQ2FsbGJhY2tzIGNhbGxiYWNrczsgfSBjYWxsYmFja3MgeyB7IH0s
IHsKICAgICAgICAgICAgIDAsCiAgICAgICAgICAgICBudWxscHRyLAogICAgICAgICAgICAgJmdl
dERlY29kZVRpbWUsCkBAIC0xNTAsNiArMTUzLDkgQEAgdm9pZCBXZWJDb3JlRGVjb21wcmVzc2lv
blNlc3Npb246OmVucXVldWVTYW1wbGUoQ01TYW1wbGVCdWZmZXJSZWYgc2FtcGxlQnVmZmVyLAog
ICAgICAgICAgICAgbnVsbHB0ciwKICAgICAgICAgfSB9OwogI3ByYWdtYSBwYWNrKHBvcCkKKyAg
ICAgICAgc3RhdGljX2Fzc2VydChzaXplb2YoY2FsbGJhY2tzLmNhbGxiYWNrcy52ZXJzaW9uKSA9
PSBzaXplb2YodWludDMyX3QpLCAiVmVyc2lvbiBmaWVsZCBtdXN0IGJlIDQgYnl0ZXMiKTsKKyAg
ICAgICAgc3RhdGljX2Fzc2VydChhbGlnbm9mKEJ1ZmZlckNhbGxiYWNrcykgPT0gNCwgIkNNQnVm
ZmVyQ2FsbGJhY2tzIHN0cnVjdCBhbGlnbm1lbnQgbXVzdCBiZSA0Iik7CisKICAgICAgICAgQ01C
dWZmZXJRdWV1ZUNyZWF0ZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBrTWF4aW11bUNhcGFjaXR5LCAm
Y2FsbGJhY2tzLmNhbGxiYWNrcywgJm91dFF1ZXVlKTsKICAgICAgICAgbV9jb25zdW1lclF1ZXVl
ID0gYWRvcHRDRihvdXRRdWV1ZSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9T
aGFyZWQvbWFjL01lZGlhRm9ybWF0UmVhZGVyL0NvcmVNZWRpYVdyYXBwZWQuaCBiL1NvdXJjZS9X
ZWJLaXQvU2hhcmVkL21hYy9NZWRpYUZvcm1hdFJlYWRlci9Db3JlTWVkaWFXcmFwcGVkLmgKaW5k
ZXggY2ZlZmU0ZmY1OGUzZjU3ZTEyYjYyNjcwYzQwOTlkNzY5NzhjN2IwNC4uNDEwZmI4MDczMWFj
YjAzMGJmYWE1OGQxOGU4YTEzMzc2MWU0NjRmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9T
aGFyZWQvbWFjL01lZGlhRm9ybWF0UmVhZGVyL0NvcmVNZWRpYVdyYXBwZWQuaAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvQ29yZU1lZGlhV3JhcHBlZC5o
CkBAIC0xNTQsMTMgKzE1NCwyMyBAQCBjb25zdCB0eXBlbmFtZSBDb3JlTWVkaWFXcmFwcGVkPFdy
YXBwZWQ+OjpXcmFwcGVyVlRhYmxlJiBDb3JlTWVkaWFXcmFwcGVkPFdyYXBwZQogCiAjcHJhZ21h
IHBhY2socHVzaCwgNCkKICAgICBzdGF0aWMgY29uc3RleHByIHN0cnVjdCB7IHVpbnQ4X3QgcGFk
W3BhZFNpemVdOyBDTUJhc2VDbGFzcyBiYXNlQ2xhc3M7IH0gYmFzZUNsYXNzIHsgeyB9LCB3cmFw
cGVyQ2xhc3M8c2l6ZW9mKFdyYXBwZWQpPigpIH07Ci0gICAgc3RhdGljIGNvbnN0ZXhwciBzdHJ1
Y3QgeyB1aW50OF90IHBhZFtwYWRTaXplXTsgV3JhcHBlckNsYXNzIGRlcml2ZWRDbGFzczsgfSBk
ZXJpdmVkQ2xhc3MgeyB7IH0sIFdyYXBwZWQ6OndyYXBwZXJDbGFzcygpIH07CiAjcHJhZ21hIHBh
Y2socG9wKQorICAgIHN0YXRpYyBjb25zdGV4cHIgV3JhcHBlckNsYXNzIGRlcml2ZWRDbGFzcyA9
IFdyYXBwZWQ6OndyYXBwZXJDbGFzcygpOworCisjaWYgQ1BVKFg4Nl82NCkKKyAgICBzdGF0aWNf
YXNzZXJ0KHNpemVvZihDTUJhc2VDbGFzczo6dmVyc2lvbikgIT0gc2l6ZW9mKHZvaWQqKSwgIkZp
ZyBzdHJ1Y3QgZml4dXAgaXMgcmVxdWlyZWQgZm9yIENNQmFzZUNsYXNzIG9uIFg4Nl82NCIpOwor
ICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKFdyYXBwZXJDbGFzczo6dmVyc2lvbikgPT0gc2l6ZW9m
KHZvaWQqKSwgIkZpZyBzdHJ1Y3QgZml4dXAgaXMgbm90IHJlcXVpcmVkIGZvciBXcmFwcGVyQ2xh
c3Mgb24gWDg2XzY0Iik7CisjZWxzZQorICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKENNQmFzZUNs
YXNzOjp2ZXJzaW9uKSA9PSBzaXplb2Yodm9pZCopLCAiRmlnIHN0cnVjdCBmaXh1cCBvbmx5IHJl
cXVpcmVkIGZvciBDTUJhc2VDbGFzcyBvbiBYODZfNjQiKTsKKyAgICBzdGF0aWNfYXNzZXJ0KHNp
emVvZihXcmFwcGVyQ2xhc3M6OnZlcnNpb24pID09IHNpemVvZih2b2lkKiksICJGaWcgc3RydWN0
IGZpeHVwIG9ubHkgcmVxdWlyZWQgZm9yIFdyYXBwZXJDbGFzcyBvbiBYODZfNjQiKTsKKyNlbmRp
ZgorICAgIHN0YXRpY19hc3NlcnQoYWxpZ25vZihDTUJhc2VDbGFzcykgPT0gNCwgIkNNQmFzZUNs
YXNzIG11c3QgaGF2ZSA0IGJ5dGUgYWxpZ25tZW50Iik7CisgICAgc3RhdGljX2Fzc2VydChhbGln
bm9mKFdyYXBwZXJDbGFzcykgPT0gc2l6ZW9mKHZvaWQqKSwgIldyYXBwZXJDbGFzcyBtdXN0IGJl
IG5hdHVhbGx5IGFsaWduZWQiKTsKIAogSUdOT1JFX1dBUk5JTkdTX0JFR0lOKCJtaXNzaW5nLWZp
ZWxkLWluaXRpYWxpemVycyIpCiAgICAgc3RhdGljIGNvbnN0ZXhwciBXcmFwcGVyVlRhYmxlIHZU
YWJsZSB7CiAgICAgICAgIHsgbnVsbHB0ciwgJmJhc2VDbGFzcy5iYXNlQ2xhc3MgfSwKLSAgICAg
ICAgJmRlcml2ZWRDbGFzcy5kZXJpdmVkQ2xhc3MsCisgICAgICAgICZkZXJpdmVkQ2xhc3MKICAg
ICB9OwogSUdOT1JFX1dBUk5JTkdTX0VORAogICAgIHJldHVybiB2VGFibGU7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>