Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: src/isolate.cc

Issue 357453002: Revert assertion change from r21933 in Isolate::RunMicrotasks(). (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdlib.h> 5 #include <stdlib.h>
6 6
7 #include "src/v8.h" 7 #include "src/v8.h"
8 8
9 #include "src/ast.h" 9 #include "src/ast.h"
10 #include "src/bootstrapper.h" 10 #include "src/bootstrapper.h"
(...skipping 2274 matching lines...) Expand 10 before | Expand all | Expand 10 after
2285 queue = FixedArray::CopySize(queue, num_tasks * 2); 2285 queue = FixedArray::CopySize(queue, num_tasks * 2);
2286 heap()->set_microtask_queue(*queue); 2286 heap()->set_microtask_queue(*queue);
2287 } 2287 }
2288 ASSERT(queue->get(num_tasks)->IsUndefined()); 2288 ASSERT(queue->get(num_tasks)->IsUndefined());
2289 queue->set(num_tasks, *microtask); 2289 queue->set(num_tasks, *microtask);
2290 set_pending_microtask_count(num_tasks + 1); 2290 set_pending_microtask_count(num_tasks + 1);
2291 } 2291 }
2292 2292
2293 2293
2294 void Isolate::RunMicrotasks() { 2294 void Isolate::RunMicrotasks() {
2295 // In some mjsunit tests %RunMicrotasks is called explicitly, violating 2295 // %RunMicrotasks may be called in mjsunit tests, which violates
2296 // this assertion. Therefore we also check for --allow-natives-syntax. 2296 // this assertion, hence the check for --allow-natives-syntax.
2297 ASSERT(FLAG_allow_natives_syntax || 2297 // TODO(adamk): However, this also fails some layout tests.
2298 handle_scope_implementer()->CallDepthIsZero()); 2298 //
2299 // ASSERT(FLAG_allow_natives_syntax ||
2300 // handle_scope_implementer()->CallDepthIsZero());
2299 2301
2300 // Increase call depth to prevent recursive callbacks. 2302 // Increase call depth to prevent recursive callbacks.
2301 v8::Isolate::SuppressMicrotaskExecutionScope suppress( 2303 v8::Isolate::SuppressMicrotaskExecutionScope suppress(
2302 reinterpret_cast<v8::Isolate*>(this)); 2304 reinterpret_cast<v8::Isolate*>(this));
2303 2305
2304 while (pending_microtask_count() > 0) { 2306 while (pending_microtask_count() > 0) {
2305 HandleScope scope(this); 2307 HandleScope scope(this);
2306 int num_tasks = pending_microtask_count(); 2308 int num_tasks = pending_microtask_count();
2307 Handle<FixedArray> queue(heap()->microtask_queue(), this); 2309 Handle<FixedArray> queue(heap()->microtask_queue(), this);
2308 ASSERT(num_tasks <= queue->length()); 2310 ASSERT(num_tasks <= queue->length());
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
2362 // The simulator uses a separate JS stack. 2364 // The simulator uses a separate JS stack.
2363 Address jssp_address = Simulator::current(isolate_)->get_sp(); 2365 Address jssp_address = Simulator::current(isolate_)->get_sp();
2364 uintptr_t jssp = reinterpret_cast<uintptr_t>(jssp_address); 2366 uintptr_t jssp = reinterpret_cast<uintptr_t>(jssp_address);
2365 if (jssp < stack_guard->real_jslimit()) return true; 2367 if (jssp < stack_guard->real_jslimit()) return true;
2366 #endif // USE_SIMULATOR 2368 #endif // USE_SIMULATOR
2367 return reinterpret_cast<uintptr_t>(this) < stack_guard->real_climit(); 2369 return reinterpret_cast<uintptr_t>(this) < stack_guard->real_climit();
2368 } 2370 }
2369 2371
2370 2372
2371 } } // namespace v8::internal 2373 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698