Reviewers: Kevin Millikin,
Description:
Correct the limit of local variables in a optimized functions.
The encoding constraint is that we have 128 values. We use [-64,0] for
parameters and [0,63] for locals. However, for locals we restricted to
64 and not 63.
[email protected]
TEST=mjsunit/compiler/regress-max-locals-for-osr.js
Please review this at http://codereview.chromium.org/6995108/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/compiler.cc
M src/runtime.h
M src/runtime.cc
A test/mjsunit/compiler/regress-max-locals-for-osr.js
Index: src/compiler.cc
diff --git a/src/compiler.cc b/src/compiler.cc
index
ef0a82cee326e059a894db84eb2e021231525c91..62402e18fa9ddf501dfe5ec973c3b846f3d9e7f0
100755
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -213,10 +213,11 @@ static bool MakeCrankshaftCode(CompilationInfo* info)
{
//
// The encoding is as a signed value, with parameters and receiver using
// the negative indices and locals the non-negative ones.
- const int limit = LUnallocated::kMaxFixedIndices / 2;
+ const int parameter_limit = (LUnallocated::kMaxFixedIndices / 2);
+ const int locals_limit = parameter_limit - 1;
Scope* scope = info->scope();
- if ((scope->num_parameters() + 1) > limit ||
- scope->num_stack_slots() > limit) {
+ if ((scope->num_parameters() + 1) > parameter_limit ||
+ scope->num_stack_slots() > locals_limit) {
info->AbortOptimization();
Handle<JSFunction> closure = info->closure();
info->shared_info()->DisableOptimization(*closure);
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
43d34510f4ac4ecce5be2f12d66b3bb33bf88956..6526be5d1b5eb617f962a92632874018462a3c10
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -7720,6 +7720,15 @@ RUNTIME_FUNCTION(MaybeObject*,
Runtime_DeoptimizeFunction) {
}
+RUNTIME_FUNCTION(MaybeObject*, Runtime_RunningInSimulator) {
+#if defined(USE_SIMULATOR)
+ return isolate->heap()->true_value();
+#else
+ return isolate->heap()->false_value();
+#endif
+}
+
+
RUNTIME_FUNCTION(MaybeObject*, Runtime_OptimizeFunctionOnNextCall) {
HandleScope scope(isolate);
ASSERT(args.length() == 1);
Index: src/runtime.h
diff --git a/src/runtime.h b/src/runtime.h
index
56d2f1409d3f904cc06422e731288978e73f1069..04c7d8e5d640aa397e1bb0575e37612e940ee196
100644
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -87,6 +87,7 @@ namespace internal {
F(NotifyDeoptimized, 1, 1) \
F(NotifyOSR, 0, 1) \
F(DeoptimizeFunction, 1, 1) \
+ F(RunningInSimulator, 0, 1) \
F(OptimizeFunctionOnNextCall, 1, 1) \
F(GetOptimizationStatus, 1, 1) \
F(GetOptimizationCount, 1, 1) \
Index: test/mjsunit/compiler/regress-max-locals-for-osr.js
diff --git a/test/mjsunit/compiler/regress-max-locals-for-osr.js
b/test/mjsunit/compiler/regress-max-locals-for-osr.js
new file mode 100644
index
0000000000000000000000000000000000000000..cc150edfd7d50d2e59d696cfc632515ba727d007
--- /dev/null
+++ b/test/mjsunit/compiler/regress-max-locals-for-osr.js
@@ -0,0 +1,43 @@
+// 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: --allow-natives-syntax
+
+var limit = %RunningInSimulator() ? 10000 : 10000000;
+
+function f() {
+ var a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+ a11, a12, a13, a14, a15, a16, a17, a18, a19, a20,
+ a21, a22, a23, a24, a25, a26, a27, a28, a29, a30,
+ a31, a32, a33, a34, a35, a36, a37, a38, a39, a40,
+ a41, a42, a43, a44, a45, a46, a47, a48, a49, a50,
+ a51, a52, a53, a54, a55, a56, a57, a58, a59, a60,
+ a61, a62, a63, a64;
+ for (a1 = 0; a1 < limit; a1++) a2 = 23;
+}
+
+f();
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
