AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Handlify Runtime::GetElementOrCharAt.

Browse Source 
R=ishell@chromium.org

Review URL: https://codereview.chromium.org/210723004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20243 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
yangguo@chromium.org 2014-03-25 13:02:03 +00:00
parent 727bc2153e
commit 95dfa17c34
3 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ic.cc
View File

@ -564,7 +564,10 @@ MaybeObject* LoadIC::Load(Handle<Object> object,
if (kind() == Code::KEYED_LOAD_IC && name->AsArrayIndex(&index)) {
// Rewrite to the generic keyed load stub.
if (FLAG_use_ic) set_target(*generic_stub());
return Runtime::GetElementOrCharAtOrFail(isolate(), object, index);
Handle<Object> result =
Runtime::GetElementOrCharAt(isolate(), object, index);
RETURN_IF_EMPTY_HANDLE(isolate(), result);
return *result;
}
bool use_ic = MigrateDeprecated(object) ? false : FLAG_use_ic;

44
src/runtime.cc
View File

@ -4865,21 +4865,13 @@ static Handle<Object> GetCharAt(Handle<String> string, uint32_t index) {
}
MaybeObject* Runtime::GetElementOrCharAtOrFail(Isolate* isolate,
Handle<Object> object,
uint32_t index) {
CALL_HEAP_FUNCTION_PASS_EXCEPTION(isolate,
GetElementOrCharAt(isolate, object, index));
}
MaybeObject* Runtime::GetElementOrCharAt(Isolate* isolate,
Handle<Object> object,
uint32_t index) {
Handle<Object> Runtime::GetElementOrCharAt(Isolate* isolate,
Handle<Object> object,
uint32_t index) {
// Handle [] indexing on Strings
if (object->IsString()) {
Handle<Object> result = GetCharAt(Handle<String>::cast(object), index);
if (!result->IsUndefined()) return *result;
if (!result->IsUndefined()) return result;
}
// Handle [] indexing on String objects
@ -4887,18 +4879,16 @@ MaybeObject* Runtime::GetElementOrCharAt(Isolate* isolate,
Handle<JSValue> js_value = Handle<JSValue>::cast(object);
Handle<Object> result =
GetCharAt(Handle<String>(String::cast(js_value->value())), index);
if (!result->IsUndefined()) return *result;
if (!result->IsUndefined()) return result;
}
Handle<Object> result;
if (object->IsString() || object->IsNumber() || object->IsBoolean()) {
Handle<Object> proto(object->GetPrototype(isolate), isolate);
result = Object::GetElement(isolate, proto, index);
return Object::GetElement(isolate, proto, index);
} else {
result = Object::GetElement(isolate, object, index);
return Object::GetElement(isolate, object, index);
}
RETURN_IF_EMPTY_HANDLE(isolate, result);
return *result;
}
@ -4957,7 +4947,9 @@ MaybeObject* Runtime::GetObjectProperty(Isolate* isolate,
// Check if the given key is an array index.
uint32_t index;
if (key->ToArrayIndex(&index)) {
return GetElementOrCharAt(isolate, object, index);
Handle<Object> result = GetElementOrCharAt(isolate, object, index);
RETURN_IF_EMPTY_HANDLE(isolate, result);
return *result;
}
// Convert the key to a name - possibly by calling back into JavaScript.
@ -4967,7 +4959,9 @@ MaybeObject* Runtime::GetObjectProperty(Isolate* isolate,
// Check if the name is trivially convertible to an index and get
// the element if so.
if (name->AsArrayIndex(&index)) {
return GetElementOrCharAt(isolate, object, index);
Handle<Object> result = GetElementOrCharAt(isolate, object, index);
RETURN_IF_EMPTY_HANDLE(isolate, result);
return *result;
} else {
return object->GetProperty(*name);
}
@ -10894,14 +10888,10 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_DebugGetPropertyDetails) {
uint32_t index;
if (name->AsArrayIndex(&index)) {
Handle<FixedArray> details = isolate->factory()->NewFixedArray(2);
Object* element_or_char;
{ MaybeObject* maybe_element_or_char =
Runtime::GetElementOrCharAt(isolate, obj, index);
if (!maybe_element_or_char->ToObject(&element_or_char)) {
return maybe_element_or_char;
}
}
details->set(0, element_or_char);
Handle<Object> element_or_char =
Runtime::GetElementOrCharAt(isolate, obj, index);
RETURN_IF_EMPTY_HANDLE(isolate, element_or_char);
details->set(0, *element_or_char);
details->set(
1, PropertyDetails(NONE, NORMAL, Representation::None()).AsSmi());
return *isolate->factory()->NewJSArrayWithElements(details);

11
src/runtime.h
View File

@ -775,14 +775,9 @@ class Runtime : public AllStatic {
// Support getting the characters in a string using [] notation as
// in Firefox/SpiderMonkey, Safari and Opera.
MUST_USE_RESULT static MaybeObject* GetElementOrCharAt(Isolate* isolate,
Handle<Object> object,
uint32_t index);
MUST_USE_RESULT static MaybeObject* GetElementOrCharAtOrFail(
Isolate* isolate,
Handle<Object> object,
uint32_t index);
static Handle<Object> GetElementOrCharAt(Isolate* isolate,
Handle<Object> object,
uint32_t index);
static Handle<Object> SetObjectProperty(
Isolate* isolate,