Reviewers: Michael Starzinger,
Description:
Debugger: fix deoptimizing inlined function.
BUG=v8:4320
LOG=N
[email protected]
Please review this at https://codereview.chromium.org/1255803004/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+12, -6 lines):
M src/debug.cc
A + test/mjsunit/regress/regress-4320.js
Index: src/debug.cc
diff --git a/src/debug.cc b/src/debug.cc
index
bc45365c1ef006b65884f3d040336ae8517bcc5a..a930b75e43be0ac6e6772568dd407d46d013aa10
100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1461,7 +1461,7 @@ bool
Debug::PrepareFunctionForBreakPoints(Handle<SharedFunctionInfo> shared) {
if (function->code()->kind() == Code::OPTIMIZED_FUNCTION) {
Deoptimizer::DeoptimizeFunction(function);
}
- functions.Add(handle(function));
+ if (function->shared() == *shared) functions.Add(handle(function));
} else if (include_generators && obj->IsJSGeneratorObject()) {
JSGeneratorObject* generator_obj = JSGeneratorObject::cast(obj);
if (!generator_obj->is_suspended()) continue;
Index: test/mjsunit/regress/regress-4320.js
diff --git a/test/mjsunit/regress/regress-crbug-490021.js
b/test/mjsunit/regress/regress-4320.js
similarity index 53%
copy from test/mjsunit/regress/regress-crbug-490021.js
copy to test/mjsunit/regress/regress-4320.js
index
745c0a801051037274b6f1e52de5a8ed92d98a86..df6a99b28fca8ea391224e0113822154c6fdfb9b
100644
--- a/test/mjsunit/regress/regress-crbug-490021.js
+++ b/test/mjsunit/regress/regress-4320.js
@@ -2,14 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// Flags: --allow-natives-syntax
+// Flags: --allow-natives-syntax --expose-debug-as debug
-var global = new Object(3);
-function f() {
- global[0] = global[0] >>> 15.5;
-}
+var Debug = debug.Debug;
+
+function f() { g(); }
+
+function g() { }
f();
f();
%OptimizeFunctionOnNextCall(f);
f();
+
+Debug.setListener(function() {});
+Debug.setBreakPoint(g, 0);
+
+f();
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
