166662 2017-01-03 13:53:09 -0800 Make WTF::Expected support Ref template parameters 2017-01-03 15:19:40 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam benjamin cdumez cmarcelo commit-queue dbates oldest_to_newest 1263521 0 sam 2017-01-03 13:53:09 -0800 Make WTF::Expected support Ref template parameters 1263523 1 297948 sam 2017-01-03 13:58:29 -0800 Created attachment 297948 Patch 1263574 2 sam 2017-01-03 15:19:40 -0800 Committed r210253: <http://trac.webkit.org/changeset/210253> 297948 2017-01-03 13:58:29 -0800 2017-01-03 15:12:45 -0800 Patch bug-166662-20170103135704.patch text/plain 6509 sam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMTAyMzkpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE3LTAxLTAzICBTYW0gV2VpbmlnICA8c2FtQHdl YmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBXVEY6OkV4cGVjdGVkIHN1cHBvcnQgUmVmIHRlbXBs YXRlIHBhcmFtZXRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE2NjY2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRlc3RzOiBBZGRlZCB0byBUZXN0V2ViS2l0QVBJL0V4cGVjdGVkLmNwcAorCisgICAg ICAgICogd3RmL0V4cGVjdGVkLmg6CisgICAgICAgIChXVEY6OlVuZXhwZWN0ZWRUeXBlOjp2YWx1 ZSk6CisgICAgICAgIEFkZCBvdmVybG9hZHMgYmFzZWQgb24gdGhpcyB2YWx1ZSB0eXBlIHRvIGFs bG93IGdldHRpbmcgYXQgdGhlIHZhbHVlCisgICAgICAgIGFzIGFuIHJ2YWx1ZSBmb3IgbW92aW5n IHRoZSBlcnJvciBpbnRvIHRoZSBFeHBlY3RlZC4KKworICAgICAgICAoV1RGOjpFeHBlY3RlZDo6 RXhwZWN0ZWQpOgorICAgICAgICBBZGQgb3ZlcmxvYWQgdGhhdCB0YWtlcyBhbiBFcnJvclR5cGUv VW5leHBlY3RlZFR5cGU8RXJyb3JUeXBlPiBhcyBhbiBydmFsdWUuCisKKyAgICAgICAgKFdURjo6 RXhwZWN0ZWQ6OnN3YXApOgorICAgICAgICBNb3ZlIHRoZSB0ZW1wb3JhcnkgdmFsdWUvZXJyb3Ig cmF0aGVyIHRoYW4gY29weWluZy4KKwogMjAxNy0wMS0wMiAgSnVsaWVuIEJyaWFuY2VhdSAgPGpi cmlhbmNlQGNpc2NvLmNvbT4KIAogICAgICAgICBSZW1vdmUgc2g0IHNwZWNpZmljIGNvZGUgZnJv bSBKYXZhU2NyaXB0Q29yZQpJbmRleDogU291cmNlL1dURi93dGYvRXhwZWN0ZWQuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9FeHBlY3RlZC5oCShyZXZpc2lvbiAyMTAyMzkpCisrKyBT b3VyY2UvV1RGL3d0Zi9FeHBlY3RlZC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw4ICs0Niw5IEBA IHB1YmxpYzoKICAgICBVbmV4cGVjdGVkVHlwZSgpID0gZGVsZXRlOwogICAgIGNvbnN0ZXhwciBl eHBsaWNpdCBVbmV4cGVjdGVkVHlwZShjb25zdCBFJiBlKSA6IHZhbChlKSB7IH0KICAgICBjb25z dGV4cHIgZXhwbGljaXQgVW5leHBlY3RlZFR5cGUoRSYmIGUpIDogdmFsKHN0ZDo6Zm9yd2FyZDxF PihlKSkgeyB9Ci0gICAgY29uc3RleHByIGNvbnN0IEUmIHZhbHVlKCkgY29uc3QgeyByZXR1cm4g dmFsOyB9Ci0gICAgUkVMQVhFRF9DT05TVEVYUFIgRSYgdmFsdWUoKSB7IHJldHVybiB2YWw7IH0K KyAgICBjb25zdGV4cHIgY29uc3QgRSYgdmFsdWUoKSBjb25zdCYgeyByZXR1cm4gdmFsOyB9Cisg ICAgUkVMQVhFRF9DT05TVEVYUFIgRSYgdmFsdWUoKSAmIHsgcmV0dXJuIHZhbDsgfQorICAgIFJF TEFYRURfQ09OU1RFWFBSIEUmJiB2YWx1ZSgpICYmIHsgcmV0dXJuIFdURk1vdmUodmFsKTsgfQog CiBwcml2YXRlOgogICAgIEUgdmFsOwpAQCAtMTk5LDYgKzIwMCw3IEBAIHN0cnVjdCBDb25zdGV4 cHJCYXNlPHZvaWQsIEU+IHsKICAgICBjb25zdGV4cHIgQ29uc3RleHByQmFzZShWYWx1ZVRhZ1R5 cGUgdGFnKSA6IHModGFnKSwgaGFzKHRydWUpIHsgfQogICAgIGNvbnN0ZXhwciBDb25zdGV4cHJC YXNlKEVycm9yVGFnVHlwZSB0YWcpIDogcyh0YWcpLCBoYXMoZmFsc2UpIHsgfQogICAgIGNvbnN0 ZXhwciBDb25zdGV4cHJCYXNlKEVycm9yVGFnVHlwZSB0YWcsIGNvbnN0IEVycm9yVHlwZSYgZXJy KSA6IHModGFnLCBlcnIpLCBoYXMoZmFsc2UpIHsgfQorICAgIGNvbnN0ZXhwciBDb25zdGV4cHJC YXNlKEVycm9yVGFnVHlwZSB0YWcsIEVycm9yVHlwZSYmIGVycikgOiBzKHRhZywgc3RkOjpmb3J3 YXJkPEVycm9yVHlwZT4oZXJyKSksIGhhcyhmYWxzZSkgeyB9CiAgICAgfkNvbnN0ZXhwckJhc2Uo KSA9IGRlZmF1bHQ7CiB9OwogCkBAIC0yMTIsNiArMjE0LDcgQEAgc3RydWN0IEJhc2U8dm9pZCwg RT4gewogICAgIGNvbnN0ZXhwciBCYXNlKFZhbHVlVGFnVHlwZSB0YWcpIDogcyh0YWcpLCBoYXMo dHJ1ZSkgeyB9CiAgICAgY29uc3RleHByIEJhc2UoRXJyb3JUYWdUeXBlIHRhZykgOiBzKHRhZyks IGhhcyhmYWxzZSkgeyB9CiAgICAgY29uc3RleHByIEJhc2UoRXJyb3JUYWdUeXBlIHRhZywgY29u c3QgRXJyb3JUeXBlJiBlcnIpIDogcyh0YWcsIGVyciksIGhhcyhmYWxzZSkgeyB9CisgICAgY29u c3RleHByIEJhc2UoRXJyb3JUYWdUeXBlIHRhZywgRXJyb3JUeXBlJiYgZXJyKSA6IHModGFnLCBz dGQ6OmZvcndhcmQ8RXJyb3JUeXBlPihlcnIpKSwgaGFzKGZhbHNlKSB7IH0KICAgICBCYXNlKGNv bnN0IEJhc2UmIG8pCiAgICAgICAgIDogaGFzKG8uaGFzKQogICAgIHsKQEAgLTI2Myw2ICsyNjYs NyBAQCBwdWJsaWM6CiAgICAgLy8gdGVtcGxhdGUgPGNsYXNzLi4uIEFyZ3M+IGNvbnN0ZXhwciBl eHBsaWNpdCBFeHBlY3RlZChpbl9wbGFjZV90LCBBcmdzJiYuLi4pOwogICAgIC8vIHRlbXBsYXRl IDxjbGFzcyBVLCBjbGFzcy4uLiBBcmdzPiBjb25zdGV4cHIgZXhwbGljaXQgRXhwZWN0ZWQoaW5f cGxhY2VfdCwgc3RkOjppbml0aWFsaXplcl9saXN0PFU+LCBBcmdzJiYuLi4pOwogICAgIGNvbnN0 ZXhwciBFeHBlY3RlZChVbmV4cGVjdGVkVHlwZTxFcnJvclR5cGU+IGNvbnN0JiB1KSA6IGJhc2Uo RXhwZWN0ZWREZXRhaWw6OkVycm9yVGFnLCB1LnZhbHVlKCkpIHsgfQorICAgIGNvbnN0ZXhwciBF eHBlY3RlZChVbmV4cGVjdGVkVHlwZTxFcnJvclR5cGU+JiYgdSkgOiBiYXNlKEV4cGVjdGVkRGV0 YWlsOjpFcnJvclRhZywgc3RkOjpmb3J3YXJkPFVuZXhwZWN0ZWRUeXBlPEU+Pih1KS52YWx1ZSgp KSB7IH0KICAgICB0ZW1wbGF0ZSA8Y2xhc3MgRXJyPiBjb25zdGV4cHIgRXhwZWN0ZWQoVW5leHBl Y3RlZFR5cGU8RXJyPiBjb25zdCYgdSkgOiBiYXNlKEV4cGVjdGVkRGV0YWlsOjpFcnJvclRhZywg dS52YWx1ZSgpKSB7IH0KICAgICAvLyB0ZW1wbGF0ZSA8Y2xhc3MuLi4gQXJncz4gY29uc3RleHBy IGV4cGxpY2l0IEV4cGVjdGVkKFVuZXhwZWN0VGFnLCBBcmdzJiYuLi4pOwogICAgIC8vIHRlbXBs YXRlIDxjbGFzcyBVLCBjbGFzcy4uLiBBcmdzPiBjb25zdGV4cHIgZXhwbGljaXQgRXhwZWN0ZWQo VW5leHBlY3RUYWcsIHN0ZDo6aW5pdGlhbGl6ZXJfbGlzdDxVPiwgQXJncyYmLi4uKTsKQEAgLTI4 NSwxMiArMjg5LDEyIEBAIHB1YmxpYzoKICAgICAgICAgZWxzZSBpZiAoYmFzZTo6aGFzICYmICFv LmhhcykgewogICAgICAgICAgICAgRXJyb3JUeXBlIGUoV1RGTW92ZShvLnMuZXJyKSk7CiAgICAg ICAgICAgICA6Om5ldyAoJm8ucy52YWwpIFZhbHVlVHlwZShXVEZNb3ZlKGJhc2U6OnMudmFsKSk7 Ci0gICAgICAgICAgICA6Om5ldyAoJmJhc2U6OnMuZXJyKSBFcnJvclR5cGUoZSk7CisgICAgICAg ICAgICA6Om5ldyAoJmJhc2U6OnMuZXJyKSBFcnJvclR5cGUoV1RGTW92ZShlKSk7CiAgICAgICAg ICAgICBzd2FwKGJhc2U6Omhhcywgby5oYXMpOwogICAgICAgICB9IGVsc2UgaWYgKCFiYXNlOjpo YXMgJiYgby5oYXMpIHsKICAgICAgICAgICAgIFZhbHVlVHlwZSB2KFdURk1vdmUoby5zLnZhbCkp OwogICAgICAgICAgICAgOjpuZXcgKCZvLnMuZXJyKSBFcnJvclR5cGUoV1RGTW92ZShiYXNlOjpz LmVycikpOwotICAgICAgICAgICAgOjpuZXcgKCZiYXNlOjpzLnZhbCkgVmFsdWVUeXBlKHYpOwor ICAgICAgICAgICAgOjpuZXcgKCZiYXNlOjpzLnZhbCkgVmFsdWVUeXBlKFdURk1vdmUodikpOwog ICAgICAgICAgICAgc3dhcChiYXNlOjpoYXMsIG8uaGFzKTsKICAgICAgICAgfSBlbHNlCiAgICAg ICAgICAgICBzd2FwKGJhc2U6OnMuZXJyLCBvLnMuZXJyKTsKQEAgLTMzNiw2ICszNDAsNyBAQCBw dWJsaWM6CiAgICAgRXhwZWN0ZWQoRXhwZWN0ZWQmJikgPSBkZWZhdWx0OwogICAgIC8vIGNvbnN0 ZXhwciBleHBsaWNpdCBFeHBlY3RlZChpbl9wbGFjZV90KTsKICAgICBjb25zdGV4cHIgRXhwZWN0 ZWQoVW5leHBlY3RlZFR5cGU8RT4gY29uc3QmIHUpIDogYmFzZShFeHBlY3RlZERldGFpbDo6RXJy b3JUYWcsIHUudmFsdWUoKSkgeyB9CisgICAgY29uc3RleHByIEV4cGVjdGVkKFVuZXhwZWN0ZWRU eXBlPEU+JiYgdSkgOiBiYXNlKEV4cGVjdGVkRGV0YWlsOjpFcnJvclRhZywgc3RkOjpmb3J3YXJk PFVuZXhwZWN0ZWRUeXBlPEU+Pih1KS52YWx1ZSgpKSB7IH0KICAgICB0ZW1wbGF0ZSA8Y2xhc3Mg RXJyPiBjb25zdGV4cHIgRXhwZWN0ZWQoVW5leHBlY3RlZFR5cGU8RXJyPiBjb25zdCYgdSkgOiBi YXNlKEV4cGVjdGVkRGV0YWlsOjpFcnJvclRhZywgdS52YWx1ZSgpKSB7IH0KIAogICAgIH5FeHBl Y3RlZCgpID0gZGVmYXVsdDsKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMDI0NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE3LTAxLTAzICBTYW0gV2VpbmlnICA8c2Ft QHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBXVEY6OkV4cGVjdGVkIHN1cHBvcnQgUmVmIHRl bXBsYXRlIHBhcmFtZXRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2NjY2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvRXhwZWN0ZWQuY3BwOgorICAgICAg ICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgIEFkZCB0ZXN0cyBmb3IgdXNpbmcgUmVm IHdpdGggRXhwZWN0ZWQuCisKIDIwMTctMDEtMDMgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFu emFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIEV4cG9zZSBXZWJLaXRTZWN1cml0eU9y aWdpbiBBUEkKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0V4cGVjdGVkLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9FeHBlY3RlZC5j cHAJKHJldmlzaW9uIDIxMDIzOSkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0V4 cGVjdGVkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjUsMTAgKzI1LDEzIEBACiAKICNpbmNsdWRl ICJjb25maWcuaCIKIAorI2luY2x1ZGUgIlJlZkxvZ2dlci5oIgorCiAjaW5jbHVkZSA8c3RyaW5n PgogI2luY2x1ZGUgPHVub3JkZXJlZF9tYXA+CiAKICNpbmNsdWRlIDx3dGYvRXhwZWN0ZWQuaD4K KyNpbmNsdWRlIDx3dGYvUmVmLmg+CiAKIG5hbWVzcGFjZSBXVEYgewogCkBAIC00NjcsNCArNDcw LDM1IEBAIFRFU1QoV1RGX0V4cGVjdGVkLCBoYXNoX3ZvaWQpCiAgICAgRVhQRUNUX0VRKG1bRSht YWtlVW5leHBlY3RlZChmb29mKSldLCAweGYwMGYpOwogfQogCitURVNUKFdURl9FeHBlY3RlZCwg UmVmKQoreworICAgIHsKKyAgICAgICAgUmVmTG9nZ2VyIGEoImEiKTsKKyAgICAgICAgRXhwZWN0 ZWQ8UmVmPFJlZkxvZ2dlcj4sIGludD4gZXhwZWN0ZWQgPSBSZWY8UmVmTG9nZ2VyPihhKTsKKyAg ICB9CisKKyAgICBBU1NFUlRfU1RSRVEoInJlZihhKSBkZXJlZihhKSAiLCB0YWtlTG9nU3RyKCku Y19zdHIoKSk7CisKKyAgICB7CisgICAgICAgIFJlZkxvZ2dlciBhKCJhIik7CisgICAgICAgIEV4 cGVjdGVkPFJlZjxSZWZMb2dnZXI+LCBpbnQ+IGV4cGVjdGVkID0gbWFrZUV4cGVjdGVkPFJlZjxS ZWZMb2dnZXI+LCBpbnQ+KFJlZjxSZWZMb2dnZXI+KGEpKTsKKyAgICB9CisKKyAgICBBU1NFUlRf U1RSRVEoInJlZihhKSBkZXJlZihhKSAiLCB0YWtlTG9nU3RyKCkuY19zdHIoKSk7CisKKyAgICB7 CisgICAgICAgIFJlZkxvZ2dlciBhKCJhIik7CisgICAgICAgIEV4cGVjdGVkPGludCwgUmVmPFJl ZkxvZ2dlcj4+IGV4cGVjdGVkID0gbWFrZVVuZXhwZWN0ZWQoUmVmPFJlZkxvZ2dlcj4oYSkpOwor ICAgIH0KKworICAgIEFTU0VSVF9TVFJFUSgicmVmKGEpIGRlcmVmKGEpICIsIHRha2VMb2dTdHIo KS5jX3N0cigpKTsKKworICAgIHsKKyAgICAgICAgUmVmTG9nZ2VyIGEoImEiKTsKKyAgICAgICAg RXhwZWN0ZWQ8dm9pZCwgUmVmPFJlZkxvZ2dlcj4+IGV4cGVjdGVkID0gbWFrZVVuZXhwZWN0ZWQo UmVmPFJlZkxvZ2dlcj4oYSkpOworICAgIH0KKworICAgIEFTU0VSVF9TVFJFUSgicmVmKGEpIGRl cmVmKGEpICIsIHRha2VMb2dTdHIoKS5jX3N0cigpKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgVGVz dFdlYmtpdEFQSQo=