From 485f4ea0d99fa083cda714234ebdd8b8e7d412cf Mon Sep 17 00:00:00 2001 From: "lrn@chromium.org" Date: Fri, 25 Feb 2011 11:17:31 +0000 Subject: [PATCH] Clear exceptions set during attempts to lazily optimize. Resubmit of patch for issue 1145 with a few additions: - Now also clears exceptions when calling Runtime_LazyRecompile. - Sets function where parsing fails to not be optimizable. BUG=v8:1145 TEST=test/mjsunit/regress/regress-1145.js Review URL: http://codereview.chromium.org/6469050 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6945 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/handles.cc | 6 ++-- src/handles.h | 4 ++- src/hydrogen.cc | 2 ++ src/objects.cc | 6 ++-- src/runtime.cc | 10 +++++-- test/mjsunit/regress/regress-1145.js | 54 ++++++++++++++++++++++++++++++++++++ 6 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 test/mjsunit/regress/regress-1145.js diff --git a/src/handles.cc b/src/handles.cc index b48aa50..8b2f95b 100644 --- a/src/handles.cc +++ b/src/handles.cc @@ -863,10 +863,12 @@ bool CompileLazyInLoop(Handle function, } -bool CompileOptimized(Handle function, int osr_ast_id) { +bool CompileOptimized(Handle function, + int osr_ast_id, + ClearExceptionFlag flag) { CompilationInfo info(function); info.SetOptimizing(osr_ast_id); - return CompileLazyHelper(&info, KEEP_EXCEPTION); + return CompileLazyHelper(&info, flag); } diff --git a/src/handles.h b/src/handles.h index d7bf03f..8f1664b 100644 --- a/src/handles.h +++ b/src/handles.h @@ -403,7 +403,9 @@ bool CompileLazy(Handle function, ClearExceptionFlag flag); bool CompileLazyInLoop(Handle function, ClearExceptionFlag flag); -bool CompileOptimized(Handle function, int osr_ast_id); +bool CompileOptimized(Handle function, + int osr_ast_id, + ClearExceptionFlag flag); class NoHandleAllocation BASE_EMBEDDED { public: diff --git a/src/hydrogen.cc b/src/hydrogen.cc index 9e40a50..18b9fe5 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -4091,6 +4091,8 @@ bool HGraphBuilder::TryInline(Call* expr) { !Scope::Analyze(&inner_info)) { if (Top::has_pending_exception()) { SetStackOverflow(); + // Stop trying to optimize and inline this function. + target->shared()->set_optimization_disabled(true); } return false; } diff --git a/src/objects.cc b/src/objects.cc index 2d10052..75d4e8c 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -5476,9 +5476,11 @@ uint32_t JSFunction::SourceHash() { bool JSFunction::IsInlineable() { if (IsBuiltin()) return false; + SharedFunctionInfo* shared_info = shared(); // Check that the function has a script associated with it. - if (!shared()->script()->IsScript()) return false; - Code* code = shared()->code(); + if (!shared_info->script()->IsScript()) return false; + if (shared_info->optimization_disabled()) return false; + Code* code = shared_info->code(); if (code->kind() == Code::OPTIMIZED_FUNCTION) return true; // If we never ran this (unlikely) then lets try to optimize it. if (code->kind() != Code::FUNCTION) return true; diff --git a/src/runtime.cc b/src/runtime.cc index 74c1146..dce2e15 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -7020,7 +7020,7 @@ static MaybeObject* Runtime_LazyRecompile(Arguments args) { function->ReplaceCode(function->shared()->code()); return function->code(); } - if (CompileOptimized(function, AstNode::kNoNumber)) { + if (CompileOptimized(function, AstNode::kNoNumber, CLEAR_EXCEPTION)) { return function->code(); } if (FLAG_trace_opt) { @@ -7029,7 +7029,7 @@ static MaybeObject* Runtime_LazyRecompile(Arguments args) { PrintF(": optimized compilation failed]\n"); } function->ReplaceCode(function->shared()->code()); - return Failure::Exception(); + return function->code(); } @@ -7189,7 +7189,8 @@ static MaybeObject* Runtime_CompileForOnStackReplacement(Arguments args) { // Try to compile the optimized code. A true return value from // CompileOptimized means that compilation succeeded, not necessarily // that optimization succeeded. - if (CompileOptimized(function, ast_id) && function->IsOptimized()) { + if (CompileOptimized(function, ast_id, CLEAR_EXCEPTION) && + function->IsOptimized()) { DeoptimizationInputData* data = DeoptimizationInputData::cast( function->code()->deoptimization_data()); if (data->OsrPcOffset()->value() >= 0) { @@ -7232,6 +7233,9 @@ static MaybeObject* Runtime_CompileForOnStackReplacement(Arguments args) { ASSERT(function->code()->kind() == Code::OPTIMIZED_FUNCTION); return Smi::FromInt(ast_id); } else { + if (function->IsMarkedForLazyRecompilation()) { + function->ReplaceCode(function->shared()->code()); + } return Smi::FromInt(-1); } } diff --git a/test/mjsunit/regress/regress-1145.js b/test/mjsunit/regress/regress-1145.js new file mode 100644 index 0000000..16d5527 --- /dev/null +++ b/test/mjsunit/regress/regress-1145.js @@ -0,0 +1,54 @@ +// Copyright 2011 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Flags: --opt-eagerly --debug-code --lazy + +// See: http://code.google.com/p/v8/issues/detail?id=1145 +// Should not throw a syntax error exception (change this if we make lazily +// compiled functions with syntax errors into early errors). +// Should not hit an assertion in debug mode. + +// A lazily compiled function with a syntax error that is attempted inlined +// would set a pending exception that is then ignored (until it triggers +// an assert). +// This file must be at least 1024 bytes long to trigger lazy compilation. + +function f() { return 1; } + +// Must be lazy. Must throw SyntaxError during compilation. +function fail() { continue; } + +function opt_me() { + var x = 1; + // Do lots of function calls and hope to be optimized. + for (var i = 0; i < 1000000; i++) { + x = f(); + } + if (x == 0) fail(); // Hope to be inlined during optimization. +} + +opt_me(); -- 2.7.4