3970 2005-07-12 14:09:43 -0700 throw statements fail inside eval statements 2005-07-14 11:28:10 -0700 1 1 1 Unclassified WebKit JavaScriptCore 412 Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 ggaren mjs oldest_to_newest 14467 0 ggaren 2005-07-12 14:09:43 -0700 causes the following test failure: ecma_2/Statements/try-003.js 14468 1 2933 ggaren 2005-07-12 14:10:14 -0700 Created attachment 2933 Patch Fix. 14633 2 2933 mjs 2005-07-13 23:44:09 -0700 Comment on attachment 2933 Patch r=me 2933 2005-07-12 14:10:14 -0700 2005-07-13 23:44:09 -0700 Patch patch.txt text/plain 4756 ggaren SW5kZXg6IEphdmFTY3JpcHRDb3JlL2tqcy9mdW5jdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2N2cy9yb290L0phdmFTY3JpcHRDb3JlL2tqcy9mdW5jdGlvbi5jcHAsdgpyZXRyaWV2aW5n IHJldmlzaW9uIDEuNDYKZGlmZiAtdSAtcjEuNDYgZnVuY3Rpb24uY3BwCi0tLSBKYXZhU2NyaXB0 Q29yZS9ranMvZnVuY3Rpb24uY3BwCTEyIEp1bCAyMDA1IDE4OjIwOjAyIC0wMDAwCTEuNDYKKysr IEphdmFTY3JpcHRDb3JlL2tqcy9mdW5jdGlvbi5jcHAJMTIgSnVsIDIwMDUgMjA6NTI6MDcgLTAw MDAKQEAgLTc3Miw2MyArNzcyLDU4IEBACiAgICAgIiMkJissLzo7PT9AIjsKIAogICBzd2l0Y2gg KGlkKSB7Ci0gIGNhc2UgRXZhbDogeyAvLyBldmFsKCkKLSAgICBWYWx1ZSB4ID0gYXJnc1swXTsK LSAgICBpZiAoeC50eXBlKCkgIT0gU3RyaW5nVHlwZSkKLSAgICAgIHJldHVybiB4OwotICAgIGVs c2UgewotICAgICAgVVN0cmluZyBzID0geC50b1N0cmluZyhleGVjKTsKLQotICAgICAgaW50IHNp ZDsKLSAgICAgIGludCBlcnJMaW5lOwotICAgICAgVVN0cmluZyBlcnJNc2c7Ci0gICAgICBQcm9n cmFtTm9kZSAqcHJvZ05vZGUgPSBQYXJzZXI6OnBhcnNlKFVTdHJpbmcoKSwgMCwgcy5kYXRhKCks cy5zaXplKCksJnNpZCwmZXJyTGluZSwmZXJyTXNnKTsKLQotICAgICAgLy8gbm8gcHJvZ3JhbSBu b2RlIG1lYW5zIGEgc3ludGF4IG9jY3VycmVkCi0gICAgICBpZiAoIXByb2dOb2RlKSB7Ci0JT2Jq ZWN0IGVyciA9IEVycm9yOjpjcmVhdGUoZXhlYyxTeW50YXhFcnJvcixlcnJNc2cuYXNjaWkoKSxl cnJMaW5lKTsKLSAgICAgICAgZXJyLnB1dChleGVjLCJzaWQiLE51bWJlcihzaWQpKTsKLSAgICAg ICAgZXhlYy0+c2V0RXhjZXB0aW9uKGVycik7Ci0gICAgICAgIHJldHVybiBlcnI7Ci0gICAgICB9 Ci0KLSAgICAgIHByb2dOb2RlLT5yZWYoKTsKLQotICAgICAgLy8gZW50ZXIgYSBuZXcgZXhlY3V0 aW9uIGNvbnRleHQKLSAgICAgIE9iamVjdCB0aGlzVmFsKE9iamVjdDo6ZHluYW1pY0Nhc3QoZXhl Yy0+Y29udGV4dCgpLnRoaXNWYWx1ZSgpKSk7Ci0gICAgICBDb250ZXh0SW1wIGN0eChleGVjLT5k eW5hbWljSW50ZXJwcmV0ZXIoKS0+Z2xvYmFsT2JqZWN0KCksCi0gICAgICAgICAgICAgICAgICAg ICBleGVjLT5keW5hbWljSW50ZXJwcmV0ZXIoKS0+aW1wKCksCi0gICAgICAgICAgICAgICAgICAg ICB0aGlzVmFsLAotICAgICAgICAgICAgICAgICAgICAgRXZhbENvZGUsCi0gICAgICAgICAgICAg ICAgICAgICBleGVjLT5jb250ZXh0KCkuaW1wKCkpOwotCi0gICAgICBFeGVjU3RhdGUgbmV3RXhl YyhleGVjLT5keW5hbWljSW50ZXJwcmV0ZXIoKSwgJmN0eCk7Ci0gICAgICBuZXdFeGVjLnNldEV4 Y2VwdGlvbihleGVjLT5leGNlcHRpb24oKSk7IC8vIGNvdWxkIGJlIG51bGwKLQotICAgICAgLy8g ZXhlY3V0ZSB0aGUgY29kZQotICAgICAgcHJvZ05vZGUtPnByb2Nlc3NWYXJEZWNscygmbmV3RXhl Yyk7Ci0gICAgICBDb21wbGV0aW9uIGMgPSBwcm9nTm9kZS0+ZXhlY3V0ZSgmbmV3RXhlYyk7Ci0K LSAgICAgIC8vIGlmIGFuIGV4Y2VwdGlvbiBvY2N1cmVkLCBwcm9wb2dhdGUgaXQgYmFjayB0byB0 aGUgcHJldmlvdXMgZXhlY3V0aW9uIG9iamVjdAotICAgICAgaWYgKG5ld0V4ZWMuaGFkRXhjZXB0 aW9uKCkpCi0gICAgICAgIGV4ZWMtPnNldEV4Y2VwdGlvbihuZXdFeGVjLmV4Y2VwdGlvbigpKTsK KyAgICBjYXNlIEV2YWw6IHsgLy8gZXZhbCgpCisgICAgICBWYWx1ZSB4ID0gYXJnc1swXTsKKyAg ICAgIGlmICh4LnR5cGUoKSAhPSBTdHJpbmdUeXBlKQorICAgICAgICByZXR1cm4geDsKKyAgICAg IGVsc2UgeworICAgICAgICBVU3RyaW5nIHMgPSB4LnRvU3RyaW5nKGV4ZWMpOworICAgICAgICAK KyAgICAgICAgaW50IHNpZDsKKyAgICAgICAgaW50IGVyckxpbmU7CisgICAgICAgIFVTdHJpbmcg ZXJyTXNnOworICAgICAgICBQcm9ncmFtTm9kZSAqcHJvZ05vZGUgPSBQYXJzZXI6OnBhcnNlKFVT dHJpbmcoKSwgMCwgcy5kYXRhKCkscy5zaXplKCksJnNpZCwmZXJyTGluZSwmZXJyTXNnKTsKKyAg ICAgICAgCisgICAgICAgIC8vIG5vIHByb2dyYW0gbm9kZSBtZWFucyBhIHN5bnRheCBvY2N1cnJl ZAorICAgICAgICBpZiAoIXByb2dOb2RlKSB7CisgICAgICAgICAgT2JqZWN0IGVyciA9IEVycm9y OjpjcmVhdGUoZXhlYyxTeW50YXhFcnJvcixlcnJNc2cuYXNjaWkoKSxlcnJMaW5lKTsKKyAgICAg ICAgICBlcnIucHV0KGV4ZWMsInNpZCIsTnVtYmVyKHNpZCkpOworICAgICAgICAgIGV4ZWMtPnNl dEV4Y2VwdGlvbihlcnIpOworICAgICAgICAgIHJldHVybiBlcnI7CisgICAgICAgIH0KKyAgICAg ICAgCisgICAgICAgIHByb2dOb2RlLT5yZWYoKTsKKyAgICAgICAgCisgICAgICAgIC8vIGVudGVy IGEgbmV3IGV4ZWN1dGlvbiBjb250ZXh0CisgICAgICAgIE9iamVjdCB0aGlzVmFsKE9iamVjdDo6 ZHluYW1pY0Nhc3QoZXhlYy0+Y29udGV4dCgpLnRoaXNWYWx1ZSgpKSk7CisgICAgICAgIENvbnRl eHRJbXAgY3R4KGV4ZWMtPmR5bmFtaWNJbnRlcnByZXRlcigpLT5nbG9iYWxPYmplY3QoKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgZXhlYy0+ZHluYW1pY0ludGVycHJldGVyKCktPmltcCgpLAor ICAgICAgICAgICAgICAgICAgICAgICB0aGlzVmFsLAorICAgICAgICAgICAgICAgICAgICAgICBF dmFsQ29kZSwKKyAgICAgICAgICAgICAgICAgICAgICAgZXhlYy0+Y29udGV4dCgpLmltcCgpKTsK KyAgICAgICAgCisgICAgICAgIEV4ZWNTdGF0ZSBuZXdFeGVjKGV4ZWMtPmR5bmFtaWNJbnRlcnBy ZXRlcigpLCAmY3R4KTsKKyAgICAgICAgbmV3RXhlYy5zZXRFeGNlcHRpb24oZXhlYy0+ZXhjZXB0 aW9uKCkpOyAvLyBjb3VsZCBiZSBudWxsCisgICAgICAgIAorICAgICAgICAvLyBleGVjdXRlIHRo ZSBjb2RlCisgICAgICAgIHByb2dOb2RlLT5wcm9jZXNzVmFyRGVjbHMoJm5ld0V4ZWMpOworICAg ICAgICBDb21wbGV0aW9uIGMgPSBwcm9nTm9kZS0+ZXhlY3V0ZSgmbmV3RXhlYyk7CisKKyAgICAg ICAgLy8gaWYgYW4gZXhjZXB0aW9uIG9jY3VyZWQsIHByb3BvZ2F0ZSBpdCBiYWNrIHRvIHRoZSBw cmV2aW91cyBleGVjdXRpb24gb2JqZWN0CisgICAgICAgIGlmIChuZXdFeGVjLmhhZEV4Y2VwdGlv bigpKQorICAgICAgICAgIGV4ZWMtPnNldEV4Y2VwdGlvbihuZXdFeGVjLmV4Y2VwdGlvbigpKTsK KworICAgICAgICByZXMgPSBVbmRlZmluZWQoKTsKKyAgICAgICAgaWYgKGMuY29tcGxUeXBlKCkg PT0gVGhyb3cpCisgICAgICAgICAgZXhlYy0+c2V0RXhjZXB0aW9uKGMudmFsdWUoKSk7CisgICAg ICAgIGVsc2UgaWYgKGMuaXNWYWx1ZUNvbXBsZXRpb24oKSkKKyAgICAgICAgICAgIHJlcyA9IGMu dmFsdWUoKTsKIAotICAgICAgaWYgKCBwcm9nTm9kZS0+ZGVyZWYoKSApCisgICAgICAgIGlmICgg cHJvZ05vZGUtPmRlcmVmKCkgKQogICAgICAgICAgIGRlbGV0ZSBwcm9nTm9kZTsKLSAgICAgIGlm IChjLmNvbXBsVHlwZSgpID09IFJldHVyblZhbHVlKQotCSAgcmV0dXJuIGMudmFsdWUoKTsKLSAg ICAgIC8vICMjIyBzZXRFeGNlcHRpb24oKSBvbiB0aHJvdz8KLSAgICAgIGVsc2UgaWYgKGMuY29t cGxUeXBlKCkgPT0gTm9ybWFsKSB7Ci0JICBpZiAoYy5pc1ZhbHVlQ29tcGxldGlvbigpKQotCSAg ICAgIHJldHVybiBjLnZhbHVlKCk7Ci0JICBlbHNlCi0JICAgICAgcmV0dXJuIFVuZGVmaW5lZCgp OwotICAgICAgfSBlbHNlIHsKLQkgIHJldHVybiBVbmRlZmluZWQoKTsKICAgICAgIH0KKyAgICAg IGJyZWFrOwogICAgIH0KLSAgICBicmVhazsKLSAgfQogICBjYXNlIFBhcnNlSW50OgogICAgIHJl cyA9IE51bWJlcihwYXJzZUludChhcmdzWzBdLnRvU3RyaW5nKGV4ZWMpLCBhcmdzWzFdLnRvSW50 MzIoZXhlYykpKTsKICAgICBicmVhazsKSW5kZXg6IEphdmFTY3JpcHRDb3JlL2tqcy9ub2Rlcy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L0phdmFTY3JpcHRDb3JlL2tqcy9ub2Rl cy5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNjQKZGlmZiAtdSAtcjEuNjQgbm9kZXMuY3Bw Ci0tLSBKYXZhU2NyaXB0Q29yZS9ranMvbm9kZXMuY3BwCTEgSnVsIDIwMDUgMTc6NDc6MTIgLTAw MDAJMS42NAorKysgSmF2YVNjcmlwdENvcmUva2pzL25vZGVzLmNwcAkxMiBKdWwgMjAwNSAyMDo1 MjowNyAtMDAwMApAQCAtMjU5MCw5ICsyNTkwLDYgQEAKICAgVmFsdWUgdiA9IGV4cHItPmV2YWx1 YXRlKGV4ZWMpOwogICBLSlNfQ0hFQ0tFWENFUFRJT04KIAotICAvLyBiYWlsIG91dCBvbiBlcnJv cgotICBLSlNfQ0hFQ0tFWENFUFRJT04KLQogICByZXR1cm4gQ29tcGxldGlvbihUaHJvdywgdik7 CiB9CiAKQEAgLTI3MDcsNyArMjcwNCwxNCBAQAogICB9CiAKICAgaWYgKCFfY2F0Y2gpIHsKKyAg ICBWYWx1ZSBsYXN0RXhjZXB0aW9uID0gZXhlYy0+ZXhjZXB0aW9uKCk7CisgICAgZXhlYy0+Y2xl YXJFeGNlcHRpb24oKTsKKyAgICAKICAgICBjMiA9IF9maW5hbC0+ZXhlY3V0ZShleGVjKTsKKyAg ICAKKyAgICBpZiAoIWV4ZWMtPmhhZEV4Y2VwdGlvbigpKQorICAgICAgZXhlYy0+c2V0RXhjZXB0 aW9uKGxhc3RFeGNlcHRpb24pOworICAgIAogICAgIHJldHVybiAoYzIuY29tcGxUeXBlKCkgPT0g Tm9ybWFsKSA/IGMgOiBjMjsKICAgfQogCg==