Reviewers: Nico,

Description:
Version 4.6.83.1 (cherry-pick)

Merged 95694f00a761bc088a1e4f54183561704289ec11

[heap] Fix compilation of LargeObjectSpace on Windows.

R=tha...@chromium.org
BUG=

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

Base URL: https://chromium.googlesource.com/v8/v8.git@4.6.83

Affected files (+5, -2 lines):
  M include/v8-version.h
  M src/heap/spaces.h
  M src/heap/spaces.cc


Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index 88eb97808a6d82dd11bceee12d6df8a7cf72a053..94260fa52c4af41d8825785a22852bf93921d710 100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 6
 #define V8_BUILD_NUMBER 83
-#define V8_PATCH_LEVEL 0
+#define V8_PATCH_LEVEL 1

 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
Index: src/heap/spaces.cc
diff --git a/src/heap/spaces.cc b/src/heap/spaces.cc
index 6e487a14bbc23abc993f59bacffe81e483244e47..e66fd3944cf57c91911013c137c6a91318edf243 100644
--- a/src/heap/spaces.cc
+++ b/src/heap/spaces.cc
@@ -2814,6 +2814,9 @@ LargeObjectSpace::LargeObjectSpace(Heap* heap, AllocationSpace id)
       chunk_map_(ComparePointers, 1024) {}


+LargeObjectSpace::~LargeObjectSpace() {}
+
+
 bool LargeObjectSpace::SetUp() {
   first_page_ = NULL;
   size_ = 0;
Index: src/heap/spaces.h
diff --git a/src/heap/spaces.h b/src/heap/spaces.h
index 98e89ccad40f118bd988bc8b7119d1970224c99b..2ea2e909aa0c9b567da8e0d280a56a84e48cc977 100644
--- a/src/heap/spaces.h
+++ b/src/heap/spaces.h
@@ -2702,7 +2702,7 @@ class MapSpace : public PagedSpace {
 class LargeObjectSpace : public Space {
  public:
   LargeObjectSpace(Heap* heap, AllocationSpace id);
-  virtual ~LargeObjectSpace() {}
+  virtual ~LargeObjectSpace();

   // Initializes internal data structures.
   bool SetUp();


--
--
v8-dev mailing list
v8-dev@googlegroups.com
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 v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to