Revision: 23292
Author:   [email protected]
Date:     Fri Aug 22 07:44:18 2014 UTC
Log:      Couple more debugger tests working with Turbofan.

BUG=
[email protected]

Review URL: https://codereview.chromium.org/498493002
https://code.google.com/p/v8/source/detail?r=23292

Modified:
 /branches/bleeding_edge/src/compiler/ast-graph-builder.cc
 /branches/bleeding_edge/src/compiler/operator-properties-inl.h
 /branches/bleeding_edge/src/compiler.cc
 /branches/bleeding_edge/src/deoptimizer.cc
 /branches/bleeding_edge/test/mjsunit/debug-backtrace-text.js
 /branches/bleeding_edge/test/mjsunit/debug-break-inline.js
 /branches/bleeding_edge/test/mjsunit/debug-scopes.js
 /branches/bleeding_edge/test/mjsunit/mjsunit.status

=======================================
--- /branches/bleeding_edge/src/compiler/ast-graph-builder.cc Thu Aug 21 12:40:10 2014 UTC +++ /branches/bleeding_edge/src/compiler/ast-graph-builder.cc Fri Aug 22 07:44:18 2014 UTC
@@ -87,7 +87,8 @@
   VisitDeclarations(scope->declarations());

   // TODO(mstarzinger): This should do an inlined stack check.
-  NewNode(javascript()->Runtime(Runtime::kStackGuard, 0));
+  Node* node = NewNode(javascript()->Runtime(Runtime::kStackGuard, 0));
+  PrepareFrameState(node, BailoutId::FunctionEntry());

   // Visit statements in the function body.
   VisitStatements(info()->function()->body());
=======================================
--- /branches/bleeding_edge/src/compiler/operator-properties-inl.h Thu Aug 21 11:56:46 2014 UTC +++ /branches/bleeding_edge/src/compiler/operator-properties-inl.h Fri Aug 22 07:44:18 2014 UTC
@@ -47,6 +47,9 @@
       switch (function) {
         case Runtime::kDebugBreak:
         case Runtime::kDeoptimizeFunction:
+        case Runtime::kSetScriptBreakPoint:
+        case Runtime::kDebugGetLoadedScripts:
+        case Runtime::kStackGuard:
           return true;
         default:
           return false;
@@ -178,6 +181,9 @@
       switch (function) {
         case Runtime::kDebugBreak:
         case Runtime::kDeoptimizeFunction:
+        case Runtime::kSetScriptBreakPoint:
+        case Runtime::kDebugGetLoadedScripts:
+        case Runtime::kStackGuard:
           return true;
         default:
           return false;
=======================================
--- /branches/bleeding_edge/src/compiler.cc     Mon Aug  4 11:34:54 2014 UTC
+++ /branches/bleeding_edge/src/compiler.cc     Fri Aug 22 07:44:18 2014 UTC
@@ -417,6 +417,7 @@
     compiler::Pipeline pipeline(info());
     pipeline.GenerateCode();
     if (!info()->code().is_null()) {
+ info()->context()->native_context()->AddOptimizedCode(*info()->code());
       return SetLastStatus(SUCCEEDED);
     }
   }
=======================================
--- /branches/bleeding_edge/src/deoptimizer.cc  Mon Aug 11 12:26:17 2014 UTC
+++ /branches/bleeding_edge/src/deoptimizer.cc  Fri Aug 22 07:44:18 2014 UTC
@@ -378,7 +378,8 @@
     CHECK_EQ(code->kind(), Code::OPTIMIZED_FUNCTION);
     Object* next = code->next_code_link();

-    if (code->marked_for_deoptimization()) {
+    if (code->marked_for_deoptimization() &&
+        (!code->is_turbofanned() || FLAG_turbo_deoptimization)) {
       // Put the code into the list for later patching.
       codes.Add(code, &zone);

=======================================
--- /branches/bleeding_edge/test/mjsunit/debug-backtrace-text.js Fri Jan 28 10:33:10 2011 UTC +++ /branches/bleeding_edge/test/mjsunit/debug-backtrace-text.js Fri Aug 22 07:44:18 2014 UTC
@@ -25,7 +25,7 @@
 // (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: --expose-debug-as debug
+// Flags: --expose-debug-as debug --turbo-deoptimization

 // The functions used for testing backtraces.
 function Point(x, y) {
=======================================
--- /branches/bleeding_edge/test/mjsunit/debug-break-inline.js Mon Jul 22 09:16:33 2013 UTC +++ /branches/bleeding_edge/test/mjsunit/debug-break-inline.js Fri Aug 22 07:44:18 2014 UTC
@@ -25,7 +25,7 @@
 // (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: --expose-debug-as debug --allow-natives-syntax
+// Flags: --expose-debug-as debug --allow-natives-syntax --turbo-deoptimization

 // This test tests that deoptimization due to debug breaks works for
 // inlined functions where the full-code is generated before the
=======================================
--- /branches/bleeding_edge/test/mjsunit/debug-scopes.js Wed Apr 23 08:58:41 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/debug-scopes.js Fri Aug 22 07:44:18 2014 UTC
@@ -25,7 +25,7 @@
 // (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: --expose-debug-as debug --allow-natives-syntax
+// Flags: --expose-debug-as debug --allow-natives-syntax --turbo-deoptimization // The functions used for testing backtraces. They are at the top to make the
 // testing of source line/column easier.

=======================================
--- /branches/bleeding_edge/test/mjsunit/mjsunit.status Fri Aug 22 07:25:12 2014 UTC +++ /branches/bleeding_edge/test/mjsunit/mjsunit.status Fri Aug 22 07:44:18 2014 UTC
@@ -97,8 +97,6 @@
   'deserialize-reference': [PASS, NO_VARIANTS],

   # Support for %GetFrameDetails is missing and requires checkpoints.
-  'debug-backtrace-text': [PASS, NO_VARIANTS],
-  'debug-break-inline': [PASS, NO_VARIANTS],
   'debug-evaluate-bool-constructor': [PASS, NO_VARIANTS],
   'debug-evaluate-closure': [PASS, NO_VARIANTS],
   'debug-evaluate-const': [PASS, NO_VARIANTS],
@@ -110,7 +108,6 @@
   'debug-liveedit-double-call': [PASS, NO_VARIANTS],
   'debug-liveedit-restart-frame': [PASS, NO_VARIANTS],
   'debug-return-value': [PASS, NO_VARIANTS],
-  'debug-scopes': [PASS, NO_VARIANTS],
   'debug-set-variable-value': [PASS, NO_VARIANTS],
   'debug-step-stub-callfunction': [PASS, NO_VARIANTS],
   'debug-stepin-accessor': [PASS, NO_VARIANTS],

--
--
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.

Reply via email to