commit a6516eb7a6c347f1146a0c823994a333468d818a
author mvstanton@chromium.org <mvstanton@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00> Tue Oct 29 08:04:57 2013 +0000
committer mvstanton@chromium.org <mvstanton@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00> Tue Oct 29 08:04:57 2013 +0000
tree 23060b72fa4c5fd182677cf1cac948c745e0ce91
parent ef33a5482a35a9a25f702f8e3f02bb6b49f3854c

Merged r17422 into trunk branch.

Function ElementsAreSafeToExamine was undefined in release heap verify.

R=jkummerow@chromium.org
BUG=

Review URL: https://codereview.chromium.org/50103004

git-svn-id: http://v8.googlecode.com/svn/trunk@17423 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/objects-debug.cc

diff --git a/src/objects-debug.cc b/src/objects-debug.cc
index fa3c375..6ab2ddf 100644
--- a/src/objects-debug.cc
+++ b/src/objects-debug.cc
@@ -306,6 +306,13 @@
 }
 
 
+bool JSObject::ElementsAreSafeToExamine() {
+  return (FLAG_use_gvn && FLAG_use_allocation_folding) ||
+      reinterpret_cast<Map*>(elements()) !=
+      GetHeap()->one_pointer_filler_map();
+}
+
+
 void JSObject::JSObjectVerify() {
   VerifyHeapPointer(properties());
   VerifyHeapPointer(elements());
@@ -1139,13 +1146,6 @@
 }
 
 
-bool JSObject::ElementsAreSafeToExamine() {
-  return (FLAG_use_gvn && FLAG_use_allocation_folding) ||
-      reinterpret_cast<Map*>(elements()) !=
-      GetHeap()->one_pointer_filler_map();
-}
-
-
 bool DescriptorArray::IsSortedNoDuplicates(int valid_entries) {
   if (valid_entries == -1) valid_entries = number_of_descriptors();
   Name* current_key = NULL;

src/objects.h

diff --git a/src/objects.h b/src/objects.h
index c0835e2..e8c9850 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -2595,12 +2595,15 @@
   };
 
   void IncrementSpillStatistics(SpillInformation* info);
+#endif
 
+#ifdef VERIFY_HEAP
   // If a GC was caused while constructing this object, the elements pointer
   // may point to a one pointer filler map. The object won't be rooted, but
   // our heap verification code could stumble across it.
   bool ElementsAreSafeToExamine();
 #endif
+
   Object* SlowReverseLookup(Object* value);
 
   // Maximal number of fast properties for the JSObject. Used to

src/version.cc

diff --git a/src/version.cc b/src/version.cc
index be577e3..ccd60b1 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     22
 #define BUILD_NUMBER      23
-#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