Revision: 6836
Author: [email protected]
Date: Thu Feb 17 06:13:25 2011
Log: Revert 6832.
The test contains a syntax error that shouldn't be detected, but it
sometimes is.
TBR: [email protected]
Review URL: http://codereview.chromium.org/6519049
http://code.google.com/p/v8/source/detail?r=6836
Deleted:
/branches/bleeding_edge/test/mjsunit/regress/regress-1145.js
Modified:
/branches/bleeding_edge/src/handles.cc
/branches/bleeding_edge/src/handles.h
/branches/bleeding_edge/src/runtime.cc
=======================================
--- /branches/bleeding_edge/test/mjsunit/regress/regress-1145.js Thu Feb 17
04:23:18 2011
+++ /dev/null
@@ -1,54 +0,0 @@
-// 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
-
-// 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();
=======================================
--- /branches/bleeding_edge/src/handles.cc Thu Feb 17 04:23:18 2011
+++ /branches/bleeding_edge/src/handles.cc Thu Feb 17 06:13:25 2011
@@ -871,12 +871,10 @@
}
-bool CompileOptimized(Handle<JSFunction> function,
- int osr_ast_id,
- ClearExceptionFlag flag) {
+bool CompileOptimized(Handle<JSFunction> function, int osr_ast_id) {
CompilationInfo info(function);
info.SetOptimizing(osr_ast_id);
- bool result = CompileLazyHelper(&info, flag);
+ bool result = CompileLazyHelper(&info, KEEP_EXCEPTION);
if (result) PROFILE(FunctionCreateEvent(*function));
return result;
}
=======================================
--- /branches/bleeding_edge/src/handles.h Thu Feb 17 04:23:18 2011
+++ /branches/bleeding_edge/src/handles.h Thu Feb 17 06:13:25 2011
@@ -354,9 +354,7 @@
bool CompileLazyInLoop(Handle<JSFunction> function, ClearExceptionFlag
flag);
-bool CompileOptimized(Handle<JSFunction> function,
- int osr_ast_id,
- ClearExceptionFlag flag);
+bool CompileOptimized(Handle<JSFunction> function, int osr_ast_id);
class NoHandleAllocation BASE_EMBEDDED {
public:
=======================================
--- /branches/bleeding_edge/src/runtime.cc Thu Feb 17 04:23:18 2011
+++ /branches/bleeding_edge/src/runtime.cc Thu Feb 17 06:13:25 2011
@@ -7000,7 +7000,7 @@
function->ReplaceCode(function->shared()->code());
return function->code();
}
- if (CompileOptimized(function, AstNode::kNoNumber, KEEP_EXCEPTION)) {
+ if (CompileOptimized(function, AstNode::kNoNumber)) {
return function->code();
}
if (FLAG_trace_opt) {
@@ -7169,8 +7169,7 @@
// 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, CLEAR_EXCEPTION) &&
- function->IsOptimized()) {
+ if (CompileOptimized(function, ast_id) && function->IsOptimized()) {
DeoptimizationInputData* data = DeoptimizationInputData::cast(
function->code()->deoptimization_data());
if (data->OsrPcOffset()->value() >= 0) {
@@ -7213,9 +7212,6 @@
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);
}
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
