Version 1.10.0-dev.1.11

Fix wrongly committed cl against trunk, by reverting.
svn merge -c -45501 https://dart.googlecode.com/svn/branches/bleeding_edge trunk


git-svn-id: https://dart.googlecode.com/svn/trunk@45517 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/dart/runtime/vm/pages.cc b/dart/runtime/vm/pages.cc
index 1cc8e95..19da567 100644
--- a/dart/runtime/vm/pages.cc
+++ b/dart/runtime/vm/pages.cc
@@ -46,14 +46,11 @@
 DEFINE_FLAG(bool, log_growth, false, "Log PageSpace growth policy decisions.");
 
 HeapPage* HeapPage::Initialize(VirtualMemory* memory, PageType type) {
-  ASSERT(memory != NULL);
   ASSERT(memory->size() > VirtualMemory::PageSize());
   bool is_executable = (type == kExecutable);
-  if (!memory->Commit(is_executable)) {
-    return NULL;
-  }
+  memory->Commit(is_executable);
+
   HeapPage* result = reinterpret_cast<HeapPage*>(memory->address());
-  ASSERT(result != NULL);
   result->memory_ = memory;
   result->next_ = NULL;
   result->executable_ = is_executable;
@@ -67,12 +64,7 @@
   if (memory == NULL) {
     return NULL;
   }
-  HeapPage* result = Initialize(memory, type);
-  if (result == NULL) {
-    delete memory;  // Release reservation to OS.
-    return NULL;
-  }
-  return result;
+  return Initialize(memory, type);
 }
 
 
diff --git a/dart/runtime/vm/pages.h b/dart/runtime/vm/pages.h
index 79d5343..c6b4f38 100644
--- a/dart/runtime/vm/pages.h
+++ b/dart/runtime/vm/pages.h
@@ -69,7 +69,6 @@
     object_end_ = val;
   }
 
-  // These return NULL on OOM.
   static HeapPage* Initialize(VirtualMemory* memory, PageType type);
   static HeapPage* Allocate(intptr_t size_in_words, PageType type);
 
diff --git a/dart/runtime/vm/virtual_memory.h b/dart/runtime/vm/virtual_memory.h
index 607e6b2..844ff5e 100644
--- a/dart/runtime/vm/virtual_memory.h
+++ b/dart/runtime/vm/virtual_memory.h
@@ -35,8 +35,7 @@
     return region_.Contains(addr);
   }
 
-  // Commits the virtual memory area, which is guaranteed to be zeroed. Returns
-  // true on success and false on failure (e.g., out-of-memory).
+  // Commits the virtual memory area, which is guaranteed to be zeroed.
   bool Commit(bool is_executable) {
     return Commit(start(), size(), is_executable);
   }
diff --git a/dart/tools/VERSION b/dart/tools/VERSION
index 0cb079c..f5159ae 100644
--- a/dart/tools/VERSION
+++ b/dart/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 10
 PATCH 0
 PRERELEASE 1
-PRERELEASE_PATCH 10
+PRERELEASE_PATCH 11