Abort optimization in corner case.
The %OptimizeFunctionOnNextCall sledgehammer can cause a function to be marked for optimization before it's ever been compiled by fullcode. This can lead to the situation where a function doesn't have optimization disabled until we try to compile it optimized. Basically, the assert should just handle this case more gracefully. R=yangguo@chromium.org BUG=436893 LOG=Y Review URL: https://codereview.chromium.org/760063002 Cr-Commit-Position: refs/heads/master@{#25528}
This commit is contained in:
parent
97cab985b8
commit
9da4998204
@ -344,9 +344,11 @@ OptimizedCompileJob::Status OptimizedCompileJob::CreateGraph() {
|
|||||||
DCHECK(info()->IsOptimizing());
|
DCHECK(info()->IsOptimizing());
|
||||||
DCHECK(!info()->IsCompilingForDebugging());
|
DCHECK(!info()->IsCompilingForDebugging());
|
||||||
|
|
||||||
// We should never arrive here if optimization has been disabled on the
|
// Optimization could have been disabled by the parser.
|
||||||
// shared function info.
|
if (info()->shared_info()->optimization_disabled()) {
|
||||||
DCHECK(!info()->shared_info()->optimization_disabled());
|
return AbortOptimization(
|
||||||
|
info()->shared_info()->disable_optimization_reason());
|
||||||
|
}
|
||||||
|
|
||||||
// Do not use crankshaft if we need to be able to set break points.
|
// Do not use crankshaft if we need to be able to set break points.
|
||||||
if (isolate()->DebuggerHasBreakPoints()) {
|
if (isolate()->DebuggerHasBreakPoints()) {
|
||||||
|
@ -62,9 +62,14 @@ RUNTIME_FUNCTION(Runtime_OptimizeFunctionOnNextCall) {
|
|||||||
|
|
||||||
if (!isolate->use_crankshaft()) return isolate->heap()->undefined_value();
|
if (!isolate->use_crankshaft()) return isolate->heap()->undefined_value();
|
||||||
|
|
||||||
// If the function is optimized, just return.
|
// If the function is already optimized, just return.
|
||||||
if (function->IsOptimized()) return isolate->heap()->undefined_value();
|
if (function->IsOptimized()) return isolate->heap()->undefined_value();
|
||||||
|
|
||||||
|
// If the function cannot optimized, just return.
|
||||||
|
if (function->shared()->optimization_disabled()) {
|
||||||
|
return isolate->heap()->undefined_value();
|
||||||
|
}
|
||||||
|
|
||||||
function->MarkForOptimization();
|
function->MarkForOptimization();
|
||||||
|
|
||||||
Code* unoptimized = function->shared()->code();
|
Code* unoptimized = function->shared()->code();
|
||||||
|
37
test/mjsunit/regress/regress-436893.js
Normal file
37
test/mjsunit/regress/regress-436893.js
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
// Copyright 2010 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: --allow-natives-syntax
|
||||||
|
|
||||||
|
var x = 11;
|
||||||
|
function foo() {
|
||||||
|
return 42;
|
||||||
|
}
|
||||||
|
// Test passing null or undefined as receiver.
|
||||||
|
function g() { return foo.apply(null, x()++); }
|
||||||
|
%OptimizeFunctionOnNextCall(g);
|
||||||
|
assertThrows(g);
|
Loading…
Reference in New Issue
Block a user