Revision: 10856
Author: [email protected]
Date: Tue Feb 28 02:32:02 2012
Log: Thread the current isolate through a few places, avoiding
Isolate::Current().
This removes approx. 12k calls of Isolate::Current() in string-tagcloud.
Review URL: https://chromiumcodereview.appspot.com/9490004
http://code.google.com/p/v8/source/detail?r=10856
Modified:
/branches/bleeding_edge/src/arm/regexp-macro-assembler-arm.cc
/branches/bleeding_edge/src/execution.cc
/branches/bleeding_edge/src/execution.h
/branches/bleeding_edge/src/ia32/regexp-macro-assembler-ia32.cc
/branches/bleeding_edge/src/jsregexp.cc
/branches/bleeding_edge/src/jsregexp.h
/branches/bleeding_edge/src/mips/regexp-macro-assembler-mips.cc
/branches/bleeding_edge/src/runtime.cc
/branches/bleeding_edge/src/x64/regexp-macro-assembler-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/regexp-macro-assembler-arm.cc Thu Jan
26 08:05:28 2012
+++ /branches/bleeding_edge/src/arm/regexp-macro-assembler-arm.cc Tue Feb
28 02:32:02 2012
@@ -1055,7 +1055,7 @@
ASSERT(*return_address <=
re_code->instruction_start() + re_code->instruction_size());
- MaybeObject* result = Execution::HandleStackGuardInterrupt();
+ MaybeObject* result = Execution::HandleStackGuardInterrupt(isolate);
if (*code_handle != re_code) { // Return address no longer valid
int delta = code_handle->address() - re_code->address();
=======================================
--- /branches/bleeding_edge/src/execution.cc Tue Feb 14 06:00:31 2012
+++ /branches/bleeding_edge/src/execution.cc Tue Feb 28 02:32:02 2012
@@ -872,8 +872,7 @@
#endif
-MaybeObject* Execution::HandleStackGuardInterrupt() {
- Isolate* isolate = Isolate::Current();
+MaybeObject* Execution::HandleStackGuardInterrupt(Isolate* isolate) {
StackGuard* stack_guard = isolate->stack_guard();
if (stack_guard->IsGCRequest()) {
=======================================
--- /branches/bleeding_edge/src/execution.h Mon Jan 16 01:46:21 2012
+++ /branches/bleeding_edge/src/execution.h Tue Feb 28 02:32:02 2012
@@ -45,6 +45,10 @@
GC_REQUEST = 1 << 6
};
+
+class Isolate;
+
+
class Execution : public AllStatic {
public:
// Call a function, the caller supplies a receiver and an array
@@ -141,7 +145,8 @@
// If the stack guard is triggered, but it is not an actual
// stack overflow, then handle the interruption accordingly.
- MUST_USE_RESULT static MaybeObject* HandleStackGuardInterrupt();
+ MUST_USE_RESULT static MaybeObject* HandleStackGuardInterrupt(
+ Isolate* isolate);
// Get a function delegate (or undefined) for the given non-function
// object. Used for support calling objects as functions.
@@ -158,7 +163,6 @@
class ExecutionAccess;
-class Isolate;
// StackGuard contains the handling of the limits that are used to limit
the
=======================================
--- /branches/bleeding_edge/src/ia32/regexp-macro-assembler-ia32.cc Mon Jan
16 04:38:59 2012
+++ /branches/bleeding_edge/src/ia32/regexp-macro-assembler-ia32.cc Tue Feb
28 02:32:02 2012
@@ -1085,7 +1085,7 @@
ASSERT(*return_address <=
re_code->instruction_start() + re_code->instruction_size());
- MaybeObject* result = Execution::HandleStackGuardInterrupt();
+ MaybeObject* result = Execution::HandleStackGuardInterrupt(isolate);
if (*code_handle != re_code) { // Return address no longer valid
int delta = code_handle->address() - re_code->address();
=======================================
--- /branches/bleeding_edge/src/jsregexp.cc Mon Feb 20 09:50:53 2012
+++ /branches/bleeding_edge/src/jsregexp.cc Tue Feb 28 02:32:02 2012
@@ -175,7 +175,8 @@
case JSRegExp::IRREGEXP: {
Handle<Object> result =
IrregexpExec(regexp, subject, index, last_match_info);
- ASSERT(!result.is_null() ||
Isolate::Current()->has_pending_exception());
+ ASSERT(!result.is_null() ||
+ regexp->GetIsolate()->has_pending_exception());
return result;
}
default:
@@ -527,6 +528,7 @@
Handle<String> subject,
int previous_index,
Handle<JSArray> last_match_info) {
+ Isolate* isolate = jsregexp->GetIsolate();
ASSERT_EQ(jsregexp->TypeTag(), JSRegExp::IRREGEXP);
// Prepare space for the return values.
@@ -542,11 +544,11 @@
int required_registers = RegExpImpl::IrregexpPrepare(jsregexp, subject);
if (required_registers < 0) {
// Compiling failed with an exception.
- ASSERT(Isolate::Current()->has_pending_exception());
+ ASSERT(isolate->has_pending_exception());
return Handle<Object>::null();
}
- OffsetsVector registers(required_registers);
+ OffsetsVector registers(required_registers, isolate);
IrregexpResult res = RegExpImpl::IrregexpExecOnce(
jsregexp, subject, previous_index, Vector<int>(registers.vector(),
@@ -568,11 +570,11 @@
return last_match_info;
}
if (res == RE_EXCEPTION) {
- ASSERT(Isolate::Current()->has_pending_exception());
+ ASSERT(isolate->has_pending_exception());
return Handle<Object>::null();
}
ASSERT(res == RE_FAILURE);
- return Isolate::Current()->factory()->null_value();
+ return isolate->factory()->null_value();
}
=======================================
--- /branches/bleeding_edge/src/jsregexp.h Wed Jan 25 08:31:25 2012
+++ /branches/bleeding_edge/src/jsregexp.h Tue Feb 28 02:32:02 2012
@@ -1466,12 +1466,12 @@
class OffsetsVector {
public:
- explicit inline OffsetsVector(int num_registers)
+ inline OffsetsVector(int num_registers, Isolate* isolate)
: offsets_vector_length_(num_registers) {
if (offsets_vector_length_ >
Isolate::kJSRegexpStaticOffsetsVectorSize) {
vector_ = NewArray<int>(offsets_vector_length_);
} else {
- vector_ = Isolate::Current()->jsregexp_static_offsets_vector();
+ vector_ = isolate->jsregexp_static_offsets_vector();
}
}
inline ~OffsetsVector() {
=======================================
--- /branches/bleeding_edge/src/mips/regexp-macro-assembler-mips.cc Fri Oct
21 03:59:25 2011
+++ /branches/bleeding_edge/src/mips/regexp-macro-assembler-mips.cc Tue Feb
28 02:32:02 2012
@@ -1056,7 +1056,7 @@
ASSERT(*return_address <=
re_code->instruction_start() + re_code->instruction_size());
- MaybeObject* result = Execution::HandleStackGuardInterrupt();
+ MaybeObject* result = Execution::HandleStackGuardInterrupt(isolate);
if (*code_handle != re_code) { // Return address no longer valid.
int delta = code_handle->address() - re_code->address();
=======================================
--- /branches/bleeding_edge/src/runtime.cc Tue Feb 28 01:05:55 2012
+++ /branches/bleeding_edge/src/runtime.cc Tue Feb 28 02:32:02 2012
@@ -3763,7 +3763,7 @@
int required_registers = RegExpImpl::IrregexpPrepare(regexp, subject);
if (required_registers < 0) return RegExpImpl::RE_EXCEPTION;
- OffsetsVector registers(required_registers);
+ OffsetsVector registers(required_registers, isolate);
Vector<int32_t> register_vector(registers.vector(), registers.length());
int subject_length = subject->length();
bool first = true;
@@ -3836,7 +3836,7 @@
int required_registers = RegExpImpl::IrregexpPrepare(regexp, subject);
if (required_registers < 0) return RegExpImpl::RE_EXCEPTION;
- OffsetsVector registers(required_registers);
+ OffsetsVector registers(required_registers, isolate);
Vector<int32_t> register_vector(registers.vector(), registers.length());
RegExpImpl::IrregexpResult result =
@@ -3855,7 +3855,7 @@
if (result == RegExpImpl::RE_SUCCESS) {
// Need to keep a copy of the previous match for creating
last_match_info
// at the end, so we have two vectors that we swap between.
- OffsetsVector registers2(required_registers);
+ OffsetsVector registers2(required_registers, isolate);
Vector<int> prev_register_vector(registers2.vector(),
registers2.length());
bool first = true;
do {
@@ -9200,13 +9200,13 @@
return isolate->StackOverflow();
}
- return Execution::HandleStackGuardInterrupt();
+ return Execution::HandleStackGuardInterrupt(isolate);
}
RUNTIME_FUNCTION(MaybeObject*, Runtime_Interrupt) {
ASSERT(args.length() == 0);
- return Execution::HandleStackGuardInterrupt();
+ return Execution::HandleStackGuardInterrupt(isolate);
}
=======================================
--- /branches/bleeding_edge/src/x64/regexp-macro-assembler-x64.cc Mon Jan
16 04:38:59 2012
+++ /branches/bleeding_edge/src/x64/regexp-macro-assembler-x64.cc Tue Feb
28 02:32:02 2012
@@ -1192,7 +1192,7 @@
ASSERT(*return_address <=
re_code->instruction_start() + re_code->instruction_size());
- MaybeObject* result = Execution::HandleStackGuardInterrupt();
+ MaybeObject* result = Execution::HandleStackGuardInterrupt(isolate);
if (*code_handle != re_code) { // Return address no longer valid
intptr_t delta = code_handle->address() - re_code->address();
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
