Reviewers: Yang,

Description:
Version 3.28.1.1 (merged r21971)

Revert assertion change from r21933 in Isolate::RunMicrotasks().

[email protected]
BUG=

Please review this at https://codereview.chromium.org/351903002/

SVN Base: https://v8.googlecode.com/svn/trunk

Affected files (+7, -5 lines):
  M src/isolate.cc
  M src/version.cc


Index: src/isolate.cc
diff --git a/src/isolate.cc b/src/isolate.cc
index 89052139dfb598e9f2e3fc46b1998a7746f0ecbf..9a850f659ed3f3eb2829b348605643210d159276 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -2292,10 +2292,12 @@ void Isolate::EnqueueMicrotask(Handle<Object> microtask) {


 void Isolate::RunMicrotasks() {
-  // In some mjsunit tests %RunMicrotasks is called explicitly, violating
-  // this assertion.  Therefore we also check for --allow-natives-syntax.
-  ASSERT(FLAG_allow_natives_syntax ||
-         handle_scope_implementer()->CallDepthIsZero());
+  // %RunMicrotasks may be called in mjsunit tests, which violates
+  // this assertion, hence the check for --allow-natives-syntax.
+  // TODO(adamk): However, this also fails some layout tests.
+  //
+  // ASSERT(FLAG_allow_natives_syntax ||
+  //        handle_scope_implementer()->CallDepthIsZero());

   // Increase call depth to prevent recursive callbacks.
   v8::Isolate::SuppressMicrotaskExecutionScope suppress(
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 5ac51d1bedbda5c23fb780028d70bd7b7627c5a0..8887550f78c0918e8b36a9f2b525b7df4830b5a7 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     28
 #define BUILD_NUMBER      1
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0


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