193030 2018-12-24 22:53:39 -0800 [MSVC] error C2381: 'WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker': redefinition; '__declspec(noreturn)' or '[[noreturn]]' differs 2018-12-26 20:03:23 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii achristensen bfulgham cdumez don.olmstead pvollan ross.kirsling webkit-bug-importer oldest_to_newest 1490756 0 fujii 2018-12-24 22:53:39 -0800 [MSVC] error C2381: 'WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker': redefinition; '__declspec(noreturn)' or '[[noreturn]]' differs WinCairo MSVC Debug builds are failing to build. https://build.webkit.org/builders/WinCairo%2064-bit%20WKL%20Debug%20%28Build%29/builds/5276 > C:\WebKit-BuildWorker\wincairo-wkl-debug\build\Source\WebKit\NetworkProcess/NetworkHTTPSUpgradeChecker.cpp(82): error C2381: 'WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker': redefinition; '__declspec(noreturn)' or '[[noreturn]]' differs > c:\webkit-buildworker\wincairo-wkl-debug\build\source\webkit\networkprocess\NetworkHTTPSUpgradeChecker.h(48): note: see declaration of 'WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker' 1490757 1 358054 fujii 2018-12-24 23:00:52 -0800 Created attachment 358054 Patch 1490823 2 358054 ross.kirsling 2018-12-26 11:42:32 -0800 Comment on attachment 358054 Patch I added that #if and comment here as a WinCairo Debug build fix here, because it was very tricky to avoid breaking Cocoa Debug in the process: https://bugs.webkit.org/show_bug.cgi?id=192482#c15 Looks like this issue is coming up again with the removal of ENABLE_HTTPS_UPGRADE in r239474 (bug 192937): https://trac.webkit.org/changeset/239474/webkit Your fix is certainly much more satisfying than mine was, and I think if Mac Debug EWS isn't complaining, we should be safe. Yay! 1490851 3 fujii 2018-12-26 17:22:39 -0800 I didn't check that. It looks pretty weird. 1490852 4 358089 fujii 2018-12-26 17:27:30 -0800 Created attachment 358089 Try EWS 1490858 5 fujii 2018-12-26 18:34:32 -0800 Hmm, mac-debug-ews says "Passed tests". Weird. 1490859 6 358089 cdumez 2018-12-26 18:47:04 -0800 Comment on attachment 358089 Try EWS View in context: https://bugs.webkit.org/attachment.cgi?id=358089&action=review > Source/WebKit/UIProcess/WebPageProxy.h:1571 > + NO_RETURN_DUE_TO_ASSERT void didFailToSuspendAfterProcessSwap(); This caused a lot of crashes last time around. Nothing has changed since AFAICT so this will very likely cause the same crashes in wk2 debug (no ews). 1490862 7 358089 cdumez 2018-12-26 18:53:30 -0800 Comment on attachment 358089 Try EWS View in context: https://bugs.webkit.org/attachment.cgi?id=358089&action=review > Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h:48 > + NO_RETURN_DUE_TO_ASSERT ~NetworkHTTPSUpgradeChecker(); This part of the change will likely be fine (iirc the crashes were in IPC related code and this is not called via IPC). However, I’d leave the WebPageProxy changes out as they did not work last time Ross tried them. 1490864 8 fujii 2018-12-26 19:09:02 -0800 Thank you for the comments. I'm going to land the patch withou IPC part changes. 1490867 9 358093 fujii 2018-12-26 19:16:52 -0800 Created attachment 358093 Patch for landing 1490876 10 358093 fujii 2018-12-26 20:02:21 -0800 Comment on attachment 358093 Patch for landing Clearing flags on attachment: 358093 Committed r239555: <https://trac.webkit.org/changeset/239555> 1490877 11 fujii 2018-12-26 20:02:24 -0800 All reviewed patches have been landed. Closing bug. 1490878 12 webkit-bug-importer 2018-12-26 20:03:23 -0800 <rdar://problem/46955123> 358054 2018-12-24 23:00:52 -0800 2018-12-26 17:26:55 -0800 Patch bug-193030-20181225160051.patch text/plain 3970 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk5NTNjODkxYjA5NmY0NzU3 YTI4MTQ2N2I3ZTdiMzE1Y2NiYTc3MDcuLjg4NTVlYzVhYTkyOWUzOWY1ODJjMDA3NjgwMThhOWE3 ZDc1MWVjNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTgtMTItMjQgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW01TVkNdIGVycm9y IEMyMzgxOiAnV2ViS2l0OjpOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcjo6fk5ldHdvcmtIVFRQ U1VwZ3JhZGVDaGVja2VyJzogcmVkZWZpbml0aW9uOyAnX19kZWNsc3BlYyhub3JldHVybiknIG9y ICdbW25vcmV0dXJuXV0nIGRpZmZlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MzAzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdpbmRvd3MgRGVidWcgYnVpbGRzIGFyZSBmYWlsaW5nIHRvIGNvbXBp bGUgZHVlIHRvCisgICAgICAgIE5PX1JFVFVSTl9EVUVfVE9fQVNTRVJUIGluY29uc2lzdGVuY3kg b2YKKyAgICAgICAgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIgZGVzdHJ1Y3RvcidzIGRlZmlu aXRpb24gYW5kCisgICAgICAgIGRlY2xhcmF0aW9uLgorCisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaDogQWRkZWQKKyAgICAgICAgTk9fUkVUVVJO X0RVRV9UT19BU1NFUlQgdG8gTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIgZGVzdHJ1Y3Rvcgor ICAgICAgICBkZWNsYXJhdGlvbi4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cDogUmVtb3ZlZCAiI2lmICFDT01QSUxFUihNU1ZDKSIgaGFja3MuCisgICAgICAgICogVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oOiBBZGRlZCBOT19SRVRVUk5fRFVFX1RPX0FTU0VSVCB0bworICAg ICAgICBkZWNsYXJhdGlvbnMgb2YgZGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAgYW5k CisgICAgICAgIGRpZFN1c3BlbmRBZnRlclByb2Nlc3NTd2FwLgorCiAyMDE4LTEyLTI0ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXZWJLaXRd W1dpbl0gUmVtb3ZlIHVzaW5nIG5hbWVzcGFjZSBpbiB0aGUgZ2xvYmFsIHNjb3BlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVj a2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVD aGVja2VyLmgKaW5kZXggMzgzN2U2NzdiNzMwNWU2NWUwZDVkYzVkMjk0MzhkOWExNTk0YzQ5ZS4u YWZhZTFkY2RmNmE3ZWUyMzNiYTQ4M2QyOGY3YWZhOWJhMWM2YTQ0MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5oCisr KyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNr ZXIuaApAQCAtNDUsNyArNDUsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIE5ldHdvcmtI VFRQU1VwZ3JhZGVDaGVja2VyIHsKIHB1YmxpYzoKICAgICBOZXR3b3JrSFRUUFNVcGdyYWRlQ2hl Y2tlcigpOwotICAgIH5OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcigpOworICAgIE5PX1JFVFVS Tl9EVUVfVE9fQVNTRVJUIH5OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcigpOwogCiAgICAgLy8g UmV0dXJucyBgdHJ1ZWAgYWZ0ZXIgaW50ZXJuYWwgc2V0dXAgaXMgc3VjY2Vzc2Z1bGx5IGNvbXBs ZXRlZC4gSWYgdGhlcmUgaXMgYW4gZXJyb3Igd2l0aCBzZXR1cCwgb3IgaWYgc2V0dXAgaXMgaW4t cHJvZ3Jlc3MsIGl0IHdpbGwgcmV0dXJuIGBmYWxzZWAuCiAgICAgYm9vbCBkaWRTZXR1cENvbXBs ZXRlU3VjY2Vzc2Z1bGx5KCkgY29uc3QgeyByZXR1cm4gbV9kaWRTZXR1cENvbXBsZXRlU3VjY2Vz c2Z1bGx5OyB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXgg OWRiNzA3MTBkOTkwMTAwYzVjYjA1OGJmZGU5MmJjNzdlYTUxYjExZC4uMGE2ODg0ZjMxYzIzMDE1 ZjMwYzU5NWRkMGQ1ODNhNzdmY2I1MDk3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCkBAIC0yODM5LDIwICsyODM5LDE0IEBAIGJvb2wgV2ViUGFnZVByb3h5Ojpp c1BhZ2VPcGVuZWRCeURPTVNob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpIGNvbnN0CiAgICAg cmV0dXJuIG9wZW5lZEJ5RE9NKCkgJiYgIWhhc0NvbW1pdHRlZEFueVByb3Zpc2lvbmFsTG9hZHMo KTsKIH0KIAotLy8gTVNWQyBnaXZlcyBhIHJlZGVjbGFyYXRpb24gZXJyb3IgaWYgbm9yZXR1cm4g aXMgdXNlZCBvbiB0aGUgZGVmaW5pdGlvbiBhbmQgbm90IHRoZSBkZWNsYXJhdGlvbiwgd2hpbGUK LS8vIENvY29hIHRlc3RzIHNlZ2ZhdWx0IGlmIGl0IGlzIG1vdmVkIHRvIHRoZSBkZWNsYXJhdGlv biBzaXRlIChldmVuIGlmIHdlIG1vdmUgdGhlIGRlZmluaXRpb24gd2l0aCBpdCEpLgotI2lmICFD T01QSUxFUihNU1ZDKQogTk9fUkVUVVJOX0RVRV9UT19BU1NFUlQKLSNlbmRpZgogdm9pZCBXZWJQ YWdlUHJveHk6OmRpZEZhaWxUb1N1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCkKIHsKICAgICAvLyBP bmx5IHRoZSBTdXNwZW5kZWRQYWdlUHJveHkgc2hvdWxkIGJlIGdldHRpbmcgdGhpcyBjYWxsLgog ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCi0jaWYgIUNPTVBJTEVSKE1TVkMpCiBOT19S RVRVUk5fRFVFX1RPX0FTU0VSVAotI2VuZGlmCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU3VzcGVu ZEFmdGVyUHJvY2Vzc1N3YXAoKQogewogICAgIC8vIE9ubHkgdGhlIFN1c3BlbmRlZFBhZ2VQcm94 eSBzaG91bGQgYmUgZ2V0dGluZyB0aGlzIGNhbGwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCmluZGV4IDAxYmVhNTBkNGYyZjI4MTkwM2RkNjFmOWNmZTQwOGRmY2MwMmIzYWQu LjAyNzg4MDIzMzVhZjU2ZjQ3YmEwOWYyNTc0OTdkZDFmOTk1YzY4MGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xNTY4LDggKzE1NjgsOCBAQCBwcml2YXRlOgog CiAgICAgdm9pZCByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwogICAgIHZvaWQgc3dhcFRvV2ViUHJv Y2VzcyhSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFn ZVByb3h5PiYmLCBTaG91bGREZWxheUF0dGFjaGluZ0RyYXdpbmdBcmVhKTsKLSAgICB2b2lkIGRp ZEZhaWxUb1N1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCk7Ci0gICAgdm9pZCBkaWRTdXNwZW5kQWZ0 ZXJQcm9jZXNzU3dhcCgpOworICAgIE5PX1JFVFVSTl9EVUVfVE9fQVNTRVJUIHZvaWQgZGlkRmFp bFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAoKTsKKyAgICBOT19SRVRVUk5fRFVFX1RPX0FTU0VS VCB2b2lkIGRpZFN1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCk7CiAKICAgICB2b2lkIGZpbmlzaEF0 dGFjaGluZ1RvV2ViUHJvY2VzcyhTaG91bGREZWxheUF0dGFjaGluZ0RyYXdpbmdBcmVhID0gU2hv dWxkRGVsYXlBdHRhY2hpbmdEcmF3aW5nQXJlYTo6Tm8pOwogCg== 358089 2018-12-26 17:27:30 -0800 2018-12-26 19:16:18 -0800 Try EWS bug-193030-20181227102729.patch text/plain 4652 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk5NTNjODkxYjA5NmY0NzU3 YTI4MTQ2N2I3ZTdiMzE1Y2NiYTc3MDcuLjEzNzI2NWI0Yzc2MWY2YzA1NDBjOWEwMDZiMjVjY2Q5 NTg2OWU2NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTgtMTItMjYgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW01TVkNdIGVycm9y IEMyMzgxOiAnV2ViS2l0OjpOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcjo6fk5ldHdvcmtIVFRQ U1VwZ3JhZGVDaGVja2VyJzogcmVkZWZpbml0aW9uOyAnX19kZWNsc3BlYyhub3JldHVybiknIG9y ICdbW25vcmV0dXJuXV0nIGRpZmZlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MzAzMAorCisgICAgICAgIFJldmlld2VkIGJ5IFJvc3MgS2lyc2xp bmcuCisKKyAgICAgICAgV2luZG93cyBEZWJ1ZyBidWlsZHMgYXJlIGZhaWxpbmcgdG8gY29tcGls ZSBkdWUgdG8KKyAgICAgICAgTk9fUkVUVVJOX0RVRV9UT19BU1NFUlQgaW5jb25zaXN0ZW5jeSBv ZgorICAgICAgICBOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlciBkZXN0cnVjdG9yJ3MgZGVmaW5p dGlvbiBhbmQKKyAgICAgICAgZGVjbGFyYXRpb24uCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5oOiBBZGRlZAorICAgICAgICBOT19SRVRVUk5f RFVFX1RPX0FTU0VSVCB0byBOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlciBkZXN0cnVjdG9yCisg ICAgICAgIGRlY2xhcmF0aW9uLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw OiBSZW1vdmVkICIjaWYgIUNPTVBJTEVSKE1TVkMpIiBoYWNrcy4KKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5Lmg6IEFkZGVkIE5PX1JFVFVSTl9EVUVfVE9fQVNTRVJUIHRvCisgICAg ICAgIGRlY2xhcmF0aW9ucyBvZiBkaWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCBhbmQK KyAgICAgICAgZGlkU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAuCisKIDIwMTgtMTItMjQgIEZ1amlp IEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgW1dlYktpdF1b V2luXSBSZW1vdmUgdXNpbmcgbmFtZXNwYWNlIGluIHRoZSBnbG9iYWwgc2NvcGUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNr ZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrSFRUUFNVcGdyYWRl Q2hlY2tlci5jcHAKaW5kZXggODljZmE4MjQ4ZjJjMTUzYThhMDllMTg3MmFhNzMxOGM2MjA5OWVl NC4uZDBmN2Q2YWJkYjNmNTllMzg0NGJkMTM3ZmU1MGM2NzY2ZDdjMjZiOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5j cHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrSFRUUFNVcGdyYWRl Q2hlY2tlci5jcHAKQEAgLTc5LDcgKzc5LDcgQEAgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6 Ok5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyKCkKICAgICB9KTsKIH0KIAotTk9fUkVUVVJOX0RV RV9UT19BU1NFUlQgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6On5OZXR3b3JrSFRUUFNVcGdy YWRlQ2hlY2tlcigpCitOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcjo6fk5ldHdvcmtIVFRQU1Vw Z3JhZGVDaGVja2VyKCkKIHsKICAgICAvLyBUaGlzIG9iamVjdCBzaG91bGQgYmUgb3duZWQgYnkg YSBzaW5nbGV0b24gb2JqZWN0LgogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tl ci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrSFRUUFNVcGdyYWRlQ2hl Y2tlci5oCmluZGV4IDM4MzdlNjc3YjczMDVlNjVlMGQ1ZGM1ZDI5NDM4ZDlhMTU5NGM0OWUuLmFm YWUxZGNkZjZhN2VlMjMzYmE0ODNkMjhmN2FmYTliYTFjNmE0NDMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2Vy LmgKQEAgLTQ1LDcgKzQ1LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBOZXR3b3JrSFRU UFNVcGdyYWRlQ2hlY2tlciB7CiBwdWJsaWM6CiAgICAgTmV0d29ya0hUVFBTVXBncmFkZUNoZWNr ZXIoKTsKLSAgICB+TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIoKTsKKyAgICBOT19SRVRVUk5f RFVFX1RPX0FTU0VSVCB+TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIoKTsKIAogICAgIC8vIFJl dHVybnMgYHRydWVgIGFmdGVyIGludGVybmFsIHNldHVwIGlzIHN1Y2Nlc3NmdWxseSBjb21wbGV0 ZWQuIElmIHRoZXJlIGlzIGFuIGVycm9yIHdpdGggc2V0dXAsIG9yIGlmIHNldHVwIGlzIGluLXBy b2dyZXNzLCBpdCB3aWxsIHJldHVybiBgZmFsc2VgLgogICAgIGJvb2wgZGlkU2V0dXBDb21wbGV0 ZVN1Y2Nlc3NmdWxseSgpIGNvbnN0IHsgcmV0dXJuIG1fZGlkU2V0dXBDb21wbGV0ZVN1Y2Nlc3Nm dWxseTsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDlk YjcwNzEwZDk5MDEwMGM1Y2IwNThiZmRlOTJiYzc3ZWE1MWIxMWQuLjcwZmE3MmQ3YjQ0MTkwOTRk NjMwZGNmMWI5NGMxNzhjOTIyYjA1ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcApAQCAtMjgzOSwyMCArMjgzOSwxMiBAQCBib29sIFdlYlBhZ2VQcm94eTo6aXNQ YWdlT3BlbmVkQnlET01TaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSBjb25zdAogICAgIHJl dHVybiBvcGVuZWRCeURPTSgpICYmICFoYXNDb21taXR0ZWRBbnlQcm92aXNpb25hbExvYWRzKCk7 CiB9CiAKLS8vIE1TVkMgZ2l2ZXMgYSByZWRlY2xhcmF0aW9uIGVycm9yIGlmIG5vcmV0dXJuIGlz IHVzZWQgb24gdGhlIGRlZmluaXRpb24gYW5kIG5vdCB0aGUgZGVjbGFyYXRpb24sIHdoaWxlCi0v LyBDb2NvYSB0ZXN0cyBzZWdmYXVsdCBpZiBpdCBpcyBtb3ZlZCB0byB0aGUgZGVjbGFyYXRpb24g c2l0ZSAoZXZlbiBpZiB3ZSBtb3ZlIHRoZSBkZWZpbml0aW9uIHdpdGggaXQhKS4KLSNpZiAhQ09N UElMRVIoTVNWQykKLU5PX1JFVFVSTl9EVUVfVE9fQVNTRVJUCi0jZW5kaWYKIHZvaWQgV2ViUGFn ZVByb3h5OjpkaWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpCiB7CiAgICAgLy8gT25s eSB0aGUgU3VzcGVuZGVkUGFnZVByb3h5IHNob3VsZCBiZSBnZXR0aW5nIHRoaXMgY2FsbC4KICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotI2lmICFDT01QSUxFUihNU1ZDKQotTk9fUkVU VVJOX0RVRV9UT19BU1NFUlQKLSNlbmRpZgogdm9pZCBXZWJQYWdlUHJveHk6OmRpZFN1c3BlbmRB ZnRlclByb2Nlc3NTd2FwKCkKIHsKICAgICAvLyBPbmx5IHRoZSBTdXNwZW5kZWRQYWdlUHJveHkg c2hvdWxkIGJlIGdldHRpbmcgdGhpcyBjYWxsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaAppbmRleCAwMWJlYTUwZDRmMmYyODE5MDNkZDYxZjljZmU0MDhkZmNjMDJiM2FkLi4w Mjc4ODAyMzM1YWY1NmY0N2JhMDlmMjU3NDk3ZGQxZjk5NWM2ODBhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMTU2OCw4ICsxNTY4LDggQEAgcHJpdmF0ZToKIAog ICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKICAgICB2b2lkIHN3YXBUb1dlYlByb2Nl c3MoUmVmPFdlYlByb2Nlc3NQcm94eT4mJiwgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQ cm94eT4mJiwgU2hvdWxkRGVsYXlBdHRhY2hpbmdEcmF3aW5nQXJlYSk7Ci0gICAgdm9pZCBkaWRG YWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpOwotICAgIHZvaWQgZGlkU3VzcGVuZEFmdGVy UHJvY2Vzc1N3YXAoKTsKKyAgICBOT19SRVRVUk5fRFVFX1RPX0FTU0VSVCB2b2lkIGRpZEZhaWxU b1N1c3BlbmRBZnRlclByb2Nlc3NTd2FwKCk7CisgICAgTk9fUkVUVVJOX0RVRV9UT19BU1NFUlQg dm9pZCBkaWRTdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCgpOwogCiAgICAgdm9pZCBmaW5pc2hBdHRh Y2hpbmdUb1dlYlByb2Nlc3MoU2hvdWxkRGVsYXlBdHRhY2hpbmdEcmF3aW5nQXJlYSA9IFNob3Vs ZERlbGF5QXR0YWNoaW5nRHJhd2luZ0FyZWE6Ok5vKTsKIAo= 358093 2018-12-26 19:16:52 -0800 2018-12-26 19:16:52 -0800 Patch for landing bug-193030-20181227121651.patch text/plain 2677 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk5NTNjODkxYjA5NmY0NzU3 YTI4MTQ2N2I3ZTdiMzE1Y2NiYTc3MDcuLmM5YzRlZjYyNTQ1MDM3YzliYzFjYThiZDE0ZjVhMDFk Y2EzMGVlZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMTItMjYgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW01TVkNdIGVycm9y IEMyMzgxOiAnV2ViS2l0OjpOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlcjo6fk5ldHdvcmtIVFRQ U1VwZ3JhZGVDaGVja2VyJzogcmVkZWZpbml0aW9uOyAnX19kZWNsc3BlYyhub3JldHVybiknIG9y ICdbW25vcmV0dXJuXV0nIGRpZmZlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MzAzMAorCisgICAgICAgIFJldmlld2VkIGJ5IFJvc3MgS2lyc2xp bmcuCisKKyAgICAgICAgV2luZG93cyBEZWJ1ZyBidWlsZHMgYXJlIGZhaWxpbmcgdG8gY29tcGls ZSBkdWUgdG8KKyAgICAgICAgTk9fUkVUVVJOX0RVRV9UT19BU1NFUlQgaW5jb25zaXN0ZW5jeSBv ZgorICAgICAgICBOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlciBkZXN0cnVjdG9yJ3MgZGVmaW5p dGlvbiBhbmQKKyAgICAgICAgZGVjbGFyYXRpb24uCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5oOiBBZGRlZAorICAgICAgICBOT19SRVRVUk5f RFVFX1RPX0FTU0VSVCB0byBOZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlciBkZXN0cnVjdG9yCisg ICAgICAgIGRlY2xhcmF0aW9uLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQ U1VwZ3JhZGVDaGVja2VyLmNwcDogUmVtb3ZlZAorICAgICAgICBOT19SRVRVUk5fRFVFX1RPX0FT U0VSVCBmcm9tIHRoZSBkZWZpbml0aW9uLgorCiAyMDE4LTEyLTI0ICBGdWppaSBIaXJvbm9yaSAg PEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXZWJLaXRdW1dpbl0gUmVtb3Zl IHVzaW5nIG5hbWVzcGFjZSBpbiB0aGUgZ2xvYmFsIHNjb3BlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmNwcCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuY3Bw CmluZGV4IDg5Y2ZhODI0OGYyYzE1M2E4YTA5ZTE4NzJhYTczMThjNjIwOTllZTQuLmQwZjdkNmFi ZGIzZjU5ZTM4NDRiZDEzN2ZlNTBjNjc2NmQ3YzI2YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuY3Bw CkBAIC03OSw3ICs3OSw3IEBAIE5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyOjpOZXR3b3JrSFRU UFNVcGdyYWRlQ2hlY2tlcigpCiAgICAgfSk7CiB9CiAKLU5PX1JFVFVSTl9EVUVfVE9fQVNTRVJU IE5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyOjp+TmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIo KQorTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXI6On5OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tl cigpCiB7CiAgICAgLy8gVGhpcyBvYmplY3Qgc2hvdWxkIGJlIG93bmVkIGJ5IGEgc2luZ2xldG9u IG9iamVjdC4KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0hUVFBTVXBncmFkZUNoZWNrZXIuaAppbmRl eCAzODM3ZTY3N2I3MzA1ZTY1ZTBkNWRjNWQyOTQzOGQ5YTE1OTRjNDllLi5hZmFlMWRjZGY2YTdl ZTIzM2JhNDgzZDI4ZjdhZmE5YmExYzZhNDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyLmgKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrSFRUUFNVcGdyYWRlQ2hlY2tlci5oCkBAIC00NSw3 ICs0NSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTmV0d29ya0hUVFBTVXBncmFkZUNo ZWNrZXIgewogcHVibGljOgogICAgIE5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyKCk7Ci0gICAg fk5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyKCk7CisgICAgTk9fUkVUVVJOX0RVRV9UT19BU1NF UlQgfk5ldHdvcmtIVFRQU1VwZ3JhZGVDaGVja2VyKCk7CiAKICAgICAvLyBSZXR1cm5zIGB0cnVl YCBhZnRlciBpbnRlcm5hbCBzZXR1cCBpcyBzdWNjZXNzZnVsbHkgY29tcGxldGVkLiBJZiB0aGVy ZSBpcyBhbiBlcnJvciB3aXRoIHNldHVwLCBvciBpZiBzZXR1cCBpcyBpbi1wcm9ncmVzcywgaXQg d2lsbCByZXR1cm4gYGZhbHNlYC4KICAgICBib29sIGRpZFNldHVwQ29tcGxldGVTdWNjZXNzZnVs bHkoKSBjb25zdCB7IHJldHVybiBtX2RpZFNldHVwQ29tcGxldGVTdWNjZXNzZnVsbHk7IH07Cg==