Reviewers: Sven Panne,
Description:
remove ISOLATE
[email protected]
BUG=
Please review this at https://codereview.chromium.org/23480067/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+24, -28 lines):
M src/arm/code-stubs-arm.cc
M src/ia32/code-stubs-ia32.cc
M src/isolate.h
M src/jsregexp.cc
M src/log.cc
M src/mips/code-stubs-mips.cc
M src/platform-cygwin.cc
M src/platform-freebsd.cc
M src/platform-linux.cc
M src/platform-openbsd.cc
M src/platform-solaris.cc
M src/platform-win32.cc
M src/spaces.cc
M src/string-stream.cc
M src/x64/regexp-macro-assembler-x64.cc
M test/cctest/test-alloc.cc
M test/cctest/test-api.cc
Index: src/arm/code-stubs-arm.cc
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
index
6eedd1986d3d0a5db1752f1c899eff340d1203ce..87a76f068821fb3b9982b9955058a27a13d96d91
100644
--- a/src/arm/code-stubs-arm.cc
+++ b/src/arm/code-stubs-arm.cc
@@ -2695,7 +2695,7 @@ bool CEntryStub::NeedsImmovableCode() {
bool CEntryStub::IsPregenerated() {
- return (!save_doubles_ || ISOLATE->fp_stubs_generated()) &&
+ return (!save_doubles_ || Isolate::Current()->fp_stubs_generated()) &&
result_size_ == 1;
}
Index: src/ia32/code-stubs-ia32.cc
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc
index
7891dc6fe6cd07e1914a97a7653cac719a1329f9..7133f3b41233d7695e5b23bf92b328dbc4f0fca8
100644
--- a/src/ia32/code-stubs-ia32.cc
+++ b/src/ia32/code-stubs-ia32.cc
@@ -4431,7 +4431,7 @@ bool CEntryStub::NeedsImmovableCode() {
bool CEntryStub::IsPregenerated() {
- return (!save_doubles_ || ISOLATE->fp_stubs_generated()) &&
+ return (!save_doubles_ || Isolate::Current()->fp_stubs_generated()) &&
result_size_ == 1;
}
Index: src/isolate.h
diff --git a/src/isolate.h b/src/isolate.h
index
79b00bec7951a77067813231f0e548f521a40f78..99283c9238683d1b09fcbbcf8e6178e4c9fb45cf
100644
--- a/src/isolate.h
+++ b/src/isolate.h
@@ -1518,11 +1518,6 @@ class PostponeInterruptsScope BASE_EMBEDDED {
};
-// Temporary macros for accessing current isolate and its subobjects.
-// They provide better readability, especially when used a lot in the code.
-#define ISOLATE (v8::internal::Isolate::Current())
-
-
// Tells whether the native context is marked with out of memory.
inline bool Context::has_out_of_memory() {
return native_context()->out_of_memory()->IsTrue();
Index: src/jsregexp.cc
diff --git a/src/jsregexp.cc b/src/jsregexp.cc
index
5c79477eb18b9261bbb4761cd1868f1ee0017e1c..f1cb96dba87ca6098dfb7504ebe08a180d930e19
100644
--- a/src/jsregexp.cc
+++ b/src/jsregexp.cc
@@ -5834,7 +5834,7 @@ void TextNode::FillInBMInfo(int initial_offset,
if (bm->compiler()->ignore_case()) {
unibrow::uchar chars[unibrow::Ecma262UnCanonicalize::kMaxWidth];
int length = GetCaseIndependentLetters(
- ISOLATE,
+ Isolate::Current(),
character,
bm->max_char() == String::kMaxOneByteCharCode,
chars);
Index: src/log.cc
diff --git a/src/log.cc b/src/log.cc
index
1b3301e6728c28035b166bb3c0804399fca339c0..7d1861e0de3c88af04df5cf4dca6807fec54805c
100644
--- a/src/log.cc
+++ b/src/log.cc
@@ -686,7 +686,7 @@ void Profiler::Disengage() {
Insert(&sample);
Join();
- LOG(ISOLATE, UncheckedStringEvent("profiler", "end"));
+ LOG(isolate_, UncheckedStringEvent("profiler", "end"));
}
Index: src/mips/code-stubs-mips.cc
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc
index
ff157389b04aab286965791132e4091202a157a2..752a24c3bc894a7ad0a4872b09a61e4b14d400e9
100644
--- a/src/mips/code-stubs-mips.cc
+++ b/src/mips/code-stubs-mips.cc
@@ -2724,7 +2724,7 @@ bool CEntryStub::NeedsImmovableCode() {
bool CEntryStub::IsPregenerated() {
- return (!save_doubles_ || ISOLATE->fp_stubs_generated()) &&
+ return (!save_doubles_ || Isolate::Current()->fp_stubs_generated()) &&
result_size_ == 1;
}
Index: src/platform-cygwin.cc
diff --git a/src/platform-cygwin.cc b/src/platform-cygwin.cc
index
d7dcaf0569692a8b030c15d436c7bc4b560b1423..9618d7e50f43e19ca5284ced20e52573f5e05846
100644
--- a/src/platform-cygwin.cc
+++ b/src/platform-cygwin.cc
@@ -80,7 +80,7 @@ void* OS::Allocate(const size_t requested,
int prot = PROT_READ | PROT_WRITE | (is_executable ? PROT_EXEC : 0);
void* mbase = mmap(NULL, msize, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1,
0);
if (mbase == MAP_FAILED) {
- LOG(ISOLATE, StringEvent("OS::Allocate", "mmap failed"));
+ LOG(Isolate::Current(), StringEvent("OS::Allocate", "mmap failed"));
return NULL;
}
*allocated = msize;
@@ -152,7 +152,7 @@ void OS::LogSharedLibraryAddresses() {
const int kLibNameLen = FILENAME_MAX + 1;
char* lib_name = reinterpret_cast<char*>(malloc(kLibNameLen));
- i::Isolate* isolate = ISOLATE;
+ i::Isolate* isolate = Isolate::Current();
// This loop will terminate once the scanning hits an EOF.
while (true) {
uintptr_t start, end;
Index: src/platform-freebsd.cc
diff --git a/src/platform-freebsd.cc b/src/platform-freebsd.cc
index
007bc0dbd6820bf4d500435329eb75f775aa6b9d..34ed70960175d247b9c3ff08c6681244b6e0a9d0
100644
--- a/src/platform-freebsd.cc
+++ b/src/platform-freebsd.cc
@@ -89,7 +89,7 @@ void* OS::Allocate(const size_t requested,
void* mbase = mmap(NULL, msize, prot, MAP_PRIVATE | MAP_ANON, -1, 0);
if (mbase == MAP_FAILED) {
- LOG(ISOLATE, StringEvent("OS::Allocate", "mmap failed"));
+ LOG(Isolate::Current(), StringEvent("OS::Allocate", "mmap failed"));
return NULL;
}
*allocated = msize;
Index: src/platform-linux.cc
diff --git a/src/platform-linux.cc b/src/platform-linux.cc
index
d0fd77add61b6b01d00200d9cad6527785eecbbe..39bf1cba60b6f29236383d72e3649c8770448e07
100644
--- a/src/platform-linux.cc
+++ b/src/platform-linux.cc
@@ -231,7 +231,7 @@ void OS::LogSharedLibraryAddresses() {
const int kLibNameLen = FILENAME_MAX + 1;
char* lib_name = reinterpret_cast<char*>(malloc(kLibNameLen));
- i::Isolate* isolate = ISOLATE;
+ i::Isolate* isolate = Isolate::Current();
// This loop will terminate once the scanning hits an EOF.
while (true) {
uintptr_t start, end;
Index: src/platform-openbsd.cc
diff --git a/src/platform-openbsd.cc b/src/platform-openbsd.cc
index
faf9ba33a5fd749f1a21468adc39501797026c09..bb20df3203f2672b02eadb316d0f68732036848f
100644
--- a/src/platform-openbsd.cc
+++ b/src/platform-openbsd.cc
@@ -160,7 +160,7 @@ void OS::LogSharedLibraryAddresses() {
const int kLibNameLen = FILENAME_MAX + 1;
char* lib_name = reinterpret_cast<char*>(malloc(kLibNameLen));
- i::Isolate* isolate = ISOLATE;
+ i::Isolate* isolate = Isolate::Current();
// This loop will terminate once the scanning hits an EOF.
while (true) {
uintptr_t start, end;
Index: src/platform-solaris.cc
diff --git a/src/platform-solaris.cc b/src/platform-solaris.cc
index
66f23ae6157f298bff7b41773f49613eab058798..512d995792731cb9e0a1333cd8ec856868f4cc03
100644
--- a/src/platform-solaris.cc
+++ b/src/platform-solaris.cc
@@ -104,7 +104,7 @@ void* OS::Allocate(const size_t requested,
void* mbase = mmap(NULL, msize, prot, MAP_PRIVATE | MAP_ANON, -1, 0);
if (mbase == MAP_FAILED) {
- LOG(ISOLATE, StringEvent("OS::Allocate", "mmap failed"));
+ LOG(Isolate::Current(), StringEvent("OS::Allocate", "mmap failed"));
return NULL;
}
*allocated = msize;
Index: src/platform-win32.cc
diff --git a/src/platform-win32.cc b/src/platform-win32.cc
index
83bfc899259f15613d6e25db8fa5cd6ff56cd12e..2e82056f2b2200d8cab09c97cf1e768cd20d6208
100644
--- a/src/platform-win32.cc
+++ b/src/platform-win32.cc
@@ -829,7 +829,7 @@ void* OS::Allocate(const size_t requested,
prot);
if (mbase == NULL) {
- LOG(ISOLATE, StringEvent("OS::Allocate", "VirtualAlloc failed"));
+ LOG(Isolate::Current(), StringEvent("OS::Allocate", "VirtualAlloc
failed"));
return NULL;
}
Index: src/spaces.cc
diff --git a/src/spaces.cc b/src/spaces.cc
index
13f80d81a87b4f3939a3b6fb3c04809f7cd7c1aa..2faf41912e8e3db3319ed940a5c11c1ad8cad577
100644
--- a/src/spaces.cc
+++ b/src/spaces.cc
@@ -1950,7 +1950,7 @@ void NewSpace::ReportStatistics() {
#endif // DEBUG
if (FLAG_log_gc) {
- Isolate* isolate = ISOLATE;
+ Isolate* isolate = heap()->isolate();
DoReportStatistics(isolate, allocated_histogram_, "allocated");
DoReportStatistics(isolate, promoted_histogram_, "promoted");
}
Index: src/string-stream.cc
diff --git a/src/string-stream.cc b/src/string-stream.cc
index
2afbae2d4b553caa5ea2bd16981b376d37ffe29f..7c45e2f5b78f52c0834f09740eb6cc9655ee4afc
100644
--- a/src/string-stream.cc
+++ b/src/string-stream.cc
@@ -270,7 +270,7 @@ SmartArrayPointer<const char> StringStream::ToCString()
const {
void StringStream::Log() {
- LOG(ISOLATE, StringEvent("StackDump", buffer_));
+ LOG(Isolate::Current(), StringEvent("StackDump", buffer_));
}
Index: src/x64/regexp-macro-assembler-x64.cc
diff --git a/src/x64/regexp-macro-assembler-x64.cc
b/src/x64/regexp-macro-assembler-x64.cc
index
49d9de65ab96229088b88b0c3e919631f3351283..999622aa6a8afea046f154863dafcf69617b95c3
100644
--- a/src/x64/regexp-macro-assembler-x64.cc
+++ b/src/x64/regexp-macro-assembler-x64.cc
@@ -998,7 +998,7 @@ Handle<HeapObject>
RegExpMacroAssemblerX64::GetCode(Handle<String> source) {
CodeDesc code_desc;
masm_.GetCode(&code_desc);
- Isolate* isolate = ISOLATE;
+ Isolate* isolate = this->isolate();
Handle<Code> code = isolate->factory()->NewCode(
code_desc, Code::ComputeFlags(Code::REGEXP),
masm_.CodeObject());
Index: test/cctest/test-alloc.cc
diff --git a/test/cctest/test-alloc.cc b/test/cctest/test-alloc.cc
index
670da58a150086bd6ca0d67b7255f17a51fde192..f4f13d0d8348fb26d94f410809487279dc0b578b
100644
--- a/test/cctest/test-alloc.cc
+++ b/test/cctest/test-alloc.cc
@@ -90,7 +90,7 @@ static MaybeObject* AllocateAfterFailures() {
static Handle<Object> Test() {
- CALL_HEAP_FUNCTION(ISOLATE, AllocateAfterFailures(), Object);
+ CALL_HEAP_FUNCTION(Isolate::Current(), AllocateAfterFailures(), Object);
}
Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index
19f33095ffd41b0968d85c1cd31ab8f5a7d03628..6e47cd6acf788b77addad7919f4fc0928d722d66
100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -13401,7 +13401,7 @@ TEST(SetJitCodeEventHandler) {
v8::Utils::OpenHandle(*env->Global()->Get(v8_str("foo"))))->code());
// Clear the compilation cache to get more wastage.
- ISOLATE->compilation_cache()->Clear();
+ reinterpret_cast<i::Isolate*>(isolate)->compilation_cache()->Clear();
}
// Force code movement.
@@ -19735,19 +19735,20 @@ TEST(StaticGetters) {
TEST(IsolateEmbedderData) {
v8::Isolate* isolate = v8::Isolate::GetCurrent();
+ i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
CHECK_EQ(NULL, isolate->GetData());
- CHECK_EQ(NULL, ISOLATE->GetData());
+ CHECK_EQ(NULL, i_isolate->GetData());
static void* data1 = reinterpret_cast<void*>(0xacce55ed);
isolate->SetData(data1);
CHECK_EQ(data1, isolate->GetData());
- CHECK_EQ(data1, ISOLATE->GetData());
+ CHECK_EQ(data1, i_isolate->GetData());
static void* data2 = reinterpret_cast<void*>(0xdecea5ed);
- ISOLATE->SetData(data2);
+ i_isolate->SetData(data2);
CHECK_EQ(data2, isolate->GetData());
- CHECK_EQ(data2, ISOLATE->GetData());
- ISOLATE->TearDown();
+ CHECK_EQ(data2, i_isolate->GetData());
+ i_isolate->TearDown();
CHECK_EQ(data2, isolate->GetData());
- CHECK_EQ(data2, ISOLATE->GetData());
+ CHECK_EQ(data2, i_isolate->GetData());
}
--
--
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.
