Upgrade to V8 3.3
Merge V8 at 3.3.10.39
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: I14703f418235f5ce6013b9b3e2e502407a9f6dfd
diff --git a/src/spaces.h b/src/spaces.h
index f323f85..4024387 100644
--- a/src/spaces.h
+++ b/src/spaces.h
@@ -1,4 +1,4 @@
-// Copyright 2006-2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
@@ -28,7 +28,8 @@
#ifndef V8_SPACES_H_
#define V8_SPACES_H_
-#include "list-inl.h"
+#include "allocation.h"
+#include "list.h"
#include "log.h"
namespace v8 {
@@ -413,8 +414,6 @@
// manages a range of virtual memory.
class CodeRange {
public:
- explicit CodeRange(Isolate* isolate);
-
// Reserves a range of virtual memory, but does not commit any of it.
// Can only be called once, at heap initialization time.
// Returns false on failure.
@@ -424,9 +423,9 @@
// manage it.
void TearDown();
- bool exists() { return this != NULL && code_range_ != NULL; }
+ bool exists() { return code_range_ != NULL; }
bool contains(Address address) {
- if (this == NULL || code_range_ == NULL) return false;
+ if (code_range_ == NULL) return false;
Address start = static_cast<Address>(code_range_->address());
return start <= address && address < start + code_range_->size();
}
@@ -439,7 +438,7 @@
void FreeRawMemory(void* buf, size_t length);
private:
- Isolate* isolate_;
+ CodeRange();
// The reserved range of virtual memory that all code objects are put in.
VirtualMemory* code_range_;
@@ -473,6 +472,10 @@
static int CompareFreeBlockAddress(const FreeBlock* left,
const FreeBlock* right);
+ friend class Isolate;
+
+ Isolate* isolate_;
+
DISALLOW_COPY_AND_ASSIGN(CodeRange);
};
@@ -503,8 +506,6 @@
class MemoryAllocator {
public:
- explicit MemoryAllocator(Isolate* isolate);
-
// Initializes its internal bookkeeping structures.
// Max capacity of the total space and executable memory limit.
bool Setup(intptr_t max_capacity, intptr_t capacity_executable);
@@ -675,11 +676,11 @@
#endif
private:
+ MemoryAllocator();
+
static const int kChunkSize = kPagesPerChunk * Page::kPageSize;
static const int kChunkSizeLog2 = kPagesPerChunkLog2 + kPageSizeBits;
- Isolate* isolate_;
-
// Maximum space size in bytes.
intptr_t capacity_;
// Maximum subset of capacity_ that can be executable
@@ -772,6 +773,10 @@
Page* prev,
Page** last_page_in_use);
+ friend class Isolate;
+
+ Isolate* isolate_;
+
DISALLOW_COPY_AND_ASSIGN(MemoryAllocator);
};