224632 2021-04-15 16:53:26 -0700 Use kIOMainPortDefault where available 2021-04-24 15:10:42 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen ap dino ews-watchlist graouts kkinnunen kondapallykalyan webkit-bug-importer oldest_to_newest 1750843 0 achristensen 2021-04-15 16:53:26 -0700 Replace deprecation pragmas with new port name 1750847 1 426157 achristensen 2021-04-15 16:55:45 -0700 Created attachment 426157 Patch 1750849 2 ews-watchlist 2021-04-15 16:57:20 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1750871 3 426165 achristensen 2021-04-15 17:58:38 -0700 Created attachment 426165 Patch 1750872 4 426166 achristensen 2021-04-15 18:00:03 -0700 Created attachment 426166 Patch 1750876 5 426166 ap 2021-04-15 18:04:06 -0700 Comment on attachment 426166 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426166&action=review I would probably centralize this in one place if I were doing this, but seems OK either way. > Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm:41 > #pragma clang diagnostic ignored "-Wdeprecated-declarations" You can consider adding comments saying that the pragmas can be removed once rdar://76706593 is fixed, but it's not terribly important. 1750885 6 ews-feeder 2021-04-15 18:45:14 -0700 Committed r276104 (236604@main): <https://commits.webkit.org/236604@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426166. 1751023 7 kkinnunen 2021-04-16 04:51:21 -0700 Not sure if I'm doing something wrong, but I'm seeing the inverse issue now with an older SDK. CompileC SystemInfo_macos.o /Users/kkinnunen/WebKit/OpenSource/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm:38:34: error: use of undeclared identifier 'kIOMainPortDefault' const mach_port_t mainPort = kIOMainPortDefault; ^ /Users/kkinnunen/WebKit/OpenSource/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm:109:38: error: use of undeclared identifier 'kIOMainPortDefault' const mach_port_t mainPort = kIOMainPortDefault; ^ /Users/kkinnunen/WebKit/OpenSource/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm:176:34: error: use of undeclared identifier 'kIOMainPortDefault' const mach_port_t mainPort = kIOMainPortDefault; ^ /Users/kkinnunen/WebKit/OpenSource/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_macos.mm:285:38: error: use of undeclared identifier 'kIOMainPortDefault' const mach_port_t mainPort = kIOMainPortDefault; ^ 1751211 8 achristensen 2021-04-16 13:20:18 -0700 (In reply to Kimmo Kinnunen from comment #7) > Not sure if I'm doing something wrong, but I'm seeing the inverse issue now > with an older SDK. Time to update your SDK. 1753958 9 webkit-bug-importer 2021-04-24 15:10:42 -0700 <rdar://problem/77110140> 426157 2021-04-15 16:55:45 -0700 2021-04-15 17:58:36 -0700 Patch bug-224632-20210415165544.patch text/plain 4528 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNmJkZGQ2NDRmZjU1ZDhlYWI0ZmVlN2JmYjc1NjllN2Y0Mjk4ZjQxMS4uMjIwYjI2ZjQ2MTQ4 MDIyNWIwMjc5YzRlNjVjNzIxYWNkODQ5ZmE2MiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA0LTE1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVwbGFjZSBkZXByZWNhdGlvbiBwcmFnbWFz IHdpdGggbmV3IHBvcnQgbmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjI0NjMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW4gQU5HTEUgd2UgZG9uJ3QgaW5jbHVkZSBXVEYgaGVhZGVycywgc28gd2Ug Y2FuJ3QgdXNlIHRoZSBIQVZFIG1hY3JvIGxpa2Ugd2UgZG8gZWxzZXdoZXJlIGluIFdlYktpdCwK KyAgICAgICAgYnV0IHRoaXMgaXMgcHJldHR5IGNsb3NlLgorCisgICAgICAgICogc3JjL2dwdV9p bmZvX3V0aWwvU3lzdGVtSW5mb19tYWNvcy5tbToKKyAgICAgICAgKGFuZ2xlOjpHZXRWZW5kb3JJ REZyb21NZXRhbERldmljZVJlZ2lzdHJ5SUQpOgorCiAyMDIxLTA0LTE1ICBBbGV4IENocmlzdGVu c2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIGRlcHJlY2F0aW9u IG1hY3JvcwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2dwdV9pbmZv X3V0aWwvU3lzdGVtSW5mb19tYWNvcy5tbSBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9n cHVfaW5mb191dGlsL1N5c3RlbUluZm9fbWFjb3MubW0KaW5kZXggMzljODA1YzY4MGNlNWJkNmQ3 OGYzZjZmMjc0NzJjNDNkNzY5MjNkZC4uODJmZWU1ZTczNDJiMTNkNzEzNTZmYjk1OTllMDM5NzYx MzUxYTNiMCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2dwdV9pbmZv X3V0aWwvU3lzdGVtSW5mb19tYWNvcy5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvZ3B1X2luZm9fdXRpbC9TeXN0ZW1JbmZvX21hY29zLm1tCkBAIC0xNyw2ICsxNywxMiBAQAog CiAjICAgIGluY2x1ZGUgImNvbW1vbi9nbC9jZ2wvRnVuY3Rpb25zQ0dMLmgiCiAKKyNpZiAhZGVm aW5lZChfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEKSB8fCBfX01BQ19PU19YX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDEyMDAwMAorI2RlZmluZSBIQVZFX01BSU5fUE9SVF9ERUZBVUxU IDEKKyNlbHNlCisjZGVmaW5lIEhBVkVfTUFJTl9QT1JUX0RFRkFVTFQgMAorI2VuZGlmCisKIG5h bWVzcGFjZSBhbmdsZQogewogCkBAIC0yOCwxMSArMzQsMTMgQEAgY29uc3RleHByIENHTFJlbmRl cmVyUHJvcGVydHkga0NHTFJQUmVnaXN0cnlJREhpZ2ggPSBzdGF0aWNfY2FzdDxDR0xSZW5kZXJl clByb3AKIAogc3RkOjpzdHJpbmcgR2V0TWFjaGluZU1vZGVsKCkKIHsKLSNwcmFnbWEgY2xhbmcg ZGlhZ25vc3RpYyBwdXNoCi0jcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgaWdub3JlZCAiLVdkZXBy ZWNhdGVkLWRlY2xhcmF0aW9ucyIKKyNpZiBIQVZFX01BSU5fUE9SVF9ERUZBVUxUCisgICAgY29u c3QgbWFjaF9wb3J0X3QgbWFpblBvcnQgPSBrSU9NYWluUG9ydERlZmF1bHQ7CisjZWxzZQorICAg IGNvbnN0IG1hY2hfcG9ydF90IG1haW5Qb3J0ID0ga0lPTWFzdGVyUG9ydERlZmF1bHQ7CisjZW5k aWYKICAgICBpb19zZXJ2aWNlX3QgcGxhdGZvcm1FeHBlcnQgPSBJT1NlcnZpY2VHZXRNYXRjaGlu Z1NlcnZpY2UoCi0gICAgICAgIGtJT01hc3RlclBvcnREZWZhdWx0LCBJT1NlcnZpY2VNYXRjaGlu ZygiSU9QbGF0Zm9ybUV4cGVydERldmljZSIpKTsKLSNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBw b3AKKyAgICAgICAgbWFpblBvcnQsIElPU2VydmljZU1hdGNoaW5nKCJJT1BsYXRmb3JtRXhwZXJ0 RGV2aWNlIikpOwogCiAgICAgaWYgKHBsYXRmb3JtRXhwZXJ0ID09IElPX09CSkVDVF9OVUxMKQog ICAgIHsKQEAgLTk0LDE0ICsxMDIsMTYgQEAgdm9pZCBHZXRJT1JlZ2lzdHJ5RGV2aWNlcyhzdGQ6 OnZlY3RvcjxHUFVEZXZpY2VJbmZvPiAqZGV2aWNlcykKICAgICAgICAgQ0ZNdXRhYmxlRGljdGlv bmFyeVJlZiBtYXRjaERpY3Rpb25hcnkgPSBJT1NlcnZpY2VNYXRjaGluZyhrU2VydmljZU5hbWVz W2ldKTsKIAogICAgICAgICBpb19pdGVyYXRvcl90IGVudHJ5SXRlcmF0b3I7Ci0jcHJhZ21hIGNs YW5nIGRpYWdub3N0aWMgcHVzaAotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1X ZGVwcmVjYXRlZC1kZWNsYXJhdGlvbnMiCi0gICAgICAgIGlmIChJT1NlcnZpY2VHZXRNYXRjaGlu Z1NlcnZpY2VzKGtJT01hc3RlclBvcnREZWZhdWx0LCBtYXRjaERpY3Rpb25hcnksICZlbnRyeUl0 ZXJhdG9yKSAhPQorI2lmIEhBVkVfTUFJTl9QT1JUX0RFRkFVTFQKKyAgICAgICAgY29uc3QgbWFj aF9wb3J0X3QgbWFpblBvcnQgPSBrSU9NYWluUG9ydERlZmF1bHQ7CisjZWxzZQorICAgICAgICBj b25zdCBtYWNoX3BvcnRfdCBtYWluUG9ydCA9IGtJT01hc3RlclBvcnREZWZhdWx0OworI2VuZGlm CisgICAgICAgIGlmIChJT1NlcnZpY2VHZXRNYXRjaGluZ1NlcnZpY2VzKG1haW5Qb3J0LCBtYXRj aERpY3Rpb25hcnksICZlbnRyeUl0ZXJhdG9yKSAhPQogICAgICAgICAgICAga0lPUmV0dXJuU3Vj Y2VzcykKICAgICAgICAgewogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KLSNwcmFn bWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKIAogICAgICAgICBpb19yZWdpc3RyeV9lbnRyeV90IGVu dHJ5ID0gSU9fT0JKRUNUX05VTEw7CiAgICAgICAgIHdoaWxlICgoZW50cnkgPSBJT0l0ZXJhdG9y TmV4dChlbnRyeUl0ZXJhdG9yKSkgIT0gSU9fT0JKRUNUX05VTEwpCkBAIC0xNTYsMTAgKzE2Niwx MiBAQCB2b2lkIFNldEFjdGl2ZUdQVUluZGV4KFN5c3RlbUluZm8gKmluZm8pCiAgICAgICAgIHJl dHVybjsKIAogICAgIENGTXV0YWJsZURpY3Rpb25hcnlSZWYgbWF0Y2hEaWN0aW9uYXJ5ID0gSU9S ZWdpc3RyeUVudHJ5SURNYXRjaGluZyhncHVJRCk7Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMg cHVzaAotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XZGVwcmVjYXRlZC1kZWNs YXJhdGlvbnMiCi0gICAgaW9fc2VydmljZV90IGdwdUVudHJ5ID0gSU9TZXJ2aWNlR2V0TWF0Y2hp bmdTZXJ2aWNlKGtJT01hc3RlclBvcnREZWZhdWx0LCBtYXRjaERpY3Rpb25hcnkpOwotI3ByYWdt YSBjbGFuZyBkaWFnbm9zdGljIHBvcAorI2lmIEhBVkVfTUFJTl9QT1JUX0RFRkFVTFQKKyAgICBj b25zdCBtYWNoX3BvcnRfdCBtYWluUG9ydCA9IGtJT01haW5Qb3J0RGVmYXVsdDsKKyNlbHNlCisg ICAgY29uc3QgbWFjaF9wb3J0X3QgbWFpblBvcnQgPSBrSU9NYXN0ZXJQb3J0RGVmYXVsdDsKKyNl bmRpZgorICAgIGlvX3NlcnZpY2VfdCBncHVFbnRyeSA9IElPU2VydmljZUdldE1hdGNoaW5nU2Vy dmljZShtYWluUG9ydCwgbWF0Y2hEaWN0aW9uYXJ5KTsKIAogICAgIGlmIChncHVFbnRyeSA9PSBJ T19PQkpFQ1RfTlVMTCkKICAgICB7CkBAIC0yNjAsMTEgKzI3MiwxMyBAQCBWZW5kb3JJRCBHZXRW ZW5kb3JJREZyb21NZXRhbERldmljZVJlZ2lzdHJ5SUQodWludDY0X3QgcmVnaXN0cnlJRCkKIAog ICAgICAgICAvLyBJT1NlcnZpY2VHZXRNYXRjaGluZ1NlcnZpY2Ugd2lsbCBjb25zdW1lIHRoZSBy ZWZlcmVuY2Ugb24gdGhlIG1hdGNoaW5nIGRpY3Rpb25hcnksCiAgICAgICAgIC8vIHNvIHdlIGRv bid0IG5lZWQgdG8gcmVsZWFzZSB0aGUgZGljdGlvbmFyeS4KLSNwcmFnbWEgY2xhbmcgZGlhZ25v c3RpYyBwdXNoCi0jcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgaWdub3JlZCAiLVdkZXByZWNhdGVk LWRlY2xhcmF0aW9ucyIKKyNpZiBIQVZFX01BSU5fUE9SVF9ERUZBVUxUCisgICAgICAgIGNvbnN0 IG1hY2hfcG9ydF90IG1haW5Qb3J0ID0ga0lPTWFpblBvcnREZWZhdWx0OworI2Vsc2UKKyAgICAg ICAgY29uc3QgbWFjaF9wb3J0X3QgbWFpblBvcnQgPSBrSU9NYXN0ZXJQb3J0RGVmYXVsdDsKKyNl bmRpZgogICAgICAgICBpb19yZWdpc3RyeV9lbnRyeV90IGFjY2VsZXJhdG9yRW50cnkgPQotICAg ICAgICAgICAgSU9TZXJ2aWNlR2V0TWF0Y2hpbmdTZXJ2aWNlKGtJT01hc3RlclBvcnREZWZhdWx0 LCBtYXRjaGluZ0RpY3QpOwotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBvcAorICAgICAgICAg ICAgSU9TZXJ2aWNlR2V0TWF0Y2hpbmdTZXJ2aWNlKG1haW5Qb3J0LCBtYXRjaGluZ0RpY3QpOwog ICAgICAgICBpZiAoYWNjZWxlcmF0b3JFbnRyeSA9PSBJT19PQkpFQ1RfTlVMTCkKICAgICAgICAg ewogICAgICAgICAgICAgcmV0dXJuIDA7Cg== 426165 2021-04-15 17:58:38 -0700 2021-04-15 18:00:01 -0700 Patch bug-224632-20210415175837.patch text/plain 4662 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNmJkZGQ2NDRmZjU1ZDhlYWI0ZmVlN2JmYjc1NjllN2Y0Mjk4ZjQxMS4uMjIwYjI2ZjQ2MTQ4 MDIyNWIwMjc5YzRlNjVjNzIxYWNkODQ5ZmE2MiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA0LTE1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVwbGFjZSBkZXByZWNhdGlvbiBwcmFnbWFz IHdpdGggbmV3IHBvcnQgbmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjI0NjMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW4gQU5HTEUgd2UgZG9uJ3QgaW5jbHVkZSBXVEYgaGVhZGVycywgc28gd2Ug Y2FuJ3QgdXNlIHRoZSBIQVZFIG1hY3JvIGxpa2Ugd2UgZG8gZWxzZXdoZXJlIGluIFdlYktpdCwK KyAgICAgICAgYnV0IHRoaXMgaXMgcHJldHR5IGNsb3NlLgorCisgICAgICAgICogc3JjL2dwdV9p bmZvX3V0aWwvU3lzdGVtSW5mb19tYWNvcy5tbToKKyAgICAgICAgKGFuZ2xlOjpHZXRWZW5kb3JJ REZyb21NZXRhbERldmljZVJlZ2lzdHJ5SUQpOgorCiAyMDIxLTA0LTE1ICBBbGV4IENocmlzdGVu c2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIGRlcHJlY2F0aW9u IG1hY3JvcwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2dwdV9pbmZv X3V0aWwvU3lzdGVtSW5mb19tYWNvcy5tbSBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9n cHVfaW5mb191dGlsL1N5c3RlbUluZm9fbWFjb3MubW0KaW5kZXggMzljODA1YzY4MGNlNWJkNmQ3 OGYzZjZmMjc0NzJjNDNkNzY5MjNkZC4uN2YzZWY1ZThlZGNlMGJlZjczMTI2NTdjMTQ4OTQ5MWRk MTJkZmJjNSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2dwdV9pbmZv X3V0aWwvU3lzdGVtSW5mb19tYWNvcy5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvZ3B1X2luZm9fdXRpbC9TeXN0ZW1JbmZvX21hY29zLm1tCkBAIC0xNyw2ICsxNywxMiBAQAog CiAjICAgIGluY2x1ZGUgImNvbW1vbi9nbC9jZ2wvRnVuY3Rpb25zQ0dMLmgiCiAKKyNpZiAhZGVm aW5lZChfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEKSB8fCBfX01BQ19PU19YX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDEyMDAwMAorI2RlZmluZSBIQVZFX01BSU5fUE9SVF9ERUZBVUxU IDEKKyNlbHNlCisjZGVmaW5lIEhBVkVfTUFJTl9QT1JUX0RFRkFVTFQgMAorI2VuZGlmCisKIG5h bWVzcGFjZSBhbmdsZQogewogCkBAIC0yOCwxMSArMzQsMTYgQEAgY29uc3RleHByIENHTFJlbmRl cmVyUHJvcGVydHkga0NHTFJQUmVnaXN0cnlJREhpZ2ggPSBzdGF0aWNfY2FzdDxDR0xSZW5kZXJl clByb3AKIAogc3RkOjpzdHJpbmcgR2V0TWFjaGluZU1vZGVsKCkKIHsKKyNpZiBIQVZFX01BSU5f UE9SVF9ERUZBVUxUCisgICAgY29uc3QgbWFjaF9wb3J0X3QgbWFpblBvcnQgPSBrSU9NYWluUG9y dERlZmF1bHQ7CisjZWxzZQogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKICNwcmFnbWEg Y2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkICItV2RlcHJlY2F0ZWQtZGVjbGFyYXRpb25zIgotICAg IGlvX3NlcnZpY2VfdCBwbGF0Zm9ybUV4cGVydCA9IElPU2VydmljZUdldE1hdGNoaW5nU2Vydmlj ZSgKLSAgICAgICAga0lPTWFzdGVyUG9ydERlZmF1bHQsIElPU2VydmljZU1hdGNoaW5nKCJJT1Bs YXRmb3JtRXhwZXJ0RGV2aWNlIikpOworICAgIGNvbnN0IG1hY2hfcG9ydF90IG1haW5Qb3J0ID0g a0lPTWFzdGVyUG9ydERlZmF1bHQ7CiAjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9wCisjZW5k aWYKKyAgICBpb19zZXJ2aWNlX3QgcGxhdGZvcm1FeHBlcnQgPSBJT1NlcnZpY2VHZXRNYXRjaGlu Z1NlcnZpY2UoCisgICAgICAgIG1haW5Qb3J0LCBJT1NlcnZpY2VNYXRjaGluZygiSU9QbGF0Zm9y bUV4cGVydERldmljZSIpKTsKIAogICAgIGlmIChwbGF0Zm9ybUV4cGVydCA9PSBJT19PQkpFQ1Rf TlVMTCkKICAgICB7CkBAIC05NCwxNCArMTA1LDE5IEBAIHZvaWQgR2V0SU9SZWdpc3RyeURldmlj ZXMoc3RkOjp2ZWN0b3I8R1BVRGV2aWNlSW5mbz4gKmRldmljZXMpCiAgICAgICAgIENGTXV0YWJs ZURpY3Rpb25hcnlSZWYgbWF0Y2hEaWN0aW9uYXJ5ID0gSU9TZXJ2aWNlTWF0Y2hpbmcoa1NlcnZp Y2VOYW1lc1tpXSk7CiAKICAgICAgICAgaW9faXRlcmF0b3JfdCBlbnRyeUl0ZXJhdG9yOworI2lm IEhBVkVfTUFJTl9QT1JUX0RFRkFVTFQKKyAgICAgICAgY29uc3QgbWFjaF9wb3J0X3QgbWFpblBv cnQgPSBrSU9NYWluUG9ydERlZmF1bHQ7CisjZWxzZQogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGlj IHB1c2gKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkICItV2RlcHJlY2F0ZWQtZGVj bGFyYXRpb25zIgotICAgICAgICBpZiAoSU9TZXJ2aWNlR2V0TWF0Y2hpbmdTZXJ2aWNlcyhrSU9N YXN0ZXJQb3J0RGVmYXVsdCwgbWF0Y2hEaWN0aW9uYXJ5LCAmZW50cnlJdGVyYXRvcikgIT0KKyAg ICBjb25zdCBtYWNoX3BvcnRfdCBtYWluUG9ydCA9IGtJT01hc3RlclBvcnREZWZhdWx0OworI3By YWdtYSBjbGFuZyBkaWFnbm9zdGljIHBvcAorI2VuZGlmCisgICAgICAgIGlmIChJT1NlcnZpY2VH ZXRNYXRjaGluZ1NlcnZpY2VzKG1haW5Qb3J0LCBtYXRjaERpY3Rpb25hcnksICZlbnRyeUl0ZXJh dG9yKSAhPQogICAgICAgICAgICAga0lPUmV0dXJuU3VjY2VzcykKICAgICAgICAgewogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KLSNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AK IAogICAgICAgICBpb19yZWdpc3RyeV9lbnRyeV90IGVudHJ5ID0gSU9fT0JKRUNUX05VTEw7CiAg ICAgICAgIHdoaWxlICgoZW50cnkgPSBJT0l0ZXJhdG9yTmV4dChlbnRyeUl0ZXJhdG9yKSkgIT0g SU9fT0JKRUNUX05VTEwpCkBAIC0xNTYsMTAgKzE3MiwxNSBAQCB2b2lkIFNldEFjdGl2ZUdQVUlu ZGV4KFN5c3RlbUluZm8gKmluZm8pCiAgICAgICAgIHJldHVybjsKIAogICAgIENGTXV0YWJsZURp Y3Rpb25hcnlSZWYgbWF0Y2hEaWN0aW9uYXJ5ID0gSU9SZWdpc3RyeUVudHJ5SURNYXRjaGluZyhn cHVJRCk7CisjaWYgSEFWRV9NQUlOX1BPUlRfREVGQVVMVAorICAgIGNvbnN0IG1hY2hfcG9ydF90 IG1haW5Qb3J0ID0ga0lPTWFpblBvcnREZWZhdWx0OworI2Vsc2UKICNwcmFnbWEgY2xhbmcgZGlh Z25vc3RpYyBwdXNoCiAjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgaWdub3JlZCAiLVdkZXByZWNh dGVkLWRlY2xhcmF0aW9ucyIKLSAgICBpb19zZXJ2aWNlX3QgZ3B1RW50cnkgPSBJT1NlcnZpY2VH ZXRNYXRjaGluZ1NlcnZpY2Uoa0lPTWFzdGVyUG9ydERlZmF1bHQsIG1hdGNoRGljdGlvbmFyeSk7 CisgICAgY29uc3QgbWFjaF9wb3J0X3QgbWFpblBvcnQgPSBrSU9NYXN0ZXJQb3J0RGVmYXVsdDsK ICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKKyNlbmRpZgorICAgIGlvX3NlcnZpY2VfdCBn cHVFbnRyeSA9IElPU2VydmljZUdldE1hdGNoaW5nU2VydmljZShtYWluUG9ydCwgbWF0Y2hEaWN0 aW9uYXJ5KTsKIAogICAgIGlmIChncHVFbnRyeSA9PSBJT19PQkpFQ1RfTlVMTCkKICAgICB7CkBA IC0yNjAsMTEgKzI4MSwxNiBAQCBWZW5kb3JJRCBHZXRWZW5kb3JJREZyb21NZXRhbERldmljZVJl Z2lzdHJ5SUQodWludDY0X3QgcmVnaXN0cnlJRCkKIAogICAgICAgICAvLyBJT1NlcnZpY2VHZXRN YXRjaGluZ1NlcnZpY2Ugd2lsbCBjb25zdW1lIHRoZSByZWZlcmVuY2Ugb24gdGhlIG1hdGNoaW5n IGRpY3Rpb25hcnksCiAgICAgICAgIC8vIHNvIHdlIGRvbid0IG5lZWQgdG8gcmVsZWFzZSB0aGUg ZGljdGlvbmFyeS4KKyNpZiBIQVZFX01BSU5fUE9SVF9ERUZBVUxUCisgICAgICAgIGNvbnN0IG1h Y2hfcG9ydF90IG1haW5Qb3J0ID0ga0lPTWFpblBvcnREZWZhdWx0OworI2Vsc2UKICNwcmFnbWEg Y2xhbmcgZGlhZ25vc3RpYyBwdXNoCiAjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgaWdub3JlZCAi LVdkZXByZWNhdGVkLWRlY2xhcmF0aW9ucyIKLSAgICAgICAgaW9fcmVnaXN0cnlfZW50cnlfdCBh Y2NlbGVyYXRvckVudHJ5ID0KLSAgICAgICAgICAgIElPU2VydmljZUdldE1hdGNoaW5nU2Vydmlj ZShrSU9NYXN0ZXJQb3J0RGVmYXVsdCwgbWF0Y2hpbmdEaWN0KTsKKyAgICBjb25zdCBtYWNoX3Bv cnRfdCBtYWluUG9ydCA9IGtJT01hc3RlclBvcnREZWZhdWx0OwogI3ByYWdtYSBjbGFuZyBkaWFn bm9zdGljIHBvcAorI2VuZGlmCisgICAgICAgIGlvX3JlZ2lzdHJ5X2VudHJ5X3QgYWNjZWxlcmF0 b3JFbnRyeSA9CisgICAgICAgICAgICBJT1NlcnZpY2VHZXRNYXRjaGluZ1NlcnZpY2UobWFpblBv cnQsIG1hdGNoaW5nRGljdCk7CiAgICAgICAgIGlmIChhY2NlbGVyYXRvckVudHJ5ID09IElPX09C SkVDVF9OVUxMKQogICAgICAgICB7CiAgICAgICAgICAgICByZXR1cm4gMDsK 426166 2021-04-15 18:00:03 -0700 2021-04-15 18:45:15 -0700 Patch bug-224632-20210415180002.patch text/plain 4654 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNmJkZGQ2NDRmZjU1ZDhlYWI0ZmVlN2JmYjc1NjllN2Y0Mjk4ZjQxMS4uYjhjNDI1ZGZjNzk4 YjNjZTlmN2MwMTA2MGU3MWI1Y2I1MTNlNGViMCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA0LTE1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIGtJT01haW5Qb3J0RGVmYXVsdCB3aGVy ZSBhdmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyNDYzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEluIEFOR0xFIHdlIGRvbid0IGluY2x1ZGUgV1RGIGhlYWRlcnMsIHNvIHdlIGNhbid0IHVz ZSB0aGUgSEFWRSBtYWNybyBsaWtlIHdlIGRvIGVsc2V3aGVyZSBpbiBXZWJLaXQsCisgICAgICAg IGJ1dCB0aGlzIGlzIHByZXR0eSBjbG9zZS4KKworICAgICAgICAqIHNyYy9ncHVfaW5mb191dGls L1N5c3RlbUluZm9fbWFjb3MubW06CisgICAgICAgIChhbmdsZTo6R2V0VmVuZG9ySURGcm9tTWV0 YWxEZXZpY2VSZWdpc3RyeUlEKToKKwogMjAyMS0wNC0xNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFj aHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBkZXByZWNhdGlvbiBtYWNyb3MK ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9ncHVfaW5mb191dGlsL1N5 c3RlbUluZm9fbWFjb3MubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvZ3B1X2luZm9f dXRpbC9TeXN0ZW1JbmZvX21hY29zLm1tCmluZGV4IDM5YzgwNWM2ODBjZTViZDZkNzhmM2Y2ZjI3 NDcyYzQzZDc2OTIzZGQuLjdmM2VmNWU4ZWRjZTBiZWY3MzEyNjU3YzE0ODk0OTFkZDEyZGZiYzUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9ncHVfaW5mb191dGlsL1N5 c3RlbUluZm9fbWFjb3MubW0KKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2dwdV9p bmZvX3V0aWwvU3lzdGVtSW5mb19tYWNvcy5tbQpAQCAtMTcsNiArMTcsMTIgQEAKIAogIyAgICBp bmNsdWRlICJjb21tb24vZ2wvY2dsL0Z1bmN0aW9uc0NHTC5oIgogCisjaWYgIWRlZmluZWQoX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCkgfHwgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMjAwMDAKKyNkZWZpbmUgSEFWRV9NQUlOX1BPUlRfREVGQVVMVCAxCisjZWxz ZQorI2RlZmluZSBIQVZFX01BSU5fUE9SVF9ERUZBVUxUIDAKKyNlbmRpZgorCiBuYW1lc3BhY2Ug YW5nbGUKIHsKIApAQCAtMjgsMTEgKzM0LDE2IEBAIGNvbnN0ZXhwciBDR0xSZW5kZXJlclByb3Bl cnR5IGtDR0xSUFJlZ2lzdHJ5SURIaWdoID0gc3RhdGljX2Nhc3Q8Q0dMUmVuZGVyZXJQcm9wCiAK IHN0ZDo6c3RyaW5nIEdldE1hY2hpbmVNb2RlbCgpCiB7CisjaWYgSEFWRV9NQUlOX1BPUlRfREVG QVVMVAorICAgIGNvbnN0IG1hY2hfcG9ydF90IG1haW5Qb3J0ID0ga0lPTWFpblBvcnREZWZhdWx0 OworI2Vsc2UKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwdXNoCiAjcHJhZ21hIGNsYW5nIGRp YWdub3N0aWMgaWdub3JlZCAiLVdkZXByZWNhdGVkLWRlY2xhcmF0aW9ucyIKLSAgICBpb19zZXJ2 aWNlX3QgcGxhdGZvcm1FeHBlcnQgPSBJT1NlcnZpY2VHZXRNYXRjaGluZ1NlcnZpY2UoCi0gICAg ICAgIGtJT01hc3RlclBvcnREZWZhdWx0LCBJT1NlcnZpY2VNYXRjaGluZygiSU9QbGF0Zm9ybUV4 cGVydERldmljZSIpKTsKKyAgICBjb25zdCBtYWNoX3BvcnRfdCBtYWluUG9ydCA9IGtJT01hc3Rl clBvcnREZWZhdWx0OwogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBvcAorI2VuZGlmCisgICAg aW9fc2VydmljZV90IHBsYXRmb3JtRXhwZXJ0ID0gSU9TZXJ2aWNlR2V0TWF0Y2hpbmdTZXJ2aWNl KAorICAgICAgICBtYWluUG9ydCwgSU9TZXJ2aWNlTWF0Y2hpbmcoIklPUGxhdGZvcm1FeHBlcnRE ZXZpY2UiKSk7CiAKICAgICBpZiAocGxhdGZvcm1FeHBlcnQgPT0gSU9fT0JKRUNUX05VTEwpCiAg ICAgewpAQCAtOTQsMTQgKzEwNSwxOSBAQCB2b2lkIEdldElPUmVnaXN0cnlEZXZpY2VzKHN0ZDo6 dmVjdG9yPEdQVURldmljZUluZm8+ICpkZXZpY2VzKQogICAgICAgICBDRk11dGFibGVEaWN0aW9u YXJ5UmVmIG1hdGNoRGljdGlvbmFyeSA9IElPU2VydmljZU1hdGNoaW5nKGtTZXJ2aWNlTmFtZXNb aV0pOwogCiAgICAgICAgIGlvX2l0ZXJhdG9yX3QgZW50cnlJdGVyYXRvcjsKKyNpZiBIQVZFX01B SU5fUE9SVF9ERUZBVUxUCisgICAgICAgIGNvbnN0IG1hY2hfcG9ydF90IG1haW5Qb3J0ID0ga0lP TWFpblBvcnREZWZhdWx0OworI2Vsc2UKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwdXNoCiAj cHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgaWdub3JlZCAiLVdkZXByZWNhdGVkLWRlY2xhcmF0aW9u cyIKLSAgICAgICAgaWYgKElPU2VydmljZUdldE1hdGNoaW5nU2VydmljZXMoa0lPTWFzdGVyUG9y dERlZmF1bHQsIG1hdGNoRGljdGlvbmFyeSwgJmVudHJ5SXRlcmF0b3IpICE9CisgICAgY29uc3Qg bWFjaF9wb3J0X3QgbWFpblBvcnQgPSBrSU9NYXN0ZXJQb3J0RGVmYXVsdDsKKyNwcmFnbWEgY2xh bmcgZGlhZ25vc3RpYyBwb3AKKyNlbmRpZgorICAgICAgICBpZiAoSU9TZXJ2aWNlR2V0TWF0Y2hp bmdTZXJ2aWNlcyhtYWluUG9ydCwgbWF0Y2hEaWN0aW9uYXJ5LCAmZW50cnlJdGVyYXRvcikgIT0K ICAgICAgICAgICAgIGtJT1JldHVyblN1Y2Nlc3MpCiAgICAgICAgIHsKICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICB9Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9wCiAKICAgICAg ICAgaW9fcmVnaXN0cnlfZW50cnlfdCBlbnRyeSA9IElPX09CSkVDVF9OVUxMOwogICAgICAgICB3 aGlsZSAoKGVudHJ5ID0gSU9JdGVyYXRvck5leHQoZW50cnlJdGVyYXRvcikpICE9IElPX09CSkVD VF9OVUxMKQpAQCAtMTU2LDEwICsxNzIsMTUgQEAgdm9pZCBTZXRBY3RpdmVHUFVJbmRleChTeXN0 ZW1JbmZvICppbmZvKQogICAgICAgICByZXR1cm47CiAKICAgICBDRk11dGFibGVEaWN0aW9uYXJ5 UmVmIG1hdGNoRGljdGlvbmFyeSA9IElPUmVnaXN0cnlFbnRyeUlETWF0Y2hpbmcoZ3B1SUQpOwor I2lmIEhBVkVfTUFJTl9QT1JUX0RFRkFVTFQKKyAgICBjb25zdCBtYWNoX3BvcnRfdCBtYWluUG9y dCA9IGtJT01haW5Qb3J0RGVmYXVsdDsKKyNlbHNlCiAjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMg cHVzaAogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XZGVwcmVjYXRlZC1kZWNs YXJhdGlvbnMiCi0gICAgaW9fc2VydmljZV90IGdwdUVudHJ5ID0gSU9TZXJ2aWNlR2V0TWF0Y2hp bmdTZXJ2aWNlKGtJT01hc3RlclBvcnREZWZhdWx0LCBtYXRjaERpY3Rpb25hcnkpOworICAgIGNv bnN0IG1hY2hfcG9ydF90IG1haW5Qb3J0ID0ga0lPTWFzdGVyUG9ydERlZmF1bHQ7CiAjcHJhZ21h IGNsYW5nIGRpYWdub3N0aWMgcG9wCisjZW5kaWYKKyAgICBpb19zZXJ2aWNlX3QgZ3B1RW50cnkg PSBJT1NlcnZpY2VHZXRNYXRjaGluZ1NlcnZpY2UobWFpblBvcnQsIG1hdGNoRGljdGlvbmFyeSk7 CiAKICAgICBpZiAoZ3B1RW50cnkgPT0gSU9fT0JKRUNUX05VTEwpCiAgICAgewpAQCAtMjYwLDEx ICsyODEsMTYgQEAgVmVuZG9ySUQgR2V0VmVuZG9ySURGcm9tTWV0YWxEZXZpY2VSZWdpc3RyeUlE KHVpbnQ2NF90IHJlZ2lzdHJ5SUQpCiAKICAgICAgICAgLy8gSU9TZXJ2aWNlR2V0TWF0Y2hpbmdT ZXJ2aWNlIHdpbGwgY29uc3VtZSB0aGUgcmVmZXJlbmNlIG9uIHRoZSBtYXRjaGluZyBkaWN0aW9u YXJ5LAogICAgICAgICAvLyBzbyB3ZSBkb24ndCBuZWVkIHRvIHJlbGVhc2UgdGhlIGRpY3Rpb25h cnkuCisjaWYgSEFWRV9NQUlOX1BPUlRfREVGQVVMVAorICAgICAgICBjb25zdCBtYWNoX3BvcnRf dCBtYWluUG9ydCA9IGtJT01haW5Qb3J0RGVmYXVsdDsKKyNlbHNlCiAjcHJhZ21hIGNsYW5nIGRp YWdub3N0aWMgcHVzaAogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XZGVwcmVj YXRlZC1kZWNsYXJhdGlvbnMiCi0gICAgICAgIGlvX3JlZ2lzdHJ5X2VudHJ5X3QgYWNjZWxlcmF0 b3JFbnRyeSA9Ci0gICAgICAgICAgICBJT1NlcnZpY2VHZXRNYXRjaGluZ1NlcnZpY2Uoa0lPTWFz dGVyUG9ydERlZmF1bHQsIG1hdGNoaW5nRGljdCk7CisgICAgY29uc3QgbWFjaF9wb3J0X3QgbWFp blBvcnQgPSBrSU9NYXN0ZXJQb3J0RGVmYXVsdDsKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBw b3AKKyNlbmRpZgorICAgICAgICBpb19yZWdpc3RyeV9lbnRyeV90IGFjY2VsZXJhdG9yRW50cnkg PQorICAgICAgICAgICAgSU9TZXJ2aWNlR2V0TWF0Y2hpbmdTZXJ2aWNlKG1haW5Qb3J0LCBtYXRj aGluZ0RpY3QpOwogICAgICAgICBpZiAoYWNjZWxlcmF0b3JFbnRyeSA9PSBJT19PQkpFQ1RfTlVM TCkKICAgICAgICAgewogICAgICAgICAgICAgcmV0dXJuIDA7Cg==