147874 2015-08-11 01:50:19 -0700 [ES6] Implement Reflect.getPrototypeOf and Reflect.setPrototypeOf 2015-08-11 10:57:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ysuzuki ysuzuki darin fpizlo ggaren mark.lam saam sam oldest_to_newest 1116518 0 ysuzuki 2015-08-11 01:50:19 -0700 [ES6] Implement Reflect.getPrototypeOf and Reflect.setPrototypeOf 1116519 1 258711 ysuzuki 2015-08-11 01:52:30 -0700 Created attachment 258711 Patch 1116574 2 258711 darin 2015-08-11 10:37:59 -0700 Comment on attachment 258711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258711&action=review > Source/JavaScriptCore/runtime/ObjectConstructor.cpp:190 > return JSValue::encode(jsNull()); Strange that this uses jsNull where most call sites use jsUndefined, yet this value is always ignored. Untidy to have this be different across the code base. 1116583 3 258711 ysuzuki 2015-08-11 10:51:33 -0700 Comment on attachment 258711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258711&action=review Thank you :) >> Source/JavaScriptCore/runtime/ObjectConstructor.cpp:190 >> return JSValue::encode(jsNull()); > > Strange that this uses jsNull where most call sites use jsUndefined, yet this value is always ignored. Untidy to have this be different across the code base. Seeing the ObjectConstructor.cpp, in this file, using "jsNull()" as the non meaningful return value for the exception is major. So I'll fix the touched part in this patch: `objectConstructorGetPrototypeOf` one. When modifying / fixing the other part, at that time, we need to fix it gradually. 1116587 4 ysuzuki 2015-08-11 10:57:30 -0700 Committed r188262: <http://trac.webkit.org/changeset/188262> 258711 2015-08-11 01:52:30 -0700 2015-08-11 10:37:59 -0700 Patch bug-147874-20150811015215.patch text/plain 12598 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh NGZlYmY3Y2I3YTlkZDI0NDg4Zjk4ZGZlMGQyYWU5Njk3YjU5MTQ0Li5kYmU1NzExOWQzMzEzZjY3 ODg5Y2FiYzJjZjc0NzM2MmJlYWQyNDg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAxNS0wOC0xMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbRVM2XSBJbXBsZW1lbnQgUmVmbGVjdC5nZXRQcm90b3R5cGVPZiBh bmQgUmVmbGVjdC5zZXRQcm90b3R5cGVPZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3ODc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpbXBsZW1lbnRzIEVTNiBSZWZsZWN0LntnZXRQ cm90b3R5cGVPZiwgc2V0UHJvdG90eXBlT2Z9LgorICAgICAgICBUaGUgZGlmZmVyZW5jZSBmcm9t IHRoZSBPYmplY3QuKiBvbmUgaXMKKworICAgICAgICAxLiBUaGV5IGRvbnQgbm90IHBlcmZvcm0g VG9PYmplY3Qgb250byB0aGUgbm9uLW9iamVjdCBhcmd1bWVudHMuIFRoZXkgbWFrZSBpdCBhcyBh IFR5cGVFcnJvci4KKyAgICAgICAgMi4gUmVmbGVjdC5zZXRQcm90b3R5ZU9mIHJldHVybnMgZmFs c2Ugd2hlbiB0aGUgb3BlcmF0aW9uIGlzIGZhaWxlZC4gSW4gT2JqZWN0LnNldFByb3RvdHlwZU9m LCBpdCByYWlzZXMgYSBUeXBlRXJyb3IuCisKKyAgICAgICAgKiBydW50aW1lL09iamVjdENvbnN0 cnVjdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6T2JqZWN0Q29uc3RydWN0b3JHZXRQcm90b3R5cGVP ZkZ1bmN0b3I6Ok9iamVjdENvbnN0cnVjdG9yR2V0UHJvdG90eXBlT2ZGdW5jdG9yKToKKyAgICAg ICAgKEpTQzo6T2JqZWN0Q29uc3RydWN0b3JHZXRQcm90b3R5cGVPZkZ1bmN0b3I6OnJlc3VsdCk6 CisgICAgICAgIChKU0M6Ok9iamVjdENvbnN0cnVjdG9yR2V0UHJvdG90eXBlT2ZGdW5jdG9yOjpv cGVyYXRvcigpKToKKyAgICAgICAgKEpTQzo6b2JqZWN0Q29uc3RydWN0b3JHZXRQcm90b3R5cGVP Zik6CisgICAgICAgICogcnVudGltZS9PYmplY3RDb25zdHJ1Y3Rvci5oOgorICAgICAgICAqIHJ1 bnRpbWUvUmVmbGVjdE9iamVjdC5jcHA6CisgICAgICAgIChKU0M6OnJlZmxlY3RPYmplY3RHZXRQ cm90b3R5cGVPZik6CisgICAgICAgIChKU0M6OnJlZmxlY3RPYmplY3RTZXRQcm90b3R5cGVPZik6 CisgICAgICAgICogdGVzdHMvc3RyZXNzL3JlZmxlY3QtZ2V0LXByb3RvdHlwZS1vZi5qczogQWRk ZWQuCisgICAgICAgIChzaG91bGRCZSk6CisgICAgICAgIChzaG91bGRUaHJvdyk6CisgICAgICAg IChCYXNlKToKKyAgICAgICAgKERlcml2ZWQpOgorICAgICAgICAqIHRlc3RzL3N0cmVzcy9yZWZs ZWN0LXNldC1wcm90b3R5cGUtb2YuanM6IEFkZGVkLgorICAgICAgICAoc2hvdWxkQmUpOgorICAg ICAgICAoc2hvdWxkVGhyb3cpOgorCiAyMDE1LTA4LTEwICBHZW9mZnJleSBHYXJlbiAgPGdnYXJl bkBhcHBsZS5jb20+CiAKICAgICAgICAgU3RhcnQgYmVhdGluZyBVbmxpbmtlZENvZGVCbG9jay5o Ly5jcHAgd2l0aCB0aGUgIk9uZSBDbGFzcyBwZXIgRmlsZSIgc3RpY2sKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09iamVjdENvbnN0cnVjdG9yLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09iamVjdENvbnN0cnVjdG9yLmNwcAppbmRleCA5YjE4 YTc0MzhkOTExZTI2NmQ2ZDMwYWU3ZTgwZTRkMzZjM2M1NDVlLi44ZDEwYzNkMmU5Y2FkYzEzODdj NjlmMDk4MWViODE3MjM5NGFjN2Q2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9PYmplY3RDb25zdHJ1Y3Rvci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuY3BwCkBAIC0xNTIsMTEgKzE1MiwxMSBAQCBjbGFz cyBPYmplY3RDb25zdHJ1Y3RvckdldFByb3RvdHlwZU9mRnVuY3RvciB7CiAgICAgT2JqZWN0Q29u c3RydWN0b3JHZXRQcm90b3R5cGVPZkZ1bmN0b3IoSlNPYmplY3QqIG9iamVjdCkKICAgICAgICAg OiBtX2hhc1NraXBwZWRGaXJzdEZyYW1lKGZhbHNlKQogICAgICAgICAsIG1fb2JqZWN0KG9iamVj dCkKLSAgICAgICAgLCBtX3Jlc3VsdChKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSkpCisg ICAgICAgICwgbV9yZXN1bHQoanNVbmRlZmluZWQoKSkKICAgICB7CiAgICAgfQogCi0gICAgRW5j b2RlZEpTVmFsdWUgcmVzdWx0KCkgY29uc3QgeyByZXR1cm4gbV9yZXN1bHQ7IH0KKyAgICBKU1Zh bHVlIHJlc3VsdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzdWx0OyB9CiAKICAgICBTdGFja1Zpc2l0 b3I6OlN0YXR1cyBvcGVyYXRvcigpKFN0YWNrVmlzaXRvciYgdmlzaXRvcikKICAgICB7CkBAIC0x NjYsMjQgKzE2NiwyOSBAQCBjbGFzcyBPYmplY3RDb25zdHJ1Y3RvckdldFByb3RvdHlwZU9mRnVu Y3RvciB7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAobV9vYmplY3QtPmFsbG93c0FjY2Vzc0Zy b20odmlzaXRvci0+Y2FsbEZyYW1lKCkpKQotICAgICAgICAgICAgbV9yZXN1bHQgPSBKU1ZhbHVl OjplbmNvZGUobV9vYmplY3QtPnByb3RvdHlwZSgpKTsKKyAgICAgICAgICAgIG1fcmVzdWx0ID0g bV9vYmplY3QtPnByb3RvdHlwZSgpOwogICAgICAgICByZXR1cm4gU3RhY2tWaXNpdG9yOjpEb25l OwogICAgIH0KIAogcHJpdmF0ZToKICAgICBib29sIG1faGFzU2tpcHBlZEZpcnN0RnJhbWU7CiAg ICAgSlNPYmplY3QqIG1fb2JqZWN0OwotICAgIEVuY29kZWRKU1ZhbHVlIG1fcmVzdWx0OworICAg IEpTVmFsdWUgbV9yZXN1bHQ7CiB9OwogCitKU1ZhbHVlIG9iamVjdENvbnN0cnVjdG9yR2V0UHJv dG90eXBlT2YoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogb2JqZWN0KQoreworICAgIE9iamVj dENvbnN0cnVjdG9yR2V0UHJvdG90eXBlT2ZGdW5jdG9yIGZ1bmN0b3Iob2JqZWN0KTsKKyAgICBl eGVjLT5pdGVyYXRlKGZ1bmN0b3IpOworICAgIHJldHVybiBmdW5jdG9yLnJlc3VsdCgpOworfQor CiBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIG9iamVjdENvbnN0cnVjdG9yR2V0UHJvdG90 eXBlT2YoRXhlY1N0YXRlKiBleGVjKQogewogICAgIEpTT2JqZWN0KiBvYmplY3QgPSBleGVjLT5h cmd1bWVudCgwKS50b09iamVjdChleGVjKTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkp CiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNOdWxsKCkpOwotICAgIE9iamVjdENv bnN0cnVjdG9yR2V0UHJvdG90eXBlT2ZGdW5jdG9yIGZ1bmN0b3Iob2JqZWN0KTsKLSAgICBleGVj LT5pdGVyYXRlKGZ1bmN0b3IpOwotICAgIHJldHVybiBmdW5jdG9yLnJlc3VsdCgpOworICAgIHJl dHVybiBKU1ZhbHVlOjplbmNvZGUob2JqZWN0Q29uc3RydWN0b3JHZXRQcm90b3R5cGVPZihleGVj LCBvYmplY3QpKTsKIH0KIAogRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBvYmplY3RDb25z dHJ1Y3RvclNldFByb3RvdHlwZU9mKEV4ZWNTdGF0ZSogZXhlYykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09iamVjdENvbnN0cnVjdG9yLmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9PYmplY3RDb25zdHJ1Y3Rvci5oCmluZGV4IDc5ZWM2MTk2YTJm MTUzMjMwMzdmYzVmMDdhZjE2MjA3ZjRjNTQ5YzAuLjEyNDdmYzFjZjE5NmI5MDUzODQzY2U0ZDVh ODlmN2Y4YmYxZDVjMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L09iamVjdENvbnN0cnVjdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv T2JqZWN0Q29uc3RydWN0b3IuaApAQCAtOTEsNiArOTEsNyBAQCBpbmxpbmUgSlNPYmplY3QqIGNv bnN0cnVjdEVtcHR5T2JqZWN0KEV4ZWNTdGF0ZSogZXhlYykKIH0KIAogSlNPYmplY3QqIG9iamVj dENvbnN0cnVjdG9yRnJlZXplKEV4ZWNTdGF0ZSosIEpTT2JqZWN0Kik7CitKU1ZhbHVlIG9iamVj dENvbnN0cnVjdG9yR2V0UHJvdG90eXBlT2YoRXhlY1N0YXRlKiwgSlNPYmplY3QqKTsKIEpTQXJy YXkqIG93blByb3BlcnR5S2V5cyhFeGVjU3RhdGUqLCBKU09iamVjdCosIFByb3BlcnR5TmFtZU1v ZGUsIERvbnRFbnVtUHJvcGVydGllc01vZGUpOwogCiB9IC8vIG5hbWVzcGFjZSBKU0MKZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1JlZmxlY3RPYmplY3QuY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVmbGVjdE9iamVjdC5jcHAKaW5kZXggZjUy YzZkYTk5NjY4NmFiY2ZhODUxMDQ1ZjFiNmM0ZGIwNmEyMTk4ZS4uZjA2YmYxZmQ1ZWMwZWEzZjJj NTA0OWIwMzVhYTFkMjhlYzE0MWEyYSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvUmVmbGVjdE9iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvUmVmbGVjdE9iamVjdC5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJSZWZs ZWN0T2JqZWN0LmgiCiAKICNpbmNsdWRlICJKU0NJbmxpbmVzLmgiCisjaW5jbHVkZSAiSlNHbG9i YWxPYmplY3RGdW5jdGlvbnMuaCIKICNpbmNsdWRlICJKU1Byb3BlcnR5TmFtZUl0ZXJhdG9yLmgi CiAjaW5jbHVkZSAiTG9va3VwLmgiCiAjaW5jbHVkZSAiT2JqZWN0Q29uc3RydWN0b3IuaCIKQEAg LTM0LDkgKzM1LDExIEBACiBuYW1lc3BhY2UgSlNDIHsKIAogc3RhdGljIEVuY29kZWRKU1ZhbHVl IEpTQ19IT1NUX0NBTEwgcmVmbGVjdE9iamVjdEVudW1lcmF0ZShFeGVjU3RhdGUqKTsKK3N0YXRp YyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIHJlZmxlY3RPYmplY3RHZXRQcm90b3R5cGVP ZihFeGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIHJlZmxl Y3RPYmplY3RJc0V4dGVuc2libGUoRXhlY1N0YXRlKik7CiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUg SlNDX0hPU1RfQ0FMTCByZWZsZWN0T2JqZWN0T3duS2V5cyhFeGVjU3RhdGUqKTsKIHN0YXRpYyBF bmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIHJlZmxlY3RPYmplY3RQcmV2ZW50RXh0ZW5zaW9u cyhFeGVjU3RhdGUqKTsKK3N0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIHJlZmxl Y3RPYmplY3RTZXRQcm90b3R5cGVPZihFeGVjU3RhdGUqKTsKIAogfQogCkBAIC01Myw5ICs1Niwx MSBAQCBjb25zdCBDbGFzc0luZm8gUmVmbGVjdE9iamVjdDo6c19pbmZvID0geyAiUmVmbGVjdCIs ICZCYXNlOjpzX2luZm8sICZyZWZsZWN0T2JqZQogICAgIGFwcGx5ICAgICAgICAgICAgIHJlZmxl Y3RPYmplY3RBcHBseSAgICAgICAgICAgICBEb250RW51bXxGdW5jdGlvbiAzCiAgICAgZGVsZXRl UHJvcGVydHkgICAgcmVmbGVjdE9iamVjdERlbGV0ZVByb3BlcnR5ICAgIERvbnRFbnVtfEZ1bmN0 aW9uIDIKICAgICBlbnVtZXJhdGUgICAgICAgICByZWZsZWN0T2JqZWN0RW51bWVyYXRlICAgICAg ICAgRG9udEVudW18RnVuY3Rpb24gMQorICAgIGdldFByb3RvdHlwZU9mICAgIHJlZmxlY3RPYmpl Y3RHZXRQcm90b3R5cGVPZiAgICBEb250RW51bXxGdW5jdGlvbiAxCiAgICAgaXNFeHRlbnNpYmxl ICAgICAgcmVmbGVjdE9iamVjdElzRXh0ZW5zaWJsZSAgICAgIERvbnRFbnVtfEZ1bmN0aW9uIDEK ICAgICBvd25LZXlzICAgICAgICAgICByZWZsZWN0T2JqZWN0T3duS2V5cyAgICAgICAgICAgRG9u dEVudW18RnVuY3Rpb24gMQogICAgIHByZXZlbnRFeHRlbnNpb25zIHJlZmxlY3RPYmplY3RQcmV2 ZW50RXh0ZW5zaW9ucyBEb250RW51bXxGdW5jdGlvbiAxCisgICAgc2V0UHJvdG90eXBlT2YgICAg cmVmbGVjdE9iamVjdFNldFByb3RvdHlwZU9mICAgIERvbnRFbnVtfEZ1bmN0aW9uIDIKIEBlbmQK ICovCiAKQEAgLTg1LDYgKzkwLDE0IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgcmVm bGVjdE9iamVjdEVudW1lcmF0ZShFeGVjU3RhdGUqIGV4ZWMpCiAgICAgcmV0dXJuIEpTVmFsdWU6 OmVuY29kZShKU1Byb3BlcnR5TmFtZUl0ZXJhdG9yOjpjcmVhdGUoZXhlYywgZXhlYy0+bGV4aWNh bEdsb2JhbE9iamVjdCgpLT5wcm9wZXJ0eU5hbWVJdGVyYXRvclN0cnVjdHVyZSgpLCBhc09iamVj dCh0YXJnZXQpKSk7CiB9CiAKK0VuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgcmVmbGVjdE9i amVjdEdldFByb3RvdHlwZU9mKEV4ZWNTdGF0ZSogZXhlYykKK3sKKyAgICBKU1ZhbHVlIHRhcmdl dCA9IGV4ZWMtPmFyZ3VtZW50KDApOworICAgIGlmICghdGFyZ2V0LmlzT2JqZWN0KCkpCisgICAg ICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUodGhyb3dUeXBlRXJyb3IoZXhlYywgQVNDSUlMaXRl cmFsKCJSZWZsZWN0LmdldFByb3RvdHlwZU9mIHJlcXVpcmVzIHRoZSBmaXJzdCBhcmd1bWVudCBi ZSBhbiBvYmplY3QiKSkpOworICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUob2JqZWN0Q29uc3Ry dWN0b3JHZXRQcm90b3R5cGVPZihleGVjLCBhc09iamVjdCh0YXJnZXQpKSk7Cit9CisKIEVuY29k ZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgcmVmbGVjdE9iamVjdElzRXh0ZW5zaWJsZShFeGVjU3Rh dGUqIGV4ZWMpCiB7CiAgICAgSlNWYWx1ZSB0YXJnZXQgPSBleGVjLT5hcmd1bWVudCgwKTsKQEAg LTExMCw0ICsxMjMsMjQgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCByZWZsZWN0T2Jq ZWN0UHJldmVudEV4dGVuc2lvbnMoRXhlY1N0YXRlKiBleGVjKQogICAgIHJldHVybiBKU1ZhbHVl OjplbmNvZGUoanNCb29sZWFuKHRydWUpKTsKIH0KIAorRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1Rf Q0FMTCByZWZsZWN0T2JqZWN0U2V0UHJvdG90eXBlT2YoRXhlY1N0YXRlKiBleGVjKQoreworICAg IEpTVmFsdWUgdGFyZ2V0ID0gZXhlYy0+YXJndW1lbnQoMCk7CisgICAgaWYgKCF0YXJnZXQuaXNP YmplY3QoKSkKKyAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZSh0aHJvd1R5cGVFcnJvcihl eGVjLCBBU0NJSUxpdGVyYWwoIlJlZmxlY3Quc2V0UHJvdG90eXBlT2YgcmVxdWlyZXMgdGhlIGZp cnN0IGFyZ3VtZW50IGJlIGFuIG9iamVjdCIpKSk7CisgICAgSlNWYWx1ZSBwcm90byA9IGV4ZWMt PmFyZ3VtZW50KDEpOworICAgIGlmICghcHJvdG8uaXNPYmplY3QoKSAmJiAhcHJvdG8uaXNOdWxs KCkpCisgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUodGhyb3dUeXBlRXJyb3IoZXhlYywg QVNDSUlMaXRlcmFsKCJSZWZsZWN0LnNldFByb3RvdHlwZU9mIHJlcXVpcmVzIHRoZSBzZWNvbmQg YXJndW1lbnQgYmUgZWl0aGVyIGFuIG9iamVjdCBvciBudWxsIikpKTsKKworICAgIEpTT2JqZWN0 KiBvYmplY3QgPSBhc09iamVjdCh0YXJnZXQpOworCisgICAgaWYgKCFjaGVja1Byb3RvU2V0dGVy QWNjZXNzQWxsb3dlZChleGVjLCBvYmplY3QpKQorICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5j b2RlKGpzQm9vbGVhbihmYWxzZSkpOworCisgICAgaWYgKCFvYmplY3QtPmlzRXh0ZW5zaWJsZSgp KQorICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzQm9vbGVhbihmYWxzZSkpOworCisg ICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc0Jvb2xlYW4ob2JqZWN0LT5zZXRQcm90b3R5cGVX aXRoQ3ljbGVDaGVjayhleGVjLCBwcm90bykpKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgSlNDCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3JlZmxlY3QtZ2V0 LXByb3RvdHlwZS1vZi5qcyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcmVm bGVjdC1nZXQtcHJvdG90eXBlLW9mLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE1NDY1ZjFjY2FlYjk3ODg4NTdm OGVjNTdmMzgzNWU4MTg5ZWZjZjYKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvdGVzdHMvc3RyZXNzL3JlZmxlY3QtZ2V0LXByb3RvdHlwZS1vZi5qcwpAQCAtMCwwICsx LDUwIEBACitmdW5jdGlvbiBzaG91bGRCZShhY3R1YWwsIGV4cGVjdGVkKSB7CisgICAgaWYgKGFj dHVhbCAhPT0gZXhwZWN0ZWQpCisgICAgICAgIHRocm93IG5ldyBFcnJvcignYmFkIHZhbHVlOiAn ICsgYWN0dWFsKTsKK30KKworZnVuY3Rpb24gc2hvdWxkVGhyb3coZnVuYywgbWVzc2FnZSkgewor ICAgIHZhciBlcnJvciA9IG51bGw7CisgICAgdHJ5IHsKKyAgICAgICAgZnVuYygpOworICAgIH0g Y2F0Y2ggKGUpIHsKKyAgICAgICAgZXJyb3IgPSBlOworICAgIH0KKyAgICBpZiAoIWVycm9yKQor ICAgICAgICB0aHJvdyBuZXcgRXJyb3IoIm5vdCB0aHJvd24uIik7CisgICAgaWYgKFN0cmluZyhl cnJvcikgIT09IG1lc3NhZ2UpCisgICAgICAgIHRocm93IG5ldyBFcnJvcigiYmFkIGVycm9yOiAi ICsgU3RyaW5nKGVycm9yKSk7Cit9CisKK3Nob3VsZEJlKFJlZmxlY3QuZ2V0UHJvdG90eXBlT2Yu bGVuZ3RoLCAxKTsKKworc2hvdWxkVGhyb3coKCkgPT4geworICAgIFJlZmxlY3QuZ2V0UHJvdG90 eXBlT2YoImhlbGxvIik7Cit9LCBgVHlwZUVycm9yOiBSZWZsZWN0LmdldFByb3RvdHlwZU9mIHJl cXVpcmVzIHRoZSBmaXJzdCBhcmd1bWVudCBiZSBhbiBvYmplY3RgKTsKKwordmFyIG9iamVjdCA9 IHsgaGVsbG86IDQyIH07CitzaG91bGRCZShSZWZsZWN0LmdldFByb3RvdHlwZU9mKG9iamVjdCks IE9iamVjdC5wcm90b3R5cGUpOworc2hvdWxkQmUoUmVmbGVjdC5nZXRQcm90b3R5cGVPZihSZWZs ZWN0LmdldFByb3RvdHlwZU9mKG9iamVjdCkpLCBudWxsKTsKK3ZhciBwcm90byA9IFtdOworb2Jq ZWN0Ll9fcHJvdG9fXyA9IHByb3RvOworc2hvdWxkQmUoUmVmbGVjdC5nZXRQcm90b3R5cGVPZihv YmplY3QpLCBwcm90byk7CisKK3ZhciBhcnJheSA9IFtdOworc2hvdWxkQmUoUmVmbGVjdC5nZXRQ cm90b3R5cGVPZihhcnJheSksIEFycmF5LnByb3RvdHlwZSk7Cit2YXIgcHJvdG8gPSBbXTsKK2Fy cmF5Ll9fcHJvdG9fXyA9IE9iamVjdC5wcm90b3R5cGU7CitzaG91bGRCZShSZWZsZWN0LmdldFBy b3RvdHlwZU9mKGFycmF5KSwgT2JqZWN0LnByb3RvdHlwZSk7CisKK2NsYXNzIEJhc2UgeworfQor CitjbGFzcyBEZXJpdmVkIGV4dGVuZHMgQmFzZSB7Cit9CisKK3Nob3VsZEJlKFJlZmxlY3QuZ2V0 UHJvdG90eXBlT2YobmV3IERlcml2ZWQpLCBEZXJpdmVkLnByb3RvdHlwZSk7CitzaG91bGRCZShS ZWZsZWN0LmdldFByb3RvdHlwZU9mKFJlZmxlY3QuZ2V0UHJvdG90eXBlT2YobmV3IERlcml2ZWQp KSwgQmFzZS5wcm90b3R5cGUpOworc2hvdWxkQmUoUmVmbGVjdC5nZXRQcm90b3R5cGVPZihSZWZs ZWN0LmdldFByb3RvdHlwZU9mKFJlZmxlY3QuZ2V0UHJvdG90eXBlT2YobmV3IERlcml2ZWQpKSks IE9iamVjdC5wcm90b3R5cGUpOworc2hvdWxkQmUoUmVmbGVjdC5nZXRQcm90b3R5cGVPZihSZWZs ZWN0LmdldFByb3RvdHlwZU9mKFJlZmxlY3QuZ2V0UHJvdG90eXBlT2YoUmVmbGVjdC5nZXRQcm90 b3R5cGVPZihuZXcgRGVyaXZlZCkpKSksIG51bGwpOworCit2YXIgb2JqZWN0ID0gT2JqZWN0LmNy ZWF0ZShudWxsKTsKK3Nob3VsZEJlKFJlZmxlY3QuZ2V0UHJvdG90eXBlT2Yob2JqZWN0KSwgbnVs bCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3JlZmxl Y3Qtc2V0LXByb3RvdHlwZS1vZi5qcyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJl c3MvcmVmbGVjdC1zZXQtcHJvdG90eXBlLW9mLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjU2ZmMxM2I3YWQzYmFl ZDFlZTc0MTJmMWUxNzkwYTE2YTA4NWMyYzYKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3JlZmxlY3Qtc2V0LXByb3RvdHlwZS1vZi5qcwpAQCAt MCwwICsxLDc1IEBACitmdW5jdGlvbiBzaG91bGRCZShhY3R1YWwsIGV4cGVjdGVkKSB7CisgICAg aWYgKGFjdHVhbCAhPT0gZXhwZWN0ZWQpCisgICAgICAgIHRocm93IG5ldyBFcnJvcignYmFkIHZh bHVlOiAnICsgYWN0dWFsKTsKK30KKworZnVuY3Rpb24gc2hvdWxkVGhyb3coZnVuYywgbWVzc2Fn ZSkgeworICAgIHZhciBlcnJvciA9IG51bGw7CisgICAgdHJ5IHsKKyAgICAgICAgZnVuYygpOwor ICAgIH0gY2F0Y2ggKGUpIHsKKyAgICAgICAgZXJyb3IgPSBlOworICAgIH0KKyAgICBpZiAoIWVy cm9yKQorICAgICAgICB0aHJvdyBuZXcgRXJyb3IoIm5vdCB0aHJvd24uIik7CisgICAgaWYgKFN0 cmluZyhlcnJvcikgIT09IG1lc3NhZ2UpCisgICAgICAgIHRocm93IG5ldyBFcnJvcigiYmFkIGVy cm9yOiAiICsgU3RyaW5nKGVycm9yKSk7Cit9CisKK3Nob3VsZEJlKFJlZmxlY3Quc2V0UHJvdG90 eXBlT2YubGVuZ3RoLCAyKTsKKworc2hvdWxkVGhyb3coKCkgPT4geworICAgIFJlZmxlY3Quc2V0 UHJvdG90eXBlT2YoImhlbGxvIik7Cit9LCBgVHlwZUVycm9yOiBSZWZsZWN0LnNldFByb3RvdHlw ZU9mIHJlcXVpcmVzIHRoZSBmaXJzdCBhcmd1bWVudCBiZSBhbiBvYmplY3RgKTsKKworc2hvdWxk VGhyb3coKCkgPT4geworICAgIFJlZmxlY3Quc2V0UHJvdG90eXBlT2YobnVsbCk7Cit9LCBgVHlw ZUVycm9yOiBSZWZsZWN0LnNldFByb3RvdHlwZU9mIHJlcXVpcmVzIHRoZSBmaXJzdCBhcmd1bWVu dCBiZSBhbiBvYmplY3RgKTsKKworc2hvdWxkVGhyb3coKCkgPT4geworICAgIFJlZmxlY3Quc2V0 UHJvdG90eXBlT2Yoe30sIDMwKTsKK30sIGBUeXBlRXJyb3I6IFJlZmxlY3Quc2V0UHJvdG90eXBl T2YgcmVxdWlyZXMgdGhlIHNlY29uZCBhcmd1bWVudCBiZSBlaXRoZXIgYW4gb2JqZWN0IG9yIG51 bGxgKTsKKworc2hvdWxkVGhyb3coKCkgPT4geworICAgIFJlZmxlY3Quc2V0UHJvdG90eXBlT2Yo e30sIHVuZGVmaW5lZCk7Cit9LCBgVHlwZUVycm9yOiBSZWZsZWN0LnNldFByb3RvdHlwZU9mIHJl cXVpcmVzIHRoZSBzZWNvbmQgYXJndW1lbnQgYmUgZWl0aGVyIGFuIG9iamVjdCBvciBudWxsYCk7 CisKK3ZhciBvYmplY3QgPSB7fTsKK3ZhciBwcm90b3R5cGUgPSB7fTsKK3Nob3VsZEJlKFJlZmxl Y3QuZ2V0UHJvdG90eXBlT2Yob2JqZWN0KSwgT2JqZWN0LnByb3RvdHlwZSk7CitzaG91bGRCZShS ZWZsZWN0LnNldFByb3RvdHlwZU9mKG9iamVjdCwgcHJvdG90eXBlKSwgdHJ1ZSk7CitzaG91bGRC ZShSZWZsZWN0LmdldFByb3RvdHlwZU9mKG9iamVjdCksIHByb3RvdHlwZSk7CisKK3ZhciBvYmpl Y3QgPSB7fTsKK3Nob3VsZEJlKFJlZmxlY3QuZ2V0UHJvdG90eXBlT2Yob2JqZWN0KSwgT2JqZWN0 LnByb3RvdHlwZSk7CitzaG91bGRCZShSZWZsZWN0LnNldFByb3RvdHlwZU9mKG9iamVjdCwgbnVs bCksIHRydWUpOworc2hvdWxkQmUoUmVmbGVjdC5nZXRQcm90b3R5cGVPZihvYmplY3QpLCBudWxs KTsKKwordmFyIGFycmF5ID0gW107Cit2YXIgcHJvdG90eXBlID0ge307CitzaG91bGRCZShSZWZs ZWN0LmdldFByb3RvdHlwZU9mKGFycmF5KSwgQXJyYXkucHJvdG90eXBlKTsKK3Nob3VsZEJlKFJl ZmxlY3Quc2V0UHJvdG90eXBlT2YoYXJyYXksIHByb3RvdHlwZSksIHRydWUpOworc2hvdWxkQmUo UmVmbGVjdC5nZXRQcm90b3R5cGVPZihhcnJheSksIHByb3RvdHlwZSk7CisKK3ZhciBhcnJheSA9 IFtdOworc2hvdWxkQmUoUmVmbGVjdC5nZXRQcm90b3R5cGVPZihhcnJheSksIEFycmF5LnByb3Rv dHlwZSk7CitzaG91bGRCZShSZWZsZWN0LnNldFByb3RvdHlwZU9mKGFycmF5LCBudWxsKSwgdHJ1 ZSk7CitzaG91bGRCZShSZWZsZWN0LmdldFByb3RvdHlwZU9mKGFycmF5KSwgbnVsbCk7CisKK3Zh ciBvYmplY3QgPSBPYmplY3QuY3JlYXRlKG51bGwpOworc2hvdWxkQmUoUmVmbGVjdC5nZXRQcm90 b3R5cGVPZihvYmplY3QpLCBudWxsKTsKK3Nob3VsZEJlKFJlZmxlY3Quc2V0UHJvdG90eXBlT2Yo b2JqZWN0LCBPYmplY3QucHJvdG90eXBlKSwgdHJ1ZSk7CitzaG91bGRCZShSZWZsZWN0LmdldFBy b3RvdHlwZU9mKG9iamVjdCksIE9iamVjdC5wcm90b3R5cGUpOworCisvLyBFeHRlbnNpYmxlIGNo ZWNrLgordmFyIG9iamVjdCA9IHt9Oworc2hvdWxkQmUoUmVmbGVjdC5wcmV2ZW50RXh0ZW5zaW9u cyhvYmplY3QpLCB0cnVlKTsKK3Nob3VsZEJlKFJlZmxlY3Quc2V0UHJvdG90eXBlT2Yob2JqZWN0 LCBudWxsKSwgZmFsc2UpOworc2hvdWxkQmUoUmVmbGVjdC5nZXRQcm90b3R5cGVPZihvYmplY3Qp LCBPYmplY3QucHJvdG90eXBlKTsKKworLy8gQ3ljbGljIGNoZWNrLgordmFyIHByb3RvdHlwZSA9 IHt9OwordmFyIG9iamVjdCA9IHsgX19wcm90b19fOiBwcm90b3R5cGUgfTsKK3Nob3VsZEJlKFJl ZmxlY3Quc2V0UHJvdG90eXBlT2YocHJvdG90eXBlLCBvYmplY3QpLCBmYWxzZSk7CitzaG91bGRC ZShSZWZsZWN0LmdldFByb3RvdHlwZU9mKHByb3RvdHlwZSksIE9iamVjdC5wcm90b3R5cGUpOwor Cg==