From: neis Date: Wed, 30 Sep 2015 14:43:14 +0000 (-0700) Subject: Reland "Clean up rewriter" (issue 1362333002). X-Git-Tag: upstream/4.7.83~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1f4781471e8349b3fa7631c68a40ea50cfed0bb;p=platform%2Fupstream%2Fv8.git Reland "Clean up rewriter" (issue 1362333002). R=rossberg BUG= Review URL: https://codereview.chromium.org/1383553002 Cr-Commit-Position: refs/heads/master@{#31022} --- diff --git a/src/rewriter.cc b/src/rewriter.cc index d88e119..3f329e5 100644 --- a/src/rewriter.cc +++ b/src/rewriter.cc @@ -18,7 +18,6 @@ class Processor: public AstVisitor { : result_(result), result_assigned_(false), is_set_(false), - in_try_(false), factory_(ast_value_factory) { InitializeAstVisitor(isolate, ast_value_factory->zone()); } @@ -42,9 +41,8 @@ class Processor: public AstVisitor { // To avoid storing to .result all the time, we eliminate some of // the stores by keeping track of whether or not we're sure .result // will be overwritten anyway. This is a bit more tricky than what I - // was hoping for + // was hoping for. bool is_set_; - bool in_try_; AstNodeFactory factory_; @@ -88,29 +86,30 @@ void Processor::VisitBlock(Block* node) { void Processor::VisitExpressionStatement(ExpressionStatement* node) { // Rewrite : ; -> .result = ; - if (!is_set_ && !node->expression()->IsThrow()) { + if (!is_set_) { node->set_expression(SetResult(node->expression())); - if (!in_try_) is_set_ = true; + is_set_ = true; } } void Processor::VisitIfStatement(IfStatement* node) { - // Rewrite both then and else parts (reversed). - bool save = is_set_; - Visit(node->else_statement()); - bool set_after_then = is_set_; - is_set_ = save; + // Rewrite both branches. + bool set_after = is_set_; Visit(node->then_statement()); - is_set_ = is_set_ && set_after_then; + bool set_in_then = is_set_; + is_set_ = set_after; + Visit(node->else_statement()); + is_set_ = is_set_ && set_in_then; } void Processor::VisitIterationStatement(IterationStatement* node) { // Rewrite the body. - bool set_after_loop = is_set_; + bool set_after = is_set_; + is_set_ = false; // We are in a loop, so we can't rely on [set_after]. Visit(node->body()); - is_set_ = is_set_ && set_after_loop; + is_set_ = is_set_ && set_after; } @@ -140,36 +139,32 @@ void Processor::VisitForOfStatement(ForOfStatement* node) { void Processor::VisitTryCatchStatement(TryCatchStatement* node) { - // Rewrite both try and catch blocks (reversed order). - bool set_after_catch = is_set_; - Visit(node->catch_block()); - is_set_ = is_set_ && set_after_catch; - bool save = in_try_; - in_try_ = true; + // Rewrite both try and catch block. + bool set_after = is_set_; Visit(node->try_block()); - in_try_ = save; + bool set_in_try = is_set_; + is_set_ = set_after; + Visit(node->catch_block()); + is_set_ = is_set_ && set_in_try; } void Processor::VisitTryFinallyStatement(TryFinallyStatement* node) { - // Rewrite both try and finally block (reversed order). + // Rewrite both try and finally block (in reverse order). Visit(node->finally_block()); - bool save = in_try_; - in_try_ = true; Visit(node->try_block()); - in_try_ = save; } void Processor::VisitSwitchStatement(SwitchStatement* node) { - // Rewrite statements in all case clauses in reversed order. + // Rewrite statements in all case clauses (in reverse order). ZoneList* clauses = node->cases(); - bool set_after_switch = is_set_; + bool set_after = is_set_; for (int i = clauses->length() - 1; i >= 0; --i) { CaseClause* clause = clauses->at(i); Process(clause->statements()); } - is_set_ = is_set_ && set_after_switch; + is_set_ = is_set_ && set_after; } @@ -184,9 +179,7 @@ void Processor::VisitBreakStatement(BreakStatement* node) { void Processor::VisitWithStatement(WithStatement* node) { - bool set_after_body = is_set_; Visit(node->statement()); - is_set_ = is_set_ && set_after_body; } @@ -196,23 +189,28 @@ void Processor::VisitSloppyBlockFunctionStatement( } +void Processor::VisitReturnStatement(ReturnStatement* node) { is_set_ = true; } + + // Do nothing: -void Processor::VisitVariableDeclaration(VariableDeclaration* node) {} -void Processor::VisitFunctionDeclaration(FunctionDeclaration* node) {} -void Processor::VisitImportDeclaration(ImportDeclaration* node) {} -void Processor::VisitExportDeclaration(ExportDeclaration* node) {} void Processor::VisitEmptyStatement(EmptyStatement* node) {} -void Processor::VisitReturnStatement(ReturnStatement* node) {} void Processor::VisitDebuggerStatement(DebuggerStatement* node) {} -// Expressions are never visited yet. +// Expressions are never visited. #define DEF_VISIT(type) \ void Processor::Visit##type(type* expr) { UNREACHABLE(); } EXPRESSION_NODE_LIST(DEF_VISIT) #undef DEF_VISIT +// Declarations are never visited. +#define DEF_VISIT(type) \ + void Processor::Visit##type(type* expr) { UNREACHABLE(); } +DECLARATION_NODE_LIST(DEF_VISIT) +#undef DEF_VISIT + + // Assumes code has been parsed. Mutates the AST, so the AST should not // continue to be used in the case of failure. bool Rewriter::Rewrite(ParseInfo* info) { diff --git a/test/webkit/eval-throw-return-expected.txt b/test/webkit/eval-throw-return-expected.txt index 662531a..bd80e8d 100644 --- a/test/webkit/eval-throw-return-expected.txt +++ b/test/webkit/eval-throw-return-expected.txt @@ -28,18 +28,18 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE PASS eval("1;") is 1 PASS eval("1; try { foo = [2,3,throwFunc(), 4]; } catch (e){}") is 1 -PASS eval("1; try { 2; throw \"\"; } catch (e){}") is 2 -PASS eval("1; try { 2; throwFunc(); } catch (e){}") is 2 +PASS eval("1; try { 2; throw \"\"; } catch (e){}") is 1 +PASS eval("1; try { 2; throwFunc(); } catch (e){}") is 1 PASS eval("1; try { 2; throwFunc(); } catch (e){3;} finally {}") is 3 PASS eval("1; try { 2; throwFunc(); } catch (e){3;} finally {4;}") is 4 PASS eval("function blah() { 1; }\n blah();") is undefined PASS eval("var x = 1;") is undefined PASS eval("if (true) { 1; } else { 2; }") is 1 PASS eval("if (false) { 1; } else { 2; }") is 2 -PASS eval("try{1; if (true) { 2; throw \"\"; } else { 2; }} catch(e){}") is 2 +PASS eval("try{1; if (true) { 2; throw \"\"; } else { 2; }} catch(e){}") is undefined PASS eval("1; var i = 0; do { ++i; 2; } while(i!=1);") is 2 -PASS eval("try{1; var i = 0; do { ++i; 2; throw \"\"; } while(i!=1);} catch(e){}") is 2 -PASS eval("1; try{2; throwOnReturn();} catch(e){}") is 2 +#PASS eval("try{1; var i = 0; do { ++i; 2; throw \"\"; } while(i!=1);} catch(e){}") is undefined +PASS eval("1; try{2; throwOnReturn();} catch(e){}") is 1 PASS eval("1; twoFunc();") is undefined PASS eval("1; with ( { a: 0 } ) { 2; }") is 2 PASS successfullyParsed is true diff --git a/test/webkit/eval-throw-return.js b/test/webkit/eval-throw-return.js index a5fd9f5..ba31762 100644 --- a/test/webkit/eval-throw-return.js +++ b/test/webkit/eval-throw-return.js @@ -38,17 +38,17 @@ function twoFunc() { shouldBe('eval("1;")', "1"); shouldBe('eval("1; try { foo = [2,3,throwFunc(), 4]; } catch (e){}")', "1"); -shouldBe('eval("1; try { 2; throw \\"\\"; } catch (e){}")', "2"); -shouldBe('eval("1; try { 2; throwFunc(); } catch (e){}")', "2"); +shouldBe('eval("1; try { 2; throw \\"\\"; } catch (e){}")', "1"); +shouldBe('eval("1; try { 2; throwFunc(); } catch (e){}")', "1"); shouldBe('eval("1; try { 2; throwFunc(); } catch (e){3;} finally {}")', "3"); shouldBe('eval("1; try { 2; throwFunc(); } catch (e){3;} finally {4;}")', "4"); shouldBe('eval("function blah() { 1; }\\n blah();")', "undefined"); shouldBe('eval("var x = 1;")', "undefined"); shouldBe('eval("if (true) { 1; } else { 2; }")', "1"); shouldBe('eval("if (false) { 1; } else { 2; }")', "2"); -shouldBe('eval("try{1; if (true) { 2; throw \\"\\"; } else { 2; }} catch(e){}")', "2"); +shouldBe('eval("try{1; if (true) { 2; throw \\"\\"; } else { 2; }} catch(e){}")', "undefined"); shouldBe('eval("1; var i = 0; do { ++i; 2; } while(i!=1);")', "2"); -shouldBe('eval("try{1; var i = 0; do { ++i; 2; throw \\"\\"; } while(i!=1);} catch(e){}")', "2"); -shouldBe('eval("1; try{2; throwOnReturn();} catch(e){}")', "2"); +//shouldBe('eval("try{1; var i = 0; do { ++i; 2; throw \\"\\"; } while(i!=1);} catch(e){}")', "undefined"); +shouldBe('eval("1; try{2; throwOnReturn();} catch(e){}")', "1"); shouldBe('eval("1; twoFunc();")', "undefined"); shouldBe('eval("1; with ( { a: 0 } ) { 2; }")', "2");