Index: src/api.cc |
diff --git a/src/api.cc b/src/api.cc |
index 4b80555a159da47f82183c3c090ea3f5415b17f9..e2f3fcdc1accb40deb37e567810729efc2452336 100644 |
--- a/src/api.cc |
+++ b/src/api.cc |
@@ -1683,19 +1683,20 @@ void ObjectTemplate::SetInternalFieldCount(int value) { |
ScriptData* ScriptData::PreCompile(const char* input, int length) { |
i::Utf8ToUtf16CharacterStream stream( |
reinterpret_cast<const unsigned char*>(input), length); |
- return i::PreParserApi::PreParse(&stream); |
+ return i::PreParserApi::PreParse(i::Isolate::Current(), &stream); |
} |
ScriptData* ScriptData::PreCompile(v8::Handle<String> source) { |
i::Handle<i::String> str = Utils::OpenHandle(*source); |
+ i::Isolate* isolate = str->GetIsolate(); |
if (str->IsExternalTwoByteString()) { |
i::ExternalTwoByteStringUtf16CharacterStream stream( |
i::Handle<i::ExternalTwoByteString>::cast(str), 0, str->length()); |
- return i::PreParserApi::PreParse(&stream); |
+ return i::PreParserApi::PreParse(isolate, &stream); |
} else { |
i::GenericStringUtf16CharacterStream stream(str, 0, str->length()); |
- return i::PreParserApi::PreParse(&stream); |
+ return i::PreParserApi::PreParse(isolate, &stream); |
} |
} |
@@ -2289,7 +2290,7 @@ Local<StackFrame> StackTrace::GetFrame(uint32_t index) const { |
ENTER_V8(isolate); |
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); |
i::Handle<i::JSArray> self = Utils::OpenHandle(this); |
- i::Object* raw_object = self->GetElementNoExceptionThrown(index); |
+ i::Object* raw_object = self->GetElementNoExceptionThrown(isolate, index); |
i::Handle<i::JSObject> obj(i::JSObject::cast(raw_object)); |
return scope.Close(Utils::StackFrameToLocal(obj)); |
} |
@@ -3362,7 +3363,7 @@ Local<Value> v8::Object::Get(uint32_t index) { |
ENTER_V8(isolate); |
i::Handle<i::JSObject> self = Utils::OpenHandle(this); |
EXCEPTION_PREAMBLE(isolate); |
- i::Handle<i::Object> result = i::Object::GetElement(self, index); |
+ i::Handle<i::Object> result = i::Object::GetElement(isolate, self, index); |
has_pending_exception = result.is_null(); |
EXCEPTION_BAILOUT_CHECK(isolate, Local<Value>()); |
return Utils::ToLocal(result); |