228564 2021-07-28 12:50:40 -0700 [macOS Catalina] Some feature preferences have wrong default values 2021-07-29 09:49:48 -0700 1 1 1 Unclassified WebKit New Bugs Other All macOS 10.15 RESOLVED FIXED InRadar P2 Normal --- 1 peng.liu6 peng.liu6 beidson cdumez dino eric.carlson jer.noble megan_gardner pvollan sabouhallawa simon.fraser thorton webkit-bug-importer youennf oldest_to_newest 1780166 0 peng.liu6 2021-07-28 12:50:40 -0700 When the feature flags SPI is not available, some feature preferences' default values are wrong. 1780167 1 peng.liu6 2021-07-28 12:51:14 -0700 <rdar://81177857> 1780176 2 434451 peng.liu6 2021-07-28 13:18:35 -0700 Created attachment 434451 Patch 1780197 3 434451 thorton 2021-07-28 14:03:45 -0700 Comment on attachment 434451 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=434451&action=review > Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm:89 > +#if HAVE(SYSTEM_FEATURE_FLAGS) > static const bool runningBoardHandlesPriorities = isFeatureFlagEnabled("RB_full_manage_WK_jetsam"_s); > +#else > + const bool runningBoardHandlesPriorities = true; > +#endif I don't think you need this change; RUNNINGBOARD_WEBKIT_PRIORITY_SUPPORT is only on on iOS-family platforms, where we don't backdeploy and thus SYSTEM_FEATURE_FLAGS is always true. (Also evidenced by the fact that it wasn't guarded before) 1780200 4 434451 peng.liu6 2021-07-28 14:09:11 -0700 Comment on attachment 434451 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=434451&action=review >> Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm:89 >> +#endif > > I don't think you need this change; RUNNINGBOARD_WEBKIT_PRIORITY_SUPPORT is only on on iOS-family platforms, where we don't backdeploy and thus SYSTEM_FEATURE_FLAGS is always true. (Also evidenced by the fact that it wasn't guarded before) Hmm, I was misled by the folder name (Mac/ProcessLauncherMac.mm). Maybe we should remove `RB_full_manage_WK_jetsam` from Webkit-macos.plist? 1780201 5 434451 thorton 2021-07-28 14:11:50 -0700 Comment on attachment 434451 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=434451&action=review >>> Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm:89 >>> +#endif >> >> I don't think you need this change; RUNNINGBOARD_WEBKIT_PRIORITY_SUPPORT is only on on iOS-family platforms, where we don't backdeploy and thus SYSTEM_FEATURE_FLAGS is always true. (Also evidenced by the fact that it wasn't guarded before) > > Hmm, I was misled by the folder name (Mac/ProcessLauncherMac.mm). > > Maybe we should remove `RB_full_manage_WK_jetsam` from Webkit-macos.plist? A sad vestige of history (should say Cocoa). Yeah, we can remove it from the plist later, but in this patch we can just leave it alone. 1780203 6 434465 peng.liu6 2021-07-28 14:14:42 -0700 Created attachment 434465 Revise the patch based on Tim's comment 1780210 7 434465 thorton 2021-07-28 14:41:09 -0700 Comment on attachment 434465 Revise the patch based on Tim's comment View in context: https://bugs.webkit.org/attachment.cgi?id=434465&action=review > Source/WebKit/Shared/WebPreferencesDefaultValues.cpp:295 > +#if PLATFORM(MAC) > + return true; > +#else > return false; > +#endif Technically by the same logic you could just change these to return true instead of the PLATFORM(MAC), because we'll always have SYSTEM_FEATURE_FLAGS on iOS-family). But either way will behave the same. 1780402 8 ews-feeder 2021-07-29 09:27:50 -0700 Committed r280424 (240064@main): <https://commits.webkit.org/240064@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434465. 1780410 9 peng.liu6 2021-07-29 09:49:48 -0700 The API test failures are tracked by bug 228589. 434451 2021-07-28 13:18:35 -0700 2021-07-28 14:14:40 -0700 Patch bug-228564-20210728131834.patch text/plain 6028 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIzMWYzMTIxMzQyOTk4YTVj N2NmMGRhNTYwMDcwZGY2MTAyYTA0ZjQuLmVlZTA2ZTlmNjNjMmFiNjlkZWZmNzY5YWFmODE2YzFm YWI0Y2ViM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjEtMDctMjggIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1MgQ2F0YWxpbmFdIFNvbWUg ZmVhdHVyZSBwcmVmZXJlbmNlcyBoYXZlIHdyb25nIGRlZmF1bHQgdmFsdWVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg1NjQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGBIQVZFKFNZU1RFTV9G RUFUVVJFX0ZMQUdTKWAgaXMgZmFsc2UsIHdlIHN0aWxsIG5lZWQgdG8gZW5hYmxlCisgICAgICAg IHNvbWUgZmVhdHVyZXMgYnkgZGVmYXVsdC4KKworICAgICAgICBUaGlzIHBhdGNoIG1ha2VzIHN1 cmUgdGhlIGZvbGxvd2luZyBmZWF0dXJlcyBhcmUgZW5hYmxlZCBieSBkZWZhdWx0CisgICAgICAg IG9uIG1hY09TIChjb25zaXN0ZW50IHdpdGggdGhlIHByb3BlcnRpZXMgaW4gV2ViS2l0LW1hY29z LnBsaXN0KToKKyAgICAgICAgLSBhc3luY19mcmFtZV9hbmRfb3ZlcmZsb3dfc2Nyb2xsaW5nCisg ICAgICAgIC0gZ3B1X3Byb2Nlc3NfY2FudmFzX3JlbmRlcmluZworICAgICAgICAtIGdwdV9wcm9j ZXNzX21lZGlhCisgICAgICAgIC0gZ3B1X3Byb2Nlc3Nfd2VicnRjCisgICAgICAgIC0gaW5jcmVt ZW50YWxfcGRmCisgICAgICAgIC0gdnA5X2RlY29kZXIKKyAgICAgICAgLSB3ZWJtX2Zvcm1hdF9y ZWFkZXIKKyAgICAgICAgLSB3ZWJtX3BhcnNlcgorICAgICAgICAtIFJCX2Z1bGxfbWFuYWdlX1dL X2pldHNhbQorCisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5j cHA6CisgICAgICAgIChXZWJLaXQ6OmRlZmF1bHRVc2VHUFVQcm9jZXNzRm9yQ2FudmFzUmVuZGVy aW5nRW5hYmxlZCk6CisgICAgICAgIChXZWJLaXQ6OmRlZmF1bHRVc2VHUFVQcm9jZXNzRm9yRE9N UmVuZGVyaW5nRW5hYmxlZCk6CisgICAgICAgIChXZWJLaXQ6OmRlZmF1bHRVc2VHUFVQcm9jZXNz Rm9yTWVkaWFFbmFibGVkKToKKyAgICAgICAgKFdlYktpdDo6ZGVmYXVsdENhcHR1cmVBdWRpb0lu R1BVUHJvY2Vzc0VuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpkZWZhdWx0Q2FwdHVyZVZpZGVv SW5HUFVQcm9jZXNzRW5hYmxlZCk6CisgICAgICAgIChXZWJLaXQ6OmRlZmF1bHRXZWJSVENDb2Rl Y3NJbkdQVVByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpkZWZhdWx0SW5jcmVtZW50YWxQREZF bmFibGVkKToKKyAgICAgICAgKFdlYktpdDo6ZGVmYXVsdFdlYk1Gb3JtYXRSZWFkZXJFbmFibGVk KToKKyAgICAgICAgKiBVSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5t bToKKyAgICAgICAgKFdlYktpdDo6c2hvdWxkTGVha0Jvb3N0KToKKwogMjAyMS0wNy0yOCAgVGlt IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBpT1MgU2ltdWxh dG9yIGRvZXNuJ3QgaGF2ZSBhbnkgV2ViS2l0IHN5c3RlbSBmZWF0dXJlIGZsYWdzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMuY3Bw IGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZhdWx0VmFsdWVzLmNwcApp bmRleCAyYmE2Mjg3M2YzMmIzMWMwMzY5YTFhNTE0ZmYxY2IwMzg5MjRlYjczLi45ZDhmYjY1ZDgy MWI2N2EwZmRmZGU0ODM4N2VhZmQ2NDY4YmJhMzZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5jcHAKQEAgLTE0OSwyOSArMTQ5 LDQxIEBAIGJvb2wgZGVmYXVsdE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpCiAK IGJvb2wgZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JDYW52YXNSZW5kZXJpbmdFbmFibGVkKCkKIHsK LSNpZiBIQVZFKFNZU1RFTV9GRUFUVVJFX0ZMQUdTKSAmJiBFTkFCTEUoR1BVX1BST0NFU1NfQllf REVGQVVMVCkKKyNpZiBFTkFCTEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKyNpZiBIQVZFKFNZ U1RFTV9GRUFUVVJFX0ZMQUdTKQogICAgIHJldHVybiBpc0ZlYXR1cmVGbGFnRW5hYmxlZCgiZ3B1 X3Byb2Nlc3NfY2FudmFzX3JlbmRlcmluZyIpOwotI2VuZGlmCi0KKyNlbHNlCisgICAgcmV0dXJu IHRydWU7CisjZW5kaWYgLy8gSEFWRShTWVNURU1fRkVBVFVSRV9GTEFHUykKKyNlbHNlCiAgICAg cmV0dXJuIGZhbHNlOworI2VuZGlmCiB9CiAKIGJvb2wgZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JE T01SZW5kZXJpbmdFbmFibGVkKCkKIHsKLSNpZiBIQVZFKFNZU1RFTV9GRUFUVVJFX0ZMQUdTKSAm JiBFTkFCTEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKyNpZiBFTkFCTEUoR1BVX1BST0NFU1Nf QllfREVGQVVMVCkKKyNpZiBIQVZFKFNZU1RFTV9GRUFUVVJFX0ZMQUdTKQogICAgIHJldHVybiBp c0ZlYXR1cmVGbGFnRW5hYmxlZCgiZ3B1X3Byb2Nlc3NfZG9tX3JlbmRlcmluZyIpOwotI2VuZGlm Ci0KKyNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmIC8vIEhBVkUoU1lTVEVNX0ZFQVRV UkVfRkxBR1MpCisjZWxzZQorICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgogfQogCiBib29sIGRl ZmF1bHRVc2VHUFVQcm9jZXNzRm9yTWVkaWFFbmFibGVkKCkKIHsKLSNpZiBIQVZFKFNZU1RFTV9G RUFUVVJFX0ZMQUdTKSAmJiBFTkFCTEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKyNpZiBFTkFC TEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKyNpZiBIQVZFKFNZU1RFTV9GRUFUVVJFX0ZMQUdT KQogICAgIHJldHVybiBpc0ZlYXR1cmVGbGFnRW5hYmxlZCgiZ3B1X3Byb2Nlc3NfbWVkaWEiKTsK LSNlbmRpZgotCisjZWxzZQorICAgIHJldHVybiB0cnVlOworI2VuZGlmIC8vIEhBVkUoU1lTVEVN X0ZFQVRVUkVfRkxBR1MpCisjZWxzZQogICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgogfQogCiBi b29sIGRlZmF1bHRVc2VHUFVQcm9jZXNzRm9yV2ViR0xFbmFibGVkKCkKQEAgLTE4OSwxNCArMjAx LDIxIEBAIGJvb2wgZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQoKQogCiBib29s IGRlZmF1bHRDYXB0dXJlQXVkaW9JbkdQVVByb2Nlc3NFbmFibGVkKCkKIHsKLSNpZiBIQVZFKFNZ U1RFTV9GRUFUVVJFX0ZMQUdTKSAmJiBFTkFCTEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKyNp ZiBFTkFCTEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKworI2lmIEhBVkUoU1lTVEVNX0ZFQVRV UkVfRkxBR1MpCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIHJldHVybiBpc0ZlYXR1cmVGbGFnRW5h YmxlZCgiZ3B1X3Byb2Nlc3Nfd2VicnRjIik7CiAjZWxpZiBQTEFURk9STShJT1NfRkFNSUxZKQog ICAgIHJldHVybiBpc0ZlYXR1cmVGbGFnRW5hYmxlZCgiZ3B1X3Byb2Nlc3NfbWVkaWEiKTsKICNl bmRpZgotI2VuZGlmCisjZWxzZQorICAgIHJldHVybiB0cnVlOworI2VuZGlmIC8vIEhBVkUoU1lT VEVNX0ZFQVRVUkVfRkxBR1MpCisKKyNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCiB9 CiAKIGJvb2wgZGVmYXVsdENhcHR1cmVBdWRpb0luVUlQcm9jZXNzRW5hYmxlZCgpCkBAIC0yMTAs OCArMjI5LDEyIEBAIGJvb2wgZGVmYXVsdENhcHR1cmVBdWRpb0luVUlQcm9jZXNzRW5hYmxlZCgp CiAKIGJvb2wgZGVmYXVsdENhcHR1cmVWaWRlb0luR1BVUHJvY2Vzc0VuYWJsZWQoKQogewotI2lm IEhBVkUoU1lTVEVNX0ZFQVRVUkVfRkxBR1MpICYmIEVOQUJMRShHUFVfUFJPQ0VTU19CWV9ERUZB VUxUKQorI2lmIEVOQUJMRShHUFVfUFJPQ0VTU19CWV9ERUZBVUxUKQorI2lmIEhBVkUoU1lTVEVN X0ZFQVRVUkVfRkxBR1MpCiAgICAgcmV0dXJuIGlzRmVhdHVyZUZsYWdFbmFibGVkKCJncHVfcHJv Y2Vzc193ZWJydGMiKTsKKyNlbHNlCisgICAgcmV0dXJuIHRydWU7CisjZW5kaWYgLy8gSEFWRShT WVNURU1fRkVBVFVSRV9GTEFHUykKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCkBA IC0yMjMsOCArMjQ2LDEyIEBAIGJvb2wgZGVmYXVsdENhcHR1cmVWaWRlb0luR1BVUHJvY2Vzc0Vu YWJsZWQoKQogCiBib29sIGRlZmF1bHRXZWJSVENDb2RlY3NJbkdQVVByb2Nlc3MoKQogewotI2lm IEhBVkUoU1lTVEVNX0ZFQVRVUkVfRkxBR1MpICYmIEVOQUJMRShHUFVfUFJPQ0VTU19CWV9ERUZB VUxUKQorI2lmIEVOQUJMRShHUFVfUFJPQ0VTU19CWV9ERUZBVUxUKQorI2lmIEhBVkUoU1lTVEVN X0ZFQVRVUkVfRkxBR1MpCiAgICAgcmV0dXJuIGlzRmVhdHVyZUZsYWdFbmFibGVkKCJncHVfcHJv Y2Vzc193ZWJydGMiKTsKKyNlbHNlCisgICAgcmV0dXJuIHRydWU7CisjZW5kaWYgLy8gSEFWRShT WVNURU1fRkVBVFVSRV9GTEFHUykKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCkBA IC0yNjEsNyArMjg4LDExIEBAIGJvb2wgZGVmYXVsdEluY3JlbWVudGFsUERGRW5hYmxlZCgpCiAg ICAgcmV0dXJuIGlzRmVhdHVyZUZsYWdFbmFibGVkKCJpbmNyZW1lbnRhbF9wZGYiKTsKICNlbmRp ZgogCisjaWYgUExBVEZPUk0oTUFDKQorICAgIHJldHVybiB0cnVlOworI2Vsc2UKICAgICByZXR1 cm4gZmFsc2U7CisjZW5kaWYKIH0KICNlbmRpZgogCkBAIC0yODYsNyArMzE3LDExIEBAIGJvb2wg ZGVmYXVsdFdlYk1Gb3JtYXRSZWFkZXJFbmFibGVkKCkKICAgICByZXR1cm4gaXNGZWF0dXJlRmxh Z0VuYWJsZWQoIndlYm1fZm9ybWF0X3JlYWRlciIpOwogI2VuZGlmCiAKKyNpZiBQTEFURk9STShN QUMpCisgICAgcmV0dXJuIHRydWU7CisjZWxzZQogICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgog fQogCiAjZW5kaWYgLy8gRU5BQkxFKFdFQk1fRk9STUFUX1JFQURFUikKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0xhdW5jaGVyL21hYy9Qcm9jZXNzTGF1bmNoZXJNYWMubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFj Lm1tCmluZGV4IDkzNmYzZTUyMTExN2U5MDFjOWU4OGZmYjdkYWIxMjA0ZTExYzZhNjQuLjA2MTFk ODEzYmVmZjQyNDQ0NmU1ZjQwMjQ1ZmJlM2E0ZTZiZTZmNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0xhdW5jaGVyL21hYy9Qcm9jZXNzTGF1bmNoZXJNYWMubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5t bQpAQCAtODIsNyArODIsMTEgQEAgc3RhdGljIGJvb2wgc2hvdWxkTGVha0Jvb3N0KGNvbnN0IFBy b2Nlc3NMYXVuY2hlcjo6TGF1bmNoT3B0aW9ucyYgbGF1bmNoT3B0aW9ucykKICNpZiBIQVZFKFJV Tk5JTkdCT0FSRF9XRUJLSVRfUFJJT1JJVFlfU1VQUE9SVCkKICAgICAvLyBPbiBpT1MsIHdlIGRv bid0IG5lZWQgdG8gbGVhayBhIGJvb3N0IG1lc3NhZ2Ugd2hlbiBSdW5uaW5nQm9hcmQgcHJvY2Vz cyBhc3NlcnRpb25zIGdpdmUgdXMgdGhlCiAgICAgLy8gcmlnaHQgcHJpb3JpdGllcy4KKyNpZiBI QVZFKFNZU1RFTV9GRUFUVVJFX0ZMQUdTKQogICAgIHN0YXRpYyBjb25zdCBib29sIHJ1bm5pbmdC b2FyZEhhbmRsZXNQcmlvcml0aWVzID0gaXNGZWF0dXJlRmxhZ0VuYWJsZWQoIlJCX2Z1bGxfbWFu YWdlX1dLX2pldHNhbSJfcyk7CisjZWxzZQorICAgIGNvbnN0IGJvb2wgcnVubmluZ0JvYXJkSGFu ZGxlc1ByaW9yaXRpZXMgPSB0cnVlOworI2VuZGlmCiAgICAgcmV0dXJuICFydW5uaW5nQm9hcmRI YW5kbGVzUHJpb3JpdGllczsKICNlbHNlCiAgICAgcmV0dXJuIHRydWU7Cg== 434465 2021-07-28 14:14:42 -0700 2021-07-29 09:27:52 -0700 Revise the patch based on Tim's comment bug-228564-20210728141442.patch text/plain 4986 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIzMWYzMTIxMzQyOTk4YTVj N2NmMGRhNTYwMDcwZGY2MTAyYTA0ZjQuLmJkOGM4MmE5MDVlN2FiMWI0YjFjYmJiNjdjYjVjODYx MjA2Y2Q1NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjEtMDctMjggIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1MgQ2F0YWxpbmFdIFNvbWUg ZmVhdHVyZSBwcmVmZXJlbmNlcyBoYXZlIHdyb25nIGRlZmF1bHQgdmFsdWVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg1NjQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGBIQVZFKFNZU1RFTV9G RUFUVVJFX0ZMQUdTKWAgaXMgZmFsc2UsIHdlIHN0aWxsIG5lZWQgdG8gZW5hYmxlCisgICAgICAg IHNvbWUgZmVhdHVyZXMgYnkgZGVmYXVsdC4KKworICAgICAgICBUaGlzIHBhdGNoIG1ha2VzIHN1 cmUgdGhlIGZvbGxvd2luZyBmZWF0dXJlcyBhcmUgZW5hYmxlZCBieSBkZWZhdWx0CisgICAgICAg IG9uIG1hY09TIChjb25zaXN0ZW50IHdpdGggdGhlIHByb3BlcnRpZXMgaW4gV2ViS2l0LW1hY29z LnBsaXN0KToKKyAgICAgICAgLSBhc3luY19mcmFtZV9hbmRfb3ZlcmZsb3dfc2Nyb2xsaW5nCisg ICAgICAgIC0gZ3B1X3Byb2Nlc3NfY2FudmFzX3JlbmRlcmluZworICAgICAgICAtIGdwdV9wcm9j ZXNzX21lZGlhCisgICAgICAgIC0gZ3B1X3Byb2Nlc3Nfd2VicnRjCisgICAgICAgIC0gaW5jcmVt ZW50YWxfcGRmCisgICAgICAgIC0gdnA5X2RlY29kZXIKKyAgICAgICAgLSB3ZWJtX2Zvcm1hdF9y ZWFkZXIKKyAgICAgICAgLSB3ZWJtX3BhcnNlcgorCisgICAgICAgICogU2hhcmVkL1dlYlByZWZl cmVuY2VzRGVmYXVsdFZhbHVlcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OmRlZmF1bHRVc2VHUFVQ cm9jZXNzRm9yQ2FudmFzUmVuZGVyaW5nRW5hYmxlZCk6CisgICAgICAgIChXZWJLaXQ6OmRlZmF1 bHRVc2VHUFVQcm9jZXNzRm9yRE9NUmVuZGVyaW5nRW5hYmxlZCk6CisgICAgICAgIChXZWJLaXQ6 OmRlZmF1bHRVc2VHUFVQcm9jZXNzRm9yTWVkaWFFbmFibGVkKToKKyAgICAgICAgKFdlYktpdDo6 ZGVmYXVsdENhcHR1cmVBdWRpb0luR1BVUHJvY2Vzc0VuYWJsZWQpOgorICAgICAgICAoV2ViS2l0 OjpkZWZhdWx0Q2FwdHVyZVZpZGVvSW5HUFVQcm9jZXNzRW5hYmxlZCk6CisgICAgICAgIChXZWJL aXQ6OmRlZmF1bHRXZWJSVENDb2RlY3NJbkdQVVByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0Ojpk ZWZhdWx0SW5jcmVtZW50YWxQREZFbmFibGVkKToKKyAgICAgICAgKFdlYktpdDo6ZGVmYXVsdFdl Yk1Gb3JtYXRSZWFkZXJFbmFibGVkKToKKwogMjAyMS0wNy0yOCAgVGltIEhvcnRvbiAgPHRpbW90 aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBpT1MgU2ltdWxhdG9yIGRvZXNuJ3QgaGF2 ZSBhbnkgV2ViS2l0IHN5c3RlbSBmZWF0dXJlIGZsYWdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMuY3BwIGIvU291cmNlL1dlYktp dC9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZhdWx0VmFsdWVzLmNwcAppbmRleCAyYmE2Mjg3M2Yz MmIzMWMwMzY5YTFhNTE0ZmYxY2IwMzg5MjRlYjczLi45ZDhmYjY1ZDgyMWI2N2EwZmRmZGU0ODM4 N2VhZmQ2NDY4YmJhMzZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVm ZXJlbmNlc0RlZmF1bHRWYWx1ZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBy ZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5jcHAKQEAgLTE0OSwyOSArMTQ5LDQxIEBAIGJvb2wgZGVm YXVsdE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpCiAKIGJvb2wgZGVmYXVsdFVz ZUdQVVByb2Nlc3NGb3JDYW52YXNSZW5kZXJpbmdFbmFibGVkKCkKIHsKLSNpZiBIQVZFKFNZU1RF TV9GRUFUVVJFX0ZMQUdTKSAmJiBFTkFCTEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKyNpZiBF TkFCTEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKyNpZiBIQVZFKFNZU1RFTV9GRUFUVVJFX0ZM QUdTKQogICAgIHJldHVybiBpc0ZlYXR1cmVGbGFnRW5hYmxlZCgiZ3B1X3Byb2Nlc3NfY2FudmFz X3JlbmRlcmluZyIpOwotI2VuZGlmCi0KKyNlbHNlCisgICAgcmV0dXJuIHRydWU7CisjZW5kaWYg Ly8gSEFWRShTWVNURU1fRkVBVFVSRV9GTEFHUykKKyNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwor I2VuZGlmCiB9CiAKIGJvb2wgZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JET01SZW5kZXJpbmdFbmFi bGVkKCkKIHsKLSNpZiBIQVZFKFNZU1RFTV9GRUFUVVJFX0ZMQUdTKSAmJiBFTkFCTEUoR1BVX1BS T0NFU1NfQllfREVGQVVMVCkKKyNpZiBFTkFCTEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKyNp ZiBIQVZFKFNZU1RFTV9GRUFUVVJFX0ZMQUdTKQogICAgIHJldHVybiBpc0ZlYXR1cmVGbGFnRW5h YmxlZCgiZ3B1X3Byb2Nlc3NfZG9tX3JlbmRlcmluZyIpOwotI2VuZGlmCi0KKyNlbHNlCiAgICAg cmV0dXJuIGZhbHNlOworI2VuZGlmIC8vIEhBVkUoU1lTVEVNX0ZFQVRVUkVfRkxBR1MpCisjZWxz ZQorICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgogfQogCiBib29sIGRlZmF1bHRVc2VHUFVQcm9j ZXNzRm9yTWVkaWFFbmFibGVkKCkKIHsKLSNpZiBIQVZFKFNZU1RFTV9GRUFUVVJFX0ZMQUdTKSAm JiBFTkFCTEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKyNpZiBFTkFCTEUoR1BVX1BST0NFU1Nf QllfREVGQVVMVCkKKyNpZiBIQVZFKFNZU1RFTV9GRUFUVVJFX0ZMQUdTKQogICAgIHJldHVybiBp c0ZlYXR1cmVGbGFnRW5hYmxlZCgiZ3B1X3Byb2Nlc3NfbWVkaWEiKTsKLSNlbmRpZgotCisjZWxz ZQorICAgIHJldHVybiB0cnVlOworI2VuZGlmIC8vIEhBVkUoU1lTVEVNX0ZFQVRVUkVfRkxBR1Mp CisjZWxzZQogICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgogfQogCiBib29sIGRlZmF1bHRVc2VH UFVQcm9jZXNzRm9yV2ViR0xFbmFibGVkKCkKQEAgLTE4OSwxNCArMjAxLDIxIEBAIGJvb2wgZGVm YXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQoKQogCiBib29sIGRlZmF1bHRDYXB0dXJl QXVkaW9JbkdQVVByb2Nlc3NFbmFibGVkKCkKIHsKLSNpZiBIQVZFKFNZU1RFTV9GRUFUVVJFX0ZM QUdTKSAmJiBFTkFCTEUoR1BVX1BST0NFU1NfQllfREVGQVVMVCkKKyNpZiBFTkFCTEUoR1BVX1BS T0NFU1NfQllfREVGQVVMVCkKKworI2lmIEhBVkUoU1lTVEVNX0ZFQVRVUkVfRkxBR1MpCiAjaWYg UExBVEZPUk0oTUFDKQogICAgIHJldHVybiBpc0ZlYXR1cmVGbGFnRW5hYmxlZCgiZ3B1X3Byb2Nl c3Nfd2VicnRjIik7CiAjZWxpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIHJldHVybiBpc0Zl YXR1cmVGbGFnRW5hYmxlZCgiZ3B1X3Byb2Nlc3NfbWVkaWEiKTsKICNlbmRpZgotI2VuZGlmCisj ZWxzZQorICAgIHJldHVybiB0cnVlOworI2VuZGlmIC8vIEhBVkUoU1lTVEVNX0ZFQVRVUkVfRkxB R1MpCisKKyNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCiB9CiAKIGJvb2wgZGVmYXVs dENhcHR1cmVBdWRpb0luVUlQcm9jZXNzRW5hYmxlZCgpCkBAIC0yMTAsOCArMjI5LDEyIEBAIGJv b2wgZGVmYXVsdENhcHR1cmVBdWRpb0luVUlQcm9jZXNzRW5hYmxlZCgpCiAKIGJvb2wgZGVmYXVs dENhcHR1cmVWaWRlb0luR1BVUHJvY2Vzc0VuYWJsZWQoKQogewotI2lmIEhBVkUoU1lTVEVNX0ZF QVRVUkVfRkxBR1MpICYmIEVOQUJMRShHUFVfUFJPQ0VTU19CWV9ERUZBVUxUKQorI2lmIEVOQUJM RShHUFVfUFJPQ0VTU19CWV9ERUZBVUxUKQorI2lmIEhBVkUoU1lTVEVNX0ZFQVRVUkVfRkxBR1Mp CiAgICAgcmV0dXJuIGlzRmVhdHVyZUZsYWdFbmFibGVkKCJncHVfcHJvY2Vzc193ZWJydGMiKTsK KyNlbHNlCisgICAgcmV0dXJuIHRydWU7CisjZW5kaWYgLy8gSEFWRShTWVNURU1fRkVBVFVSRV9G TEFHUykKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCkBAIC0yMjMsOCArMjQ2LDEy IEBAIGJvb2wgZGVmYXVsdENhcHR1cmVWaWRlb0luR1BVUHJvY2Vzc0VuYWJsZWQoKQogCiBib29s IGRlZmF1bHRXZWJSVENDb2RlY3NJbkdQVVByb2Nlc3MoKQogewotI2lmIEhBVkUoU1lTVEVNX0ZF QVRVUkVfRkxBR1MpICYmIEVOQUJMRShHUFVfUFJPQ0VTU19CWV9ERUZBVUxUKQorI2lmIEVOQUJM RShHUFVfUFJPQ0VTU19CWV9ERUZBVUxUKQorI2lmIEhBVkUoU1lTVEVNX0ZFQVRVUkVfRkxBR1Mp CiAgICAgcmV0dXJuIGlzRmVhdHVyZUZsYWdFbmFibGVkKCJncHVfcHJvY2Vzc193ZWJydGMiKTsK KyNlbHNlCisgICAgcmV0dXJuIHRydWU7CisjZW5kaWYgLy8gSEFWRShTWVNURU1fRkVBVFVSRV9G TEFHUykKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCkBAIC0yNjEsNyArMjg4LDEx IEBAIGJvb2wgZGVmYXVsdEluY3JlbWVudGFsUERGRW5hYmxlZCgpCiAgICAgcmV0dXJuIGlzRmVh dHVyZUZsYWdFbmFibGVkKCJpbmNyZW1lbnRhbF9wZGYiKTsKICNlbmRpZgogCisjaWYgUExBVEZP Uk0oTUFDKQorICAgIHJldHVybiB0cnVlOworI2Vsc2UKICAgICByZXR1cm4gZmFsc2U7CisjZW5k aWYKIH0KICNlbmRpZgogCkBAIC0yODYsNyArMzE3LDExIEBAIGJvb2wgZGVmYXVsdFdlYk1Gb3Jt YXRSZWFkZXJFbmFibGVkKCkKICAgICByZXR1cm4gaXNGZWF0dXJlRmxhZ0VuYWJsZWQoIndlYm1f Zm9ybWF0X3JlYWRlciIpOwogI2VuZGlmCiAKKyNpZiBQTEFURk9STShNQUMpCisgICAgcmV0dXJu IHRydWU7CisjZWxzZQogICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgogfQogCiAjZW5kaWYgLy8g RU5BQkxFKFdFQk1fRk9STUFUX1JFQURFUikK