18649 2008-04-20 18:27:10 -0700 SQUIRRELFISH: correctly handle exceptions in eval code 2008-04-21 17:45:33 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 18624 1 zwarich oliver oliver oldest_to_newest 78355 0 zwarich 2008-04-20 18:27:10 -0700 Exceptions are broken in eval code. This leads to assertion failures of the following form when running JavaScriptCore tests: ASSERTION FAILED: it != end (./VM/Machine.cpp:431 bool KJS::Machine::unwindCallFrame(KJS::Register**, const KJS::Instruction*&, KJS::CodeBlock*&, KJS::JSValue**&, KJS::ScopeChainNode*&, KJS::Register*&)) ASSERTION FAILED: addressOffset < instructions.size() (/Users/Cameron/sf/JavaScriptCore/VM/CodeBlock.cpp:541 bool KJS::CodeBlock::getHandlerForVPC(const KJS::Instruction*, KJS::Instruction*&, int&)) 78356 1 zwarich 2008-04-20 19:13:59 -0700 The it != end assertion failure is hit when throwing an exception from eval in a global context. Global code is a special case at the beginning, because no unwind is necessary, and the rest of the function deals with the case of function code. If the eval is in a global context, then the end of the scope chain is also the top, hitting the assertion. The addressOffset < instructions.size() assertion failure is hit when throwing an exception from eval in a function context. The top of the scope chain is an activation object, so Machine::unwindCallFrame() thinks it has succeeded when it really hasn't, passing the buck onto CodeBlock::getHandlerForVPC(). 78436 2 oliver 2008-04-21 11:55:32 -0700 Partial fix Committed r32331 78488 3 20743 oliver 2008-04-21 17:16:48 -0700 Created attachment 20743 Make eval setup a "native" callframe 78492 4 20743 ggaren 2008-04-21 17:23:44 -0700 Comment on attachment 20743 Make eval setup a "native" callframe Need to fix the other eval case. Otherwise, code looks good. Clearing review flag. 78494 5 20743 ggaren 2008-04-21 17:26:47 -0700 Comment on attachment 20743 Make eval setup a "native" callframe Sorry, the second version just calls the first, so this looks good. 78497 6 oliver 2008-04-21 17:45:33 -0700 Committed r32361 20743 2008-04-21 17:16:48 -0700 2008-04-21 17:26:47 -0700 Make eval setup a "native" callframe eval-exceptions.patch text/plain 1755 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBlYjc5MWIyLi4zNGUzZjk0IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMDgtMDQtMjEgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWcgMTg2NDk6IFNRVUlS UkVMRklTSDogY29ycmVjdGx5IGhhbmRsZSBleGNlcHRpb25zIGluIGV2YWwgY29kZQorICAgICAg ICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjQ5PgorCisgICAg ICAgIEFsbG9jYXRlIGEgY2FsbGZyYW1lIGZvciBldmFsKCkgYW5kIGluaXRpYWxpc2Ugd2l0aCBh IG51bGwgY29kZUJsb2NrIHRvCisgICAgICAgIGluZGljYXRlIG5hdGl2ZSBjb2RlLiAgVGhpcyBw cmV2ZW50cyB0aGUgdW53aW5kZXIgZnJvbSBjbG9iYmVyaW5nIHRoZQorICAgICAgICByZWdpc3Rl ciBzdGFjay4KKworICAgICAgICAqIFZNL01hY2hpbmUuY3BwOgorICAgICAgICAoS0pTOjpNYWNo aW5lOjpleGVjdXRlKToKKwogMjAwOC0wNC0yMSAgQ2FtZXJvbiBad2FyaWNoICA8Y3d6d2FyaWNo QHV3YXRlcmxvby5jYT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWouCmRpZmYgLS1naXQg YS9KYXZhU2NyaXB0Q29yZS9WTS9NYWNoaW5lLmNwcCBiL0phdmFTY3JpcHRDb3JlL1ZNL01hY2hp bmUuY3BwCmluZGV4IDE2MWFkMzQuLjJlNjZlN2YgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3Jl L1ZNL01hY2hpbmUuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL1ZNL01hY2hpbmUuY3BwCkBAIC02 MDgsMTAgKzYwOCwxMSBAQCBKU1ZhbHVlKiBNYWNoaW5lOjpleGVjdXRlKEV2YWxOb2RlKiBldmFs Tm9kZSwgRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogdGhpc09iagogICAgIH0KICAgICAKICAg ICBzaXplX3Qgb2xkU2l6ZSA9IHJlZ2lzdGVyRmlsZS0+c2l6ZSgpOwotICAgIHNpemVfdCBuZXdT aXplID0gcmVnaXN0ZXJPZmZzZXQgKyBjb2RlQmxvY2stPm51bVZhcnMgKyBjb2RlQmxvY2stPm51 bVRlbXBvcmFyaWVzOworICAgIHNpemVfdCBuZXdTaXplID0gcmVnaXN0ZXJPZmZzZXQgKyBjb2Rl QmxvY2stPm51bVZhcnMgKyBjb2RlQmxvY2stPm51bVRlbXBvcmFyaWVzICsgQ2FsbEZyYW1lSGVh ZGVyU2l6ZTsKICAgICByZWdpc3RlckZpbGUtPmdyb3cobmV3U2l6ZSk7Ci0gICAgUmVnaXN0ZXIq IHIgPSAoKnJlZ2lzdGVyRmlsZS0+YmFzZVBvaW50ZXIoKSkgKyByZWdpc3Rlck9mZnNldCArIGNv ZGVCbG9jay0+bnVtVmFyczsKKyAgICBSZWdpc3RlciogciA9ICgqcmVnaXN0ZXJGaWxlLT5iYXNl UG9pbnRlcigpKSArIHJlZ2lzdGVyT2Zmc2V0ICsgY29kZUJsb2NrLT5udW1WYXJzICsgQ2FsbEZy YW1lSGVhZGVyU2l6ZTsKICAgICAKKyAgICAoKCpyZWdpc3RlckZpbGUtPmJhc2VQb2ludGVyKCkp ICsgcmVnaXN0ZXJPZmZzZXQpW0NhbGxlckNvZGVCbG9ja10udS5jb2RlQmxvY2sgPSAwOwogICAg IHJbUHJvZ3JhbUNvZGVUaGlzUmVnaXN0ZXJdLnUuanNWYWx1ZSA9IHRoaXNPYmo7CiAgICAgSlNW YWx1ZSogcmVzdWx0ID0gcHJpdmF0ZUV4ZWN1dGUoTm9ybWFsLCBleGVjLCByZWdpc3RlckZpbGUs IHIsIHNjb3BlQ2hhaW4sIGNvZGVCbG9jaywgZXhjZXB0aW9uKTsKICAgICAK