224016 2021-03-31 14:10:48 -0700 REGRESSION (Metal ANGLE): [Catalina] 6 consistent WebGL failures / timeouts 2021-04-12 15:41:42 -0700 1 1 1 Unclassified WebKit WebGL WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ryanhaddad dino dino ews-watchlist graouts kbr kkinnunen kondapallykalyan webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1745773 0 ryanhaddad 2021-03-31 14:10:48 -0700 The following WebGL tests have been consistently timing out or failing on Catalina bots since Metal backed ANGLE Failing: webgl/2.0.0/conformance2/buffers/one-large-uniform-buffer.html +[ 4: FAIL ] canvas should be same as input uniform at (0, 0) expected: 127,191,64,255 was 0,0,0,0 webgl/2.0.0/conformance2/buffers/uniform-buffers.html +[ 19: FAIL ] draw call should set canvas to red at (0, 0) expected: 255,0,0,255 was 255,255,255,255 +[ 20: FAIL ] draw call should set canvas to blue at (0, 0) expected: 0,0,255,255 was 255,255,255,255 +[ 25: FAIL ] draw call should set canvas to red at (0, 0) expected: 255,0,0,255 was 0,0,0,255 +[ 26: FAIL ] draw call should set canvas to blue at (0, 0) expected: 0,0,255,255 was 0,0,0,255 +[ 33: FAIL ] draw call should set canvas to (0.5, 0, 0.5) at (0, 0) expected: 127,0,127,255 was 0,0,0,255 +[ 34: FAIL ] draw call should set canvas to (0, 0.5, 1) at (0, 0) expected: 0,127,255,255 was 0,0,0,255 Timing out webgl/1.0.3/conformance/ogles/GL/all/all_001_to_004.html webgl/1.0.3/conformance/ogles/GL/any/any_001_to_004.html webgl/2.0.0/conformance/ogles/GL/all/all_001_to_004.html webgl/2.0.0/conformance/ogles/GL/any/any_001_to_004.html https://build.webkit.org/results/Apple-Catalina-Release-WK2-Tests/r275299%20(1431)/results.html https://results.webkit.org/?suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&test=webgl%2F1.0.3%2Fconformance%2Fogles%2FGL%2Fall%2Fall_001_to_004.html&test=webgl%2F1.0.3%2Fconformance%2Fogles%2FGL%2Fany%2Fany_001_to_004.html&test=webgl%2F2.0.0%2Fconformance%2Fogles%2FGL%2Fall%2Fall_001_to_004.html&test=webgl%2F2.0.0%2Fconformance%2Fogles%2FGL%2Fany%2Fany_001_to_004.html&test=webgl%2F2.0.0%2Fconformance2%2Fbuffers%2Fone-large-uniform-buffer.html&test=webgl%2F2.0.0%2Fconformance2%2Fbuffers%2Funiform-buffers.html 1745774 1 webkit-bug-importer 2021-03-31 14:11:12 -0700 <rdar://problem/76070325> 1745862 2 ryanhaddad 2021-03-31 17:12:53 -0700 Marked tests as failing/skipped in https://trac.webkit.org/changeset/275321/webkit 1749381 3 425791 dino 2021-04-12 14:18:02 -0700 Created attachment 425791 Patch 1749382 4 ews-watchlist 2021-04-12 14:19:01 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1749416 5 ews-feeder 2021-04-12 15:41:40 -0700 Committed r275841 (236409@main): <https://commits.webkit.org/236409@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425791. 425791 2021-04-12 14:18:02 -0700 2021-04-12 15:41:41 -0700 Patch bug-224016-20210413071800.patch text/plain 14920 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggY2NmOGIxMmY4NDg1M2NiZWMzY2VhYWU0ZWUwOTMxMWVkMTJmNDcwMy4uNjUxYmJhYjUyYjc1 Yzc4Mjk0Yzg5NjdhYjdlMjAyODE4NzliY2Y4NiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTA0LTEyICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxl LmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChNZXRhbCBBTkdMRSk6IFtDYXRhbGluYV0gNiBj b25zaXN0ZW50IFdlYkdMIGZhaWx1cmVzIC8gdGltZW91dHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDAxNgorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNzYwNzAzMjU+CisKKyAgICAgICAgUGF0Y2ggYnkgSm9obiBDdW5uaW5naGFtIDxqb2huY3Vu bmlnaGFtQGFwcGxlLmNvbT4KKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW1wbGVtZW50IGEgd29ya2Fyb3VuZCBmb3IgSW50ZWwgR1BVcyB3aGVyZSB3ZSBl eHBsaWNpdGx5IHR5cGUgY2FzdCBmbG9hdGluZworICAgICAgICBwb2ludCB2YWx1ZXMgdG8gYm9v bGVhbnMuIFRoaXMgaXMgb25seSBuZWVkZWQgZm9yIENhdGFsaW5hIHN5c3RlbXMuCisKKyAgICAg ICAgKiBpbmNsdWRlL0dMU0xBTkcvU2hhZGVyTGFuZy5oOgorICAgICAgICAqIGluY2x1ZGUvcGxh dGZvcm0vRmVhdHVyZXNNdGwuaDoKKyAgICAgICAgKiBzcmMvY29tcGlsZXIvdHJhbnNsYXRvci9U cmFuc2xhdG9yTWV0YWxEaXJlY3QuY3BwOgorICAgICAgICAoc2g6OlRyYW5zbGF0b3JNZXRhbERp cmVjdDo6dHJhbnNsYXRlSW1wbCk6CisgICAgICAgICogc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3Iv VHJhbnNsYXRvck1ldGFsRGlyZWN0L0FkZEV4cGxpY2l0VHlwZUNhc3RzLmNwcDoKKyAgICAgICAg KHNoOjpSZXdyaXRlcjo6UmV3cml0ZXIpOgorICAgICAgICAoc2g6OkFkZEV4cGxpY2l0VHlwZUNh c3RzKToKKyAgICAgICAgKiBzcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxE aXJlY3QvQWRkRXhwbGljaXRUeXBlQ2FzdHMuaDoKKyAgICAgICAgKiBzcmMvY29tcGlsZXIvdHJh bnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvQXN0SGVscGVycy5jcHA6CisgICAgICAgIChz aDo6U3ViVmVjdG9yKToKKyAgICAgICAgKHNoOjpDb2VyY2VTaW1wbGUpOgorICAgICAgICAqIHNy Yy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9Bc3RIZWxwZXJzLmg6 CisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0Rpc3BsYXlNdGwubW06Cisg ICAgICAgIChyeDo6RGlzcGxheU10bDo6aW5pdGlhbGl6ZUZlYXR1cmVzKToKKyAgICAgICAgKiBz cmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvU2hhZGVyTXRsLm1tOgorICAgICAgICAocng6OlNo YWRlck10bDo6Y29tcGlsZSk6CisKIDIwMjEtMDQtMTIgIEt5bGUgUGlkZGluZ3RvbiAgPGtwaWRk aW5ndG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCBpbiB3ZWJnbC8yLjAueS9jb25mb3Jt YW5jZS9nbHNsL21pc2MvdW5pbml0aWFsaXplZC1sb2NhbC1nbG9iYWwtdmFyaWFibGVzLmh0bWwg QU5HTEUrTUVUQUwKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUv R0xTTEFORy9TaGFkZXJMYW5nLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRlL0dM U0xBTkcvU2hhZGVyTGFuZy5oCmluZGV4IDZmNmE3MmI5YWI2ZGQ3MjI4N2Q4MmQ2Y2ZiMjA4MTEy MjdmNmE3NDAuLjBjZmRhZjRhZWI3OTdkY2U3Nzk3NmJkMDA2MmVkZTQ4NTFlZmQwNTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUvR0xTTEFORy9TaGFkZXJMYW5n LmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9HTFNMQU5HL1NoYWRlckxh bmcuaApAQCAtMzQ0LDYgKzM0NCw5IEBAIGNvbnN0IFNoQ29tcGlsZU9wdGlvbnMgU0hfRUFSTFlf RlJBR01FTlRfVEVTVFNfT1BUSU1JWkFUSU9OID0gVUlOVDY0X0MoMSkgPDwgNTU7CiAvLyBBbGxv dyBjb21waWxlciB0byBpbnNlcnQgQW5kcm9pZCBwcmUtcm90YXRpb24gY29kZS4KIGNvbnN0IFNo Q29tcGlsZU9wdGlvbnMgU0hfQUREX1BSRV9ST1RBVElPTiA9IFVJTlQ2NF9DKDEpIDw8IDU2Owog CisvLyBJbnNlcnQgZXhwbGljaXQgY2FzdHMgZm9yIGZsb2F0L2RvdWJsZS91bnNpZ25lZC9zaWdu ZWQgaW50IG9uIG1hY09TIDEwLjE1IHdpdGggSW50ZWwgZHJpdmVyCitjb25zdCBTaENvbXBpbGVP cHRpb25zIFNIX0FERF9FWFBMSUNJVF9CT09MX0NBU1RTID0gVUlOVDY0X0MoMSkgPDwgNTc7CisK IC8vIERlZmluZXMgYWx0ZXJuYXRlIHN0cmF0ZWdpZXMgZm9yIGltcGxlbWVudGluZyBhcnJheSBp bmRleCBjbGFtcGluZy4KIGVudW0gU2hBcnJheUluZGV4Q2xhbXBpbmdTdHJhdGVneQogewpkaWZm IC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0dXJl c010bC5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0dXJl c010bC5oCmluZGV4IGI2MzdiNGFiNDc0OGJmYWU1MjNhNTFlMGRjNjNkZDFmYjJmZjFlNDUuLmNm MDViNTRiMDE2NjFkNTVkNjA5ZmZjOTZlN2Y1YjM1ZDMyYWRhYmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUvcGxhdGZvcm0vRmVhdHVyZXNNdGwuaAorKysgYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRlL3BsYXRmb3JtL0ZlYXR1cmVzTXRsLmgKQEAg LTEyNSw2ICsxMjUsMTEgQEAgc3RydWN0IEZlYXR1cmVzTXRsIDogRmVhdHVyZVNldEJhc2UKICAg ICAgICAgICAgICJpbnRlbF90aGluX21pcG1hcF93b3JrYXJvdW5kIiwgRmVhdHVyZUNhdGVnb3J5 OjpNZXRhbFdvcmthcm91bmRzLAogICAgICAgICAgICAgIkdlbmVyYXRlIG1pcG1hcHMgZm9yIHRo aW4gKDw1IHBpeGVsKSB3aWRlIHRleHR1cmVzIG9uIHRoZSBDUFUgZm9yIEludGVsIiwKICAgICAg ICAgICAgICZtZW1iZXJzfTsKKyAgICAKKyAgICBGZWF0dXJlIGludGVsRXhwbGljaXRCb29sQ2Fz dFdvcmthcm91bmQgPSB7CisgICAgICAgICAgICAiaW50ZWxfZXhwbGljaXRfYm9vbF9jYXN0X3dv cmthcm91bmQiLCBGZWF0dXJlQ2F0ZWdvcnk6Ok1ldGFsV29ya2Fyb3VuZHMsCisgICAgICAgICAg ICAiSW5zZXJ0IGV4cGxpY2l0IGNhc3RzIGZvciBmbG9hdC9kb3VibGUvdW5zaWduZWQvc2lnbmVk IGludCBvbiBtYWNPUyAxMC4xNSB3aXRoIEludGVsIGRyaXZlciIsCisgICAgICAgICAgICAmbWVt YmVyc307CiB9OwogCiB9ICAvLyBuYW1lc3BhY2UgYW5nbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERp cmVjdC5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRv ci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QuY3BwCmluZGV4IDM5OWRkZGNkM2Q2ZjdjOTgzZjU5NDM3 YTkwN2E0ZDZjM2M2NTgwOGMuLjFlZDI5NDFlZTIwMzIwZmJiOWEzYjY3YTRjYjIzOGRmNDJhN2Fl NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFu c2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkv QU5HTEUvc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0LmNwcApA QCAtMTQ1Myw4ICsxNDUzLDggQEAgYm9vbCBUcmFuc2xhdG9yTWV0YWxEaXJlY3Q6OnRyYW5zbGF0 ZUltcGwoVEludGVybUJsb2NrICZyb290LCBTaENvbXBpbGVPcHRpb25zIGMKICAgICB7CiAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICB9Ci0KLSAgICBpZiAoIUFkZEV4cGxpY2l0VHlwZUNhc3Rz KCp0aGlzLCByb290LCBzeW1ib2xFbnYpKQorICAgIGNvbnN0IGJvb2wgbmVlZHNFeHBsaWNpdEJv b2xDYXN0cyA9IChjb21waWxlT3B0aW9ucyAmIFNIX0FERF9FWFBMSUNJVF9CT09MX0NBU1RTKSAh PSAwOworICAgIGlmICghQWRkRXhwbGljaXRUeXBlQ2FzdHMoKnRoaXMsIHJvb3QsIHN5bWJvbEVu diwgbmVlZHNFeHBsaWNpdEJvb2xDYXN0cykpCiAgICAgewogICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVy L3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L0FkZEV4cGxpY2l0VHlwZUNhc3RzLmNw cCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5z bGF0b3JNZXRhbERpcmVjdC9BZGRFeHBsaWNpdFR5cGVDYXN0cy5jcHAKaW5kZXggNTM0MTE4MGE5 MDA0NDIxZWJiNTMyZmYxOGMzMzRkODZhNmU2Y2RjNS4uOGNhZTZiODgyOWNhYjI3YTJhMDhhZTVj MTk2ZmQ0NWM2ZWM2ZjQyZiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L0FkZEV4cGxpY2l0VHlw ZUNhc3RzLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJh bnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvQWRkRXhwbGljaXRUeXBlQ2FzdHMuY3BwCkBA IC0xNiwxMCArMTYsMTEgQEAgbmFtZXNwYWNlCiBjbGFzcyBSZXdyaXRlciA6IHB1YmxpYyBUSW50 ZXJtUmVidWlsZAogewogICAgIFN5bWJvbEVudiAmbVN5bWJvbEVudjsKKyAgICBib29sIG1OZWVk c0V4cGxpY2l0Qm9vbENhc3RzID0gZmFsc2U7CiAKICAgcHVibGljOgotICAgIFJld3JpdGVyKFRD b21waWxlciAmY29tcGlsZXIsIFN5bWJvbEVudiAmc3ltYm9sRW52KQotICAgICAgICA6IFRJbnRl cm1SZWJ1aWxkKGNvbXBpbGVyLCBmYWxzZSwgdHJ1ZSksIG1TeW1ib2xFbnYoc3ltYm9sRW52KQor ICAgIFJld3JpdGVyKFRDb21waWxlciAmY29tcGlsZXIsIFN5bWJvbEVudiAmc3ltYm9sRW52LCBi b29sIG5lZWRzRXhwbGljaXRCb29sQ2FzdHMpCisgICAgICAgIDogVEludGVybVJlYnVpbGQoY29t cGlsZXIsIGZhbHNlLCB0cnVlKSwgbVN5bWJvbEVudihzeW1ib2xFbnYpLCBtTmVlZHNFeHBsaWNp dEJvb2xDYXN0cyhuZWVkc0V4cGxpY2l0Qm9vbENhc3RzKQogICAgIHt9CiAKICAgICBQb3N0UmVz dWx0IHZpc2l0QWdncmVnYXRlUG9zdChUSW50ZXJtQWdncmVnYXRlICZjYWxsTm9kZSkgb3ZlcnJp ZGUKQEAgLTg0LDkgKzg1LDkgQEAgY2xhc3MgUmV3cml0ZXIgOiBwdWJsaWMgVEludGVybVJlYnVp bGQKIAogfSAgLy8gYW5vbnltb3VzIG5hbWVzcGFjZQogCi1ib29sIHNoOjpBZGRFeHBsaWNpdFR5 cGVDYXN0cyhUQ29tcGlsZXIgJmNvbXBpbGVyLCBUSW50ZXJtQmxvY2sgJnJvb3QsIFN5bWJvbEVu diAmc3ltYm9sRW52KQorYm9vbCBzaDo6QWRkRXhwbGljaXRUeXBlQ2FzdHMoVENvbXBpbGVyICZj b21waWxlciwgVEludGVybUJsb2NrICZyb290LCBTeW1ib2xFbnYgJnN5bWJvbEVudiwgYm9vbCBu ZWVkc0V4cGxpY2l0Qm9vbENhc3RzKQogewotICAgIFJld3JpdGVyIHJld3JpdGVyKGNvbXBpbGVy LCBzeW1ib2xFbnYpOworICAgIFJld3JpdGVyIHJld3JpdGVyKGNvbXBpbGVyLCBzeW1ib2xFbnYs IG5lZWRzRXhwbGljaXRCb29sQ2FzdHMpOwogICAgIGlmICghcmV3cml0ZXIucmVidWlsZFJvb3Qo cm9vdCkpCiAgICAgewogICAgICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxE aXJlY3QvQWRkRXhwbGljaXRUeXBlQ2FzdHMuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9BZGRFeHBsaWNpdFR5 cGVDYXN0cy5oCmluZGV4IDUwMzQyODg5YTZmMmU2ZWNjNzE1YTUyNzU3MzgxMmMyMWVjOTJlN2Qu LjUxYjVmN2YzODAwNGI5ODk3YjdkMjdlYmNlOTFjZDAxMzE3MjQ2MGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JN ZXRhbERpcmVjdC9BZGRFeHBsaWNpdFR5cGVDYXN0cy5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9BZGRF eHBsaWNpdFR5cGVDYXN0cy5oCkBAIC0xNyw3ICsxNyw4IEBAIG5hbWVzcGFjZSBzaAogLy8gQWRk cyBleHBsaWNpdCB0eXBlIGNhc3RzIGludG8gdGhlIEFTVCB3aGVyZSBjYXN0aW5nIGlzIGRvbmUg aW1wbGljaXRseS4KIEFOR0xFX05PX0RJU0NBUkQgYm9vbCBBZGRFeHBsaWNpdFR5cGVDYXN0cyhU Q29tcGlsZXIgJmNvbXBpbGVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFRJbnRlcm1CbG9jayAmcm9vdCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBTeW1ib2xFbnYgJnN5bWJvbEVudik7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgU3ltYm9sRW52ICZzeW1ib2xFbnYsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBuZWVkc0V4cGxpY2l0Qm9vbENh c3RzKTsKIAogfSAgLy8gbmFtZXNwYWNlIHNoCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9B c3RIZWxwZXJzLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFu c2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9Bc3RIZWxwZXJzLmNwcAppbmRleCA0YmE0ZWM3 N2RlYmRjZmI3MWY1MDUzMTYzZDZhZGJiMWRhOGE0YjhkLi5iMzg5Y2QyNTRiOGJmMmYzNmI2NTNl MWZkZjVhYzgzODQ0MjU3ZmJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvQXN0SGVscGVycy5j cHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3Iv VHJhbnNsYXRvck1ldGFsRGlyZWN0L0FzdEhlbHBlcnMuY3BwCkBAIC0yNzMsNyArMjczLDcgQEAg VEludGVybVR5cGVkICZzaDo6U3ViVmVjdG9yKFRJbnRlcm1UeXBlZCAmdmVjdG9yTm9kZSwgaW50 IGJlZ2luLCBpbnQgZW5kKQogICAgIH0KICAgICBUVmVjdG9yPGludD4gb2Zmc2V0cyhzdGF0aWNf Y2FzdDxzaXplX3Q+KGVuZCAtIGJlZ2luKSk7CiAgICAgc3RkOjppb3RhKG9mZnNldHMuYmVnaW4o KSwgb2Zmc2V0cy5lbmQoKSwgYmVnaW4pOwotICAgIGF1dG8gKnN3aXp6bGUgPSBuZXcgVEludGVy bVN3aXp6bGUoJnZlY3Rvck5vZGUsIG9mZnNldHMpOworICAgIGF1dG8gKnN3aXp6bGUgPSBuZXcg VEludGVybVN3aXp6bGUodmVjdG9yTm9kZS5kZWVwQ29weSgpLCBvZmZzZXRzKTsKICAgICByZXR1 cm4gKnN3aXp6bGU7CiB9CiAKQEAgLTQyMCwxOCArNDIwLDQ2IEBAIGJvb2wgc2g6Okhhc0FycmF5 RmllbGQoY29uc3QgVFN0cnVjdHVyZSAmc3RydWN0dXJlKQogICAgIHJldHVybiBmYWxzZTsKIH0K IAotVEludGVybVR5cGVkICZzaDo6Q29lcmNlU2ltcGxlKFRCYXNpY1R5cGUgdG9UeXBlLCBUSW50 ZXJtVHlwZWQgJmZyb21Ob2RlKQorVEludGVybVR5cGVkICZzaDo6Q29lcmNlU2ltcGxlKFRCYXNp Y1R5cGUgdG9CYXNpY1R5cGUsIFRJbnRlcm1UeXBlZCAmZnJvbU5vZGUpCiB7CiAgICAgY29uc3Qg VFR5cGUgJmZyb21UeXBlID0gZnJvbU5vZGUuZ2V0VHlwZSgpOwogCi0gICAgQVNTRVJUKEhhc1Nj YWxhckJhc2ljVHlwZSh0b1R5cGUpKTsKKyAgICBBU1NFUlQoSGFzU2NhbGFyQmFzaWNUeXBlKHRv QmFzaWNUeXBlKSk7CiAgICAgQVNTRVJUKEhhc1NjYWxhckJhc2ljVHlwZShmcm9tVHlwZSkpOwog ICAgIEFTU0VSVCghZnJvbVR5cGUuaXNBcnJheSgpKTsKKyAgICAKKyAgICBjb25zdCBUQmFzaWNU eXBlIGZyb21CYXNpY1R5cGUgPSBmcm9tVHlwZS5nZXRCYXNpY1R5cGUoKTsKIAotICAgIGlmICh0 b1R5cGUgIT0gZnJvbVR5cGUuZ2V0QmFzaWNUeXBlKCkpCisgICAgaWYgKHRvQmFzaWNUeXBlICE9 IGZyb21CYXNpY1R5cGUpCiAgICAgeworICAgICAgICBpZiAodG9CYXNpY1R5cGUgPT0gVEJhc2lj VHlwZTo6RWJ0Qm9vbCAmJgorICAgICAgICAgICAgZnJvbU5vZGUuaXNWZWN0b3IoKSkKKyAgICAg ICAgeworICAgICAgICAgICAgc3dpdGNoIChmcm9tQmFzaWNUeXBlKQorICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIGNhc2UgVEJhc2ljVHlwZTo6RWJ0RmxvYXQ6CisgICAgICAgICAgICAg ICAgY2FzZSBUQmFzaWNUeXBlOjpFYnREb3VibGU6CisgICAgICAgICAgICAgICAgY2FzZSBUQmFz aWNUeXBlOjpFYnRJbnQ6CisgICAgICAgICAgICAgICAgY2FzZSBUQmFzaWNUeXBlOjpFYnRVSW50 OgorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgVEludGVybVR5cGVkICZm cm9tVHlwZVN3aXp6bGUgPSBTdWJWZWN0b3IoZnJvbU5vZGUsIDAsIDEpOworICAgICAgICAgICAg ICAgICAgICBUSW50ZXJtQWdncmVnYXRlICpib29sQ29uc3RydWN0b3IgPSBUSW50ZXJtQWdncmVn YXRlOjpDcmVhdGVDb25zdHJ1Y3RvcigKKyAgICAgICAgICAgICAgICAgICAgICAgICpuZXcgVFR5 cGUodG9CYXNpY1R5cGUsIDEsIDEpLAorICAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBUSW50 ZXJtU2VxdWVuY2V7JmZyb21UeXBlU3dpenpsZX0pOworICAgICAgICAgICAgICAgICAgICBUSW50 ZXJtU2VxdWVuY2UgKmFyZ3NTZXF1ZW5jZSA9IG5ldyBUSW50ZXJtU2VxdWVuY2Uoe2Jvb2xDb25z dHJ1Y3Rvcn0pOworICAgICAgICAgICAgICAgICAgICByZXR1cm4gKlRJbnRlcm1BZ2dyZWdhdGU6 OkNyZWF0ZUNvbnN0cnVjdG9yKAorICAgICAgICAgICAgICAgICAgICAgICAgKm5ldyBUVHlwZSh0 b0Jhc2ljVHlwZSwgZnJvbVR5cGUuZ2V0Tm9taW5hbFNpemUoKSwgZnJvbVR5cGUuZ2V0U2Vjb25k YXJ5U2l6ZSgpKSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGFyZ3NTZXF1ZW5jZSk7CisgICAg ICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgICAgYnJl YWs7IC8vIE5vIGV4cGxpY2l0IGNvbnZlcnNpb24gbmVlZGVkCisgICAgICAgICAgICB9CisgICAg ICAgIH0KKyAgICAgICAgCiAgICAgICAgIHJldHVybiAqVEludGVybUFnZ3JlZ2F0ZTo6Q3JlYXRl Q29uc3RydWN0b3IoCi0gICAgICAgICAgICAqbmV3IFRUeXBlKHRvVHlwZSwgZnJvbVR5cGUuZ2V0 Tm9taW5hbFNpemUoKSwgZnJvbVR5cGUuZ2V0U2Vjb25kYXJ5U2l6ZSgpKSwKKyAgICAgICAgICAg ICpuZXcgVFR5cGUodG9CYXNpY1R5cGUsIGZyb21UeXBlLmdldE5vbWluYWxTaXplKCksIGZyb21U eXBlLmdldFNlY29uZGFyeVNpemUoKSksCiAgICAgICAgICAgICBuZXcgVEludGVybVNlcXVlbmNl eyZmcm9tTm9kZX0pOwogICAgIH0KICAgICByZXR1cm4gZnJvbU5vZGU7CkBAIC00NDcsOSArNDc1 LDQzIEBAIFRJbnRlcm1UeXBlZCAmc2g6OkNvZXJjZVNpbXBsZShjb25zdCBUVHlwZSAmdG9UeXBl LCBUSW50ZXJtVHlwZWQgJmZyb21Ob2RlKQogICAgIEFTU0VSVCh0b1R5cGUuZ2V0U2Vjb25kYXJ5 U2l6ZSgpID09IGZyb21UeXBlLmdldFNlY29uZGFyeVNpemUoKSk7CiAgICAgQVNTRVJUKCF0b1R5 cGUuaXNBcnJheSgpKTsKICAgICBBU1NFUlQoIWZyb21UeXBlLmlzQXJyYXkoKSk7CisgICAgCisg ICAgY29uc3QgVEJhc2ljVHlwZSB0b0Jhc2ljVHlwZSAgID0gdG9UeXBlLmdldEJhc2ljVHlwZSgp OworICAgIGNvbnN0IFRCYXNpY1R5cGUgZnJvbUJhc2ljVHlwZSA9IGZyb21UeXBlLmdldEJhc2lj VHlwZSgpOwogCi0gICAgaWYgKHRvVHlwZS5nZXRCYXNpY1R5cGUoKSAhPSBmcm9tVHlwZS5nZXRC YXNpY1R5cGUoKSkKKyAgICBpZiAodG9CYXNpY1R5cGUgIT0gZnJvbUJhc2ljVHlwZSkKICAgICB7 CisgICAgICAgIGlmICh0b0Jhc2ljVHlwZSA9PSBUQmFzaWNUeXBlOjpFYnRCb29sICYmCisgICAg ICAgICAgICBmcm9tTm9kZS5pc1ZlY3RvcigpKQorICAgICAgICB7CisgICAgICAgICAgICBzd2l0 Y2ggKGZyb21CYXNpY1R5cGUpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY2FzZSBU QmFzaWNUeXBlOjpFYnRGbG9hdDoKKyAgICAgICAgICAgICAgICBjYXNlIFRCYXNpY1R5cGU6OkVi dERvdWJsZToKKyAgICAgICAgICAgICAgICBjYXNlIFRCYXNpY1R5cGU6OkVidEludDoKKyAgICAg ICAgICAgICAgICBjYXNlIFRCYXNpY1R5cGU6OkVidFVJbnQ6CisgICAgICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgVEludGVybVNlcXVlbmNl ICphcmdzU2VxdWVuY2UgPSBuZXcgVEludGVybVNlcXVlbmNlKCk7CisgICAgICAgICAgICAgICAg ICAgIGZvciAoaW50IGkgPSAwOyBpIDwgZnJvbVR5cGUuZ2V0Tm9taW5hbFNpemUoKTsgaSsrKQor ICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICBUSW50ZXJtVHlw ZWQgJmZyb21UeXBlU3dpenpsZSA9IFN1YlZlY3Rvcihmcm9tTm9kZSwgaSwgaSsxKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIFRJbnRlcm1BZ2dyZWdhdGUgKmJvb2xDb25zdHJ1Y3RvciA9IFRJ bnRlcm1BZ2dyZWdhdGU6OkNyZWF0ZUNvbnN0cnVjdG9yKAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICpuZXcgVFR5cGUodG9CYXNpY1R5cGUsIDEsIDEpLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBuZXcgVEludGVybVNlcXVlbmNleyZmcm9tVHlwZVN3aXp6bGV9KTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGFyZ3NTZXF1ZW5jZS0+cHVzaF9iYWNrKGJvb2xDb25zdHJ1Y3Rv cik7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuICpU SW50ZXJtQWdncmVnYXRlOjpDcmVhdGVDb25zdHJ1Y3RvcigKKyAgICAgICAgICAgICAgICAgICAg ICAgICpuZXcgVFR5cGUodG9CYXNpY1R5cGUsIGZyb21UeXBlLmdldE5vbWluYWxTaXplKCksIGZy b21UeXBlLmdldFNlY29uZGFyeVNpemUoKSksCisgICAgICAgICAgICAgICAgICAgICAgICBuZXcg VEludGVybVNlcXVlbmNleyphcmdzU2VxdWVuY2V9KTsKKyAgICAgICAgICAgICAgICAgICAgCisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAg ICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgICAgICBicmVhazsgLy8gTm8gZXhwbGljaXQg Y29udmVyc2lvbiBuZWVkZWQKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICAKICAg ICAgICAgcmV0dXJuICpUSW50ZXJtQWdncmVnYXRlOjpDcmVhdGVDb25zdHJ1Y3Rvcih0b1R5cGUs IG5ldyBUSW50ZXJtU2VxdWVuY2V7JmZyb21Ob2RlfSk7CiAgICAgfQogICAgIHJldHVybiBmcm9t Tm9kZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90 cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9Bc3RIZWxwZXJzLmggYi9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJl Y3QvQXN0SGVscGVycy5oCmluZGV4IGQ5ZTg5ZmViMDczMjkwYWU2MWExNmZlMDUyMDY0MDZjMDc1 MThjNTMuLjAxNTAzMzAyMTIwODkwYWI5NjJkYjQxMjNmMjE3ZjI1NDU1YzNlMmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5z bGF0b3JNZXRhbERpcmVjdC9Bc3RIZWxwZXJzLmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5H TEUvc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L0FzdEhlbHBl cnMuaApAQCAtMTQzLDcgKzE0Myw3IEBAIGJvb2wgSGFzQXJyYXlGaWVsZChjb25zdCBUU3RydWN0 dXJlICZzdHJ1Y3R1cmUpOwogLy8gQ29lcmNlcyBgZnJvbU5vZGVgIHRvIGB0b1R5cGVgIGJ5IGEg Y29uc3RydWN0b3IgY2FsbCBvZiBgdG9UeXBlYCBpZiB0aGVpciB0eXBlcyBkaWZmZXIuCiAvLyBW ZWN0b3IgYW5kIG1hdHJpeCBkaW1lbnNpb25zIGFyZSByZXRhaW5lZC4KIC8vIEFycmF5IHR5cGVz IGFyZSBub3QgYWxsb3dlZC4KLVRJbnRlcm1UeXBlZCAmQ29lcmNlU2ltcGxlKFRCYXNpY1R5cGUg dG9UeXBlLCBUSW50ZXJtVHlwZWQgJmZyb21Ob2RlKTsKK1RJbnRlcm1UeXBlZCAmQ29lcmNlU2lt cGxlKFRCYXNpY1R5cGUgdG9CYXNpY1R5cGUsIFRJbnRlcm1UeXBlZCAmZnJvbU5vZGUpOwogCiAv LyBDb2VyY2VzIGBmcm9tTm9kZWAgdG8gYHRvVHlwZWAgYnkgYSBjb25zdHJ1Y3RvciBjYWxsIG9m IGB0b1R5cGVgIGlmIHRoZWlyIHR5cGVzIGRpZmZlci4KIC8vIFZlY3RvciBhbmQgbWF0cml4IGRp bWVuc2lvbnMgbXVzdCBjb2luY2lkZSBiZXR3ZWVuIHRvIGFuZCBmcm9tLgpkaWZmIC0tZ2l0IGEv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0Rpc3Bs YXlNdGwubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvRGlzcGxheU10bC5tbQppbmRleCBmYTZjOWE2ZDM2MTYzMzNiZTBmYjc2NjBmOTYwMGNl OWE1NTg1ZmQzLi5iNzkxODM4YjY0ZTYxNGRjYTJjNDIzMTJmMjk5YzFjZTI5NjIyY2ZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvRGlzcGxheU10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5H TEUvcmVuZGVyZXIvbWV0YWwvRGlzcGxheU10bC5tbQpAQCAtMTMsNiArMTMsNyBAQAogI2luY2x1 ZGUgImxpYkFOR0xFL0NvbnRleHQuaCIKICNpbmNsdWRlICJsaWJBTkdMRS9EaXNwbGF5LmgiCiAj aW5jbHVkZSAibGliQU5HTEUvU3VyZmFjZS5oIgorI2luY2x1ZGUgImxpYkFOR0xFL3JlbmRlcmVy L2RyaXZlcl91dGlscy5oIgogI2luY2x1ZGUgImxpYkFOR0xFL3JlbmRlcmVyL2dsc2xhbmdfd3Jh cHBlcl91dGlscy5oIgogI2luY2x1ZGUgImxpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0NvbnRleHRN dGwuaCIKICNpbmNsdWRlICJsaWJBTkdMRS9yZW5kZXJlci9tZXRhbC9JT1N1cmZhY2VTdXJmYWNl TXRsLmgiCkBAIC05MDcsNyArOTA4LDggQEAgdm9pZCBEaXNwbGF5TXRsOjppbml0aWFsaXplRmVh dHVyZXMoKQogICAgIEFOR0xFX0ZFQVRVUkVfQ09ORElUSU9OKCgmbUZlYXR1cmVzKSwgcmV3cml0 ZVJvd01ham9yTWF0cmljZXMsIHRydWUpOwogICAgIEFOR0xFX0ZFQVRVUkVfQ09ORElUSU9OKCgm bUZlYXR1cmVzKSwgZW11bGF0ZVRyYW5zZm9ybUZlZWRiYWNrLCB0cnVlKTsKIAotICAgIEFOR0xF X0ZFQVRVUkVfQ09ORElUSU9OKCgmbUZlYXR1cmVzKSxpbnRlbFRoaW5NaXBtYXBXb3JrYXJvdW5k LCBpc0ludGVsKCkpOworICAgIEFOR0xFX0ZFQVRVUkVfQ09ORElUSU9OKCgmbUZlYXR1cmVzKSwg aW50ZWxUaGluTWlwbWFwV29ya2Fyb3VuZCwgaXNJbnRlbCgpKTsKKyAgICBBTkdMRV9GRUFUVVJF X0NPTkRJVElPTigoJm1GZWF0dXJlcyksIGludGVsRXhwbGljaXRCb29sQ2FzdFdvcmthcm91bmQs IGlzSW50ZWwoKSAmJiBHZXRNYWNPU1ZlcnNpb24oKSA8IE9TVmVyc2lvbigxMSwgMCwgMCkpOwog CiAgICAgYW5nbGU6OlBsYXRmb3JtTWV0aG9kcyAqcGxhdGZvcm0gPSBBTkdMRVBsYXRmb3JtQ3Vy cmVudCgpOwogICAgIHBsYXRmb3JtLT5vdmVycmlkZUZlYXR1cmVzTXRsKHBsYXRmb3JtLCAmbUZl YXR1cmVzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdM RS9yZW5kZXJlci9tZXRhbC9TaGFkZXJNdGwubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvU2hhZGVyTXRsLm1tCmluZGV4IDc2MmY2N2Q2MDNl NWFkN2EyNzlhY2Y4OWEwODc0NzkxOTBiYWJiMDcuLmFjZGU3NjAwNTM5YmE3NDFlZWM0YWU4ZjEy YzFlZGM2NjFkMDYyMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9TaGFkZXJNdGwubW0KKysrIGIvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1NoYWRlck10bC5tbQpAQCAtMTM2 LDYgKzEzNiwxMSBAQCBzdGQ6OnNoYXJlZF9wdHI8V2FpdGFibGVDb21waWxlRXZlbnQ+IFNoYWRl ck10bDo6Y29tcGlsZShjb25zdCBnbDo6Q29udGV4dCAqY29udAogICAgIHsKICAgICAgICAgY29t cGlsZU9wdGlvbnMgfD0gU0hfUkVXUklURV9ST1dfTUFKT1JfTUFUUklDRVM7CiAgICAgfQorICAg IAorICAgIGlmIChjb250ZXh0TXRsLT5nZXREaXNwbGF5KCktPmdldEZlYXR1cmVzKCkuaW50ZWxF eHBsaWNpdEJvb2xDYXN0V29ya2Fyb3VuZC5lbmFibGVkKQorICAgIHsKKyAgICAgICAgY29tcGls ZU9wdGlvbnMgfD0gU0hfQUREX0VYUExJQ0lUX0JPT0xfQ0FTVFM7CisgICAgfQogCiAgICAgcmV0 dXJuIGNvbXBpbGVJbXBsTXRsKGNvbnRleHQsIGNvbXBpbGVySW5zdGFuY2UsIGdldFN0YXRlKCku Z2V0U291cmNlKCksIGNvbXBpbGVPcHRpb25zIHwgb3B0aW9ucyk7CiB9Cg==