Revision: 17423
Author: [email protected]
Date: Tue Oct 29 08:04:57 2013 UTC
Log: Merged r17422 into trunk branch.
Function ElementsAreSafeToExamine was undefined in release heap verify.
[email protected]
BUG=
Review URL: https://codereview.chromium.org/50103004
http://code.google.com/p/v8/source/detail?r=17423
Modified:
/trunk/src/objects-debug.cc
/trunk/src/objects.h
/trunk/src/version.cc
=======================================
--- /trunk/src/objects-debug.cc Mon Oct 28 18:03:37 2013 UTC
+++ /trunk/src/objects-debug.cc Tue Oct 29 08:04:57 2013 UTC
@@ -304,6 +304,13 @@
void ExternalDoubleArray::ExternalDoubleArrayVerify() {
CHECK(IsExternalDoubleArray());
}
+
+
+bool JSObject::ElementsAreSafeToExamine() {
+ return (FLAG_use_gvn && FLAG_use_allocation_folding) ||
+ reinterpret_cast<Map*>(elements()) !=
+ GetHeap()->one_pointer_filler_map();
+}
void JSObject::JSObjectVerify() {
@@ -1137,13 +1144,6 @@
PrintF("\n");
}
-
-
-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) {
=======================================
--- /trunk/src/objects.h Mon Oct 28 18:03:37 2013 UTC
+++ /trunk/src/objects.h Tue Oct 29 08:04:57 2013 UTC
@@ -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
=======================================
--- /trunk/src/version.cc Mon Oct 28 18:03:37 2013 UTC
+++ /trunk/src/version.cc Tue Oct 29 08:04:57 2013 UTC
@@ -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
--
--
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/groups/opt_out.
