Revision: 14347
Author: [email protected]
Date: Fri Apr 19 01:30:49 2013
Log: Handle retry-after-gc failures within LoadIC::Load and
StoreIC::Store.
Follow-up for r14321, makes the remaining unsafe calls to runtime functions
during ic computation safe.
[email protected]
BUG=222301
Review URL: https://chromiumcodereview.appspot.com/13976015
http://code.google.com/p/v8/source/detail?r=14347
Modified:
/branches/bleeding_edge/src/accessors.cc
/branches/bleeding_edge/src/accessors.h
/branches/bleeding_edge/src/ic.cc
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/objects.h
/branches/bleeding_edge/src/runtime.cc
/branches/bleeding_edge/src/runtime.h
=======================================
--- /branches/bleeding_edge/src/accessors.cc Thu Apr 4 05:10:23 2013
+++ /branches/bleeding_edge/src/accessors.cc Fri Apr 19 01:30:49 2013
@@ -441,6 +441,13 @@
//
+Handle<Object> Accessors::FunctionGetPrototype(Handle<Object> object) {
+ Isolate* isolate = Isolate::Current();
+ CALL_HEAP_FUNCTION(
+ isolate, Accessors::FunctionGetPrototype(*object, 0), Object);
+}
+
+
MaybeObject* Accessors::FunctionGetPrototype(Object* object, void*) {
Isolate* isolate = Isolate::Current();
JSFunction* function = FindInstanceOf<JSFunction>(isolate, object);
=======================================
--- /branches/bleeding_edge/src/accessors.h Thu Apr 4 05:10:23 2013
+++ /branches/bleeding_edge/src/accessors.h Fri Apr 19 01:30:49 2013
@@ -79,6 +79,8 @@
// Accessor functions called directly from the runtime system.
MUST_USE_RESULT static MaybeObject* FunctionGetPrototype(Object* object,
void*);
+ static Handle<Object> FunctionGetPrototype(Handle<Object> object);
+
MUST_USE_RESULT static MaybeObject* FunctionSetPrototype(JSObject*
object,
Object* value,
void*);
=======================================
--- /branches/bleeding_edge/src/ic.cc Thu Apr 18 13:37:27 2013
+++ /branches/bleeding_edge/src/ic.cc Fri Apr 19 01:30:49 2013
@@ -877,7 +877,7 @@
if (FLAG_trace_ic) PrintF("[LoadIC : +#prototype /function]\n");
#endif
}
- return Accessors::FunctionGetPrototype(*object, 0);
+ return *Accessors::FunctionGetPrototype(object);
}
}
@@ -887,7 +887,7 @@
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::GetElementOrCharAt(isolate(), object, index);
+ return Runtime::GetElementOrCharAtOrFail(isolate(), object, index);
}
// Named lookup in the object.
@@ -922,7 +922,7 @@
}
// Get the property.
- return object->GetProperty(*object, &lookup, *name, &attr);
+ return Object::GetPropertyOrFail(object, object, &lookup, name, &attr);
}
@@ -1476,8 +1476,8 @@
JSReceiver::StoreFromKeyed store_mode) {
// Handle proxies.
if (object->IsJSProxy()) {
- return JSProxy::cast(*object)->
- SetProperty(*name, *value, NONE, strict_mode);
+ return JSReceiver::SetPropertyOrFail(
+ Handle<JSReceiver>::cast(object), name, value, NONE, strict_mode);
}
// If the object is undefined or null it's illegal to try to set any
@@ -1509,7 +1509,8 @@
// Observed objects are always modified through the runtime.
if (FLAG_harmony_observation && receiver->map()->is_observed()) {
- return receiver->SetProperty(*name, *value, NONE, strict_mode,
store_mode);
+ return JSReceiver::SetPropertyOrFail(
+ receiver, name, value, NONE, strict_mode, store_mode);
}
// Use specialized code for setting the length of arrays with fast
@@ -1524,7 +1525,8 @@
StoreArrayLengthStub(kind(), strict_mode).GetCode(isolate());
set_target(*stub);
TRACE_IC("StoreIC", name, state, *stub);
- return receiver->SetProperty(*name, *value, NONE, strict_mode,
store_mode);
+ return JSReceiver::SetPropertyOrFail(
+ receiver, name, value, NONE, strict_mode, store_mode);
}
if (receiver->IsJSGlobalProxy()) {
@@ -1537,7 +1539,8 @@
set_target(*stub);
TRACE_IC("StoreIC", name, state, *stub);
}
- return receiver->SetProperty(*name, *value, NONE, strict_mode,
store_mode);
+ return JSReceiver::SetPropertyOrFail(
+ receiver, name, value, NONE, strict_mode, store_mode);
}
LookupResult lookup(isolate());
@@ -1553,7 +1556,8 @@
}
// Set the property.
- return receiver->SetProperty(*name, *value, NONE, strict_mode,
store_mode);
+ return JSReceiver::SetPropertyOrFail(
+ receiver, name, value, NONE, strict_mode, store_mode);
}
=======================================
--- /branches/bleeding_edge/src/objects.cc Thu Apr 18 02:50:46 2013
+++ /branches/bleeding_edge/src/objects.cc Fri Apr 19 01:30:49 2013
@@ -743,6 +743,20 @@
object->GetProperty(*receiver, result, *key, attributes),
Object);
}
+
+
+MaybeObject* Object::GetPropertyOrFail(Handle<Object> object,
+ Handle<Object> receiver,
+ LookupResult* result,
+ Handle<Name> key,
+ PropertyAttributes* attributes) {
+ Isolate* isolate = object->IsHeapObject()
+ ? Handle<HeapObject>::cast(object)->GetIsolate()
+ : Isolate::Current();
+ CALL_HEAP_FUNCTION_PASS_EXCEPTION(
+ isolate,
+ object->GetProperty(*receiver, result, *key, attributes));
+}
MaybeObject* Object::GetProperty(Object* receiver,
@@ -2137,6 +2151,19 @@
object->SetProperty(*key, *value, attributes,
strict_mode),
Object);
}
+
+
+MaybeObject* JSReceiver::SetPropertyOrFail(
+ Handle<JSReceiver> object,
+ Handle<Name> key,
+ Handle<Object> value,
+ PropertyAttributes attributes,
+ StrictModeFlag strict_mode,
+ JSReceiver::StoreFromKeyed store_mode) {
+ CALL_HEAP_FUNCTION_PASS_EXCEPTION(
+ object->GetIsolate(),
+ object->SetProperty(*key, *value, attributes, strict_mode,
store_mode));
+}
MaybeObject* JSReceiver::SetProperty(Name* name,
=======================================
--- /branches/bleeding_edge/src/objects.h Thu Apr 18 07:41:24 2013
+++ /branches/bleeding_edge/src/objects.h Fri Apr 19 01:30:49 2013
@@ -1096,6 +1096,13 @@
Handle<Name> key,
PropertyAttributes* attributes);
+ MUST_USE_RESULT static MaybeObject* GetPropertyOrFail(
+ Handle<Object> object,
+ Handle<Object> receiver,
+ LookupResult* result,
+ Handle<Name> key,
+ PropertyAttributes* attributes);
+
MUST_USE_RESULT MaybeObject* GetProperty(Object* receiver,
LookupResult* result,
Name* key,
@@ -1569,6 +1576,15 @@
Handle<Object> value,
PropertyAttributes attributes,
StrictModeFlag strict_mode);
+
+ MUST_USE_RESULT static MaybeObject* SetPropertyOrFail(
+ Handle<JSReceiver> object,
+ Handle<Name> key,
+ Handle<Object> value,
+ PropertyAttributes attributes,
+ StrictModeFlag strict_mode,
+ StoreFromKeyed store_from_keyed = MAY_BE_STORE_FROM_KEYED);
+
// Can cause GC.
MUST_USE_RESULT MaybeObject* SetProperty(
Name* key,
=======================================
--- /branches/bleeding_edge/src/runtime.cc Thu Apr 18 05:46:38 2013
+++ /branches/bleeding_edge/src/runtime.cc Fri Apr 19 01:30:49 2013
@@ -4039,6 +4039,14 @@
}
return Execution::CharAt(string, 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,
=======================================
--- /branches/bleeding_edge/src/runtime.h Thu Apr 18 01:14:59 2013
+++ /branches/bleeding_edge/src/runtime.h Fri Apr 19 01:30:49 2013
@@ -694,6 +694,11 @@
Handle<Object>
object,
uint32_t index);
+ MUST_USE_RESULT static MaybeObject* GetElementOrCharAtOrFail(
+ Isolate* isolate,
+ Handle<Object> object,
+ uint32_t index);
+
MUST_USE_RESULT static MaybeObject* SetObjectProperty(
Isolate* isolate,
Handle<Object> object,
--
--
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.
