Fix build after bad merge

jeisinger · jeisinger · commit 59c7657d642b · 2016-05-04T13:22:04.000Z
TBR=hablich@chromium.org BUG=v8:4909 LOG=n Review URL: https://codereview.chromium.org/1945283002 . Cr-Commit-Position: refs/branch-heads/5.0@{#55} Cr-Branched-From: ad16e6c-refs/heads/5.0.71@{#1} Cr-Branched-From: bd9df50-refs/heads/master@{#34215}
diff --git a/include/v8-version.h b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 5
 #define V8_MINOR_VERSION 0
 #define V8_BUILD_NUMBER 71
-#define V8_PATCH_LEVEL 45
+#define V8_PATCH_LEVEL 46
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/src/objects.cc b/src/objects.cc
@@ -16501,16 +16501,6 @@ void HeapSortPairs(FixedArray* content, FixedArray* numbers, int len) {
       }
     }
   }
-  // Wipe deleted entries.
-  Heap* heap = GetHeap();
-  Object* the_hole = heap->the_hole_value();
-  Object* undefined = heap->undefined_value();
-  for (uint32_t current = 0; current < capacity; current++) {
-    if (get(EntryToIndex(current)) == the_hole) {
-      set(EntryToIndex(current), undefined);
-    }
-  }
-  SetNumberOfDeletedElements(0);
 }
 
 
@@ -17359,6 +17349,16 @@ void HashTable<Derived, Shape, Key>::Rehash(Key key) {
       }
     }
   }
+  // Wipe deleted entries.
+  Heap* heap = GetHeap();
+  Object* the_hole = heap->the_hole_value();
+  Object* undefined = heap->undefined_value();
+  for (uint32_t current = 0; current < capacity; current++) {
+    if (get(EntryToIndex(current)) == the_hole) {
+      set(EntryToIndex(current), undefined);
+    }
+  }
+  SetNumberOfDeletedElements(0);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -16501,16 +16501,6 @@ void HeapSortPairs(FixedArray* content, FixedArray* numbers, int len) {`
`16501`	`16501`	`}`
`16502`	`16502`	`}`
`16503`	`16503`	`}`
`16504`		`- // Wipe deleted entries.`
`16505`		`- Heap* heap = GetHeap();`
`16506`		`- Object* the_hole = heap->the_hole_value();`
`16507`		`- Object* undefined = heap->undefined_value();`
`16508`		`- for (uint32_t current = 0; current < capacity; current++) {`
`16509`		`- if (get(EntryToIndex(current)) == the_hole) {`
`16510`		`- set(EntryToIndex(current), undefined);`
`16511`		`- }`
`16512`		`- }`
`16513`		`- SetNumberOfDeletedElements(0);`
`16514`	`16504`	`}`
`16515`	`16505`
`16516`	`16506`
`@@ -17359,6 +17349,16 @@ void HashTable<Derived, Shape, Key>::Rehash(Key key) {`
`17359`	`17349`	`}`
`17360`	`17350`	`}`
`17361`	`17351`	`}`
	`17352`	`+ // Wipe deleted entries.`
	`17353`	`+ Heap* heap = GetHeap();`
	`17354`	`+ Object* the_hole = heap->the_hole_value();`
	`17355`	`+ Object* undefined = heap->undefined_value();`
	`17356`	`+ for (uint32_t current = 0; current < capacity; current++) {`
	`17357`	`+ if (get(EntryToIndex(current)) == the_hole) {`
	`17358`	`+ set(EntryToIndex(current), undefined);`
	`17359`	`+ }`
	`17360`	`+ }`
	`17361`	`+ SetNumberOfDeletedElements(0);`
`17362`	`17362`	`}`
`17363`	`17363`
`17364`	`17364`