src/objects.cc - Issue 196133017: Experimental parser: merge r19949

Unified Diff: src/objects.cc

Issue 196133017: Experimental parser: merge r19949 (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/parser

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/objects.cc

diff --git a/src/objects.cc b/src/objects.cc

index 94a80f7d7a2aea73db5b600c6c21fcb1d3d2218f..92e4dc4c8c9c98f03a6267e2f393dda5c4312803 100644

--- a/src/objects.cc

+++ b/src/objects.cc

@@ -519,7 +519,7 @@ Handle<Object> JSProxy::SetElementWithHandler(Handle<JSProxy> proxy,

Handle<JSReceiver> receiver,

uint32_t index,

Handle<Object> value,

- StrictModeFlag strict_mode) {

+ StrictMode strict_mode) {

Isolate* isolate = proxy->GetIsolate();

Handle<String> name = isolate->factory()->Uint32ToString(index);

return SetPropertyWithHandler(

@@ -615,29 +615,29 @@ Handle<Object> JSObject::GetPropertyWithFailedAccessCheck(

// No accessible property found.

*attributes = ABSENT;

- isolate->ReportFailedAccessCheck(*object, v8::ACCESS_GET);

+ isolate->ReportFailedAccessCheckWrapper(object, v8::ACCESS_GET);

RETURN_HANDLE_IF_SCHEDULED_EXCEPTION(isolate, Object);

return isolate->factory()->undefined_value();

}

PropertyAttributes JSObject::GetPropertyAttributeWithFailedAccessCheck(

- Object* receiver,

+ Handle<JSObject> object,

LookupResult* result,

- Name* name,

+ Handle<Name> name,

bool continue_search) {

if (result->IsProperty()) {

switch (result->type()) {

case CALLBACKS: {

// Only allow API accessors.

- Object* obj = result->GetCallbackObject();

+ Handle<Object> obj(result->GetCallbackObject(), object->GetIsolate());

if (obj->IsAccessorInfo()) {

- AccessorInfo* info = AccessorInfo::cast(obj);

+ Handle<AccessorInfo> info = Handle<AccessorInfo>::cast(obj);

if (info->all_can_read()) {

return result->GetAttributes();

}

} else if (obj->IsAccessorPair()) {

- AccessorPair* pair = AccessorPair::cast(obj);

+ Handle<AccessorPair> pair = Handle<AccessorPair>::cast(obj);

if (pair->all_can_read()) {

return result->GetAttributes();

}

@@ -650,13 +650,11 @@ PropertyAttributes JSObject::GetPropertyAttributeWithFailedAccessCheck(

case CONSTANT: {

if (!continue_search) break;

// Search ALL_CAN_READ accessors in prototype chain.

- LookupResult r(GetIsolate());

- result->holder()->LookupRealNamedPropertyInPrototypes(name, &r);

+ LookupResult r(object->GetIsolate());

+ result->holder()->LookupRealNamedPropertyInPrototypes(*name, &r);

if (r.IsProperty()) {

- return GetPropertyAttributeWithFailedAccessCheck(receiver,

- &r,

- name,

- continue_search);

+ return GetPropertyAttributeWithFailedAccessCheck(

+ object, &r, name, continue_search);

}

break;

}

@@ -664,17 +662,15 @@ PropertyAttributes JSObject::GetPropertyAttributeWithFailedAccessCheck(

case INTERCEPTOR: {

// If the object has an interceptor, try real named properties.

// No access check in GetPropertyAttributeWithInterceptor.

- LookupResult r(GetIsolate());

+ LookupResult r(object->GetIsolate());

if (continue_search) {

- result->holder()->LookupRealNamedProperty(name, &r);

+ result->holder()->LookupRealNamedProperty(*name, &r);

} else {

- result->holder()->LocalLookupRealNamedProperty(name, &r);

+ result->holder()->LocalLookupRealNamedProperty(*name, &r);

}

if (!r.IsFound()) break;

- return GetPropertyAttributeWithFailedAccessCheck(receiver,

- &r,

- name,

- continue_search);

+ return GetPropertyAttributeWithFailedAccessCheck(

+ object, &r, name, continue_search);

}

case HANDLER:

@@ -684,7 +680,7 @@ PropertyAttributes JSObject::GetPropertyAttributeWithFailedAccessCheck(

}

- GetIsolate()->ReportFailedAccessCheck(this, v8::ACCESS_HAS);

+ object->GetIsolate()->ReportFailedAccessCheckWrapper(object, v8::ACCESS_HAS);

return ABSENT;

}

@@ -1280,14 +1276,13 @@ bool String::MakeExternal(v8::String::ExternalStringResource* resource) {

// - the space the existing string occupies is too small for a regular

// external string.

// - the existing string is in old pointer space and the backing store of

- // the external string is not aligned. The GC cannot deal with fields

- // containing an unaligned address that points to outside of V8's heap.

+ // the external string is not aligned. The GC cannot deal with a field

+ // containing a possibly unaligned address to outside of V8's heap.

// In either case we resort to a short external string instead, omitting

// the field caching the address of the backing store. When we encounter

// short external strings in generated code, we need to bailout to runtime.

if (size < ExternalString::kSize ||

- (!IsAligned(reinterpret_cast<intptr_t>(resource->data()), kPointerSize) &&

- heap->old_pointer_space()->Contains(this))) {

+ heap->old_pointer_space()->Contains(this)) {

this->set_map_no_write_barrier(

is_internalized

? (is_ascii

@@ -1351,14 +1346,13 @@ bool String::MakeExternal(v8::String::ExternalAsciiStringResource* resource) {