Follow on to r1368: Remove unnecessary HandleScope in the StubCompilers.
Review URL: http://codereview.chromium.org/27156 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1373 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
e3c0ae62af
commit
c81043b259
@ -466,8 +466,6 @@ Object* StubCompiler::CompileLazyCompile(Code::Flags flags) {
|
|||||||
// -- lr: return address
|
// -- lr: return address
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
|
|
||||||
// Enter an internal frame.
|
// Enter an internal frame.
|
||||||
__ EnterInternalFrame();
|
__ EnterInternalFrame();
|
||||||
|
|
||||||
@ -500,8 +498,6 @@ Object* CallStubCompiler::CompileCallField(Object* object,
|
|||||||
// ----------- S t a t e -------------
|
// ----------- S t a t e -------------
|
||||||
// -- lr: return address
|
// -- lr: return address
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
const int argc = arguments().immediate();
|
const int argc = arguments().immediate();
|
||||||
@ -553,8 +549,6 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
|
|||||||
// ----------- S t a t e -------------
|
// ----------- S t a t e -------------
|
||||||
// -- lr: return address
|
// -- lr: return address
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Get the receiver from the stack
|
// Get the receiver from the stack
|
||||||
@ -675,8 +669,6 @@ Object* CallStubCompiler::CompileCallInterceptor(Object* object,
|
|||||||
// ----------- S t a t e -------------
|
// ----------- S t a t e -------------
|
||||||
// -- lr: return address
|
// -- lr: return address
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// TODO(1224669): Implement.
|
// TODO(1224669): Implement.
|
||||||
@ -701,8 +693,6 @@ Object* StoreStubCompiler::CompileStoreField(JSObject* object,
|
|||||||
// -- lr : return address
|
// -- lr : return address
|
||||||
// -- [sp] : receiver
|
// -- [sp] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Get the receiver from the stack.
|
// Get the receiver from the stack.
|
||||||
@ -735,8 +725,6 @@ Object* StoreStubCompiler::CompileStoreCallback(JSObject* object,
|
|||||||
// -- lr : return address
|
// -- lr : return address
|
||||||
// -- [sp] : receiver
|
// -- [sp] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Get the object from the stack.
|
// Get the object from the stack.
|
||||||
@ -791,8 +779,6 @@ Object* StoreStubCompiler::CompileStoreInterceptor(JSObject* receiver,
|
|||||||
// -- lr : return address
|
// -- lr : return address
|
||||||
// -- [sp] : receiver
|
// -- [sp] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Get the object from the stack.
|
// Get the object from the stack.
|
||||||
@ -845,8 +831,6 @@ Object* LoadStubCompiler::CompileLoadField(JSObject* object,
|
|||||||
// -- lr : return address
|
// -- lr : return address
|
||||||
// -- [sp] : receiver
|
// -- [sp] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ ldr(r0, MemOperand(sp, 0));
|
__ ldr(r0, MemOperand(sp, 0));
|
||||||
@ -868,8 +852,6 @@ Object* LoadStubCompiler::CompileLoadCallback(JSObject* object,
|
|||||||
// -- lr : return address
|
// -- lr : return address
|
||||||
// -- [sp] : receiver
|
// -- [sp] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ ldr(r0, MemOperand(sp, 0));
|
__ ldr(r0, MemOperand(sp, 0));
|
||||||
@ -890,8 +872,6 @@ Object* LoadStubCompiler::CompileLoadConstant(JSObject* object,
|
|||||||
// -- lr : return address
|
// -- lr : return address
|
||||||
// -- [sp] : receiver
|
// -- [sp] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ ldr(r0, MemOperand(sp, 0));
|
__ ldr(r0, MemOperand(sp, 0));
|
||||||
@ -913,8 +893,6 @@ Object* LoadStubCompiler::CompileLoadInterceptor(JSObject* object,
|
|||||||
// -- lr : return address
|
// -- lr : return address
|
||||||
// -- [sp] : receiver
|
// -- [sp] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ ldr(r0, MemOperand(sp, 0));
|
__ ldr(r0, MemOperand(sp, 0));
|
||||||
@ -939,7 +917,6 @@ Object* KeyedLoadStubCompiler::CompileLoadField(String* name,
|
|||||||
// -- sp[0] : key
|
// -- sp[0] : key
|
||||||
// -- sp[4] : receiver
|
// -- sp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ ldr(r2, MemOperand(sp, 0));
|
__ ldr(r2, MemOperand(sp, 0));
|
||||||
@ -965,7 +942,6 @@ Object* KeyedLoadStubCompiler::CompileLoadCallback(String* name,
|
|||||||
// -- sp[0] : key
|
// -- sp[0] : key
|
||||||
// -- sp[4] : receiver
|
// -- sp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ ldr(r2, MemOperand(sp, 0));
|
__ ldr(r2, MemOperand(sp, 0));
|
||||||
@ -992,7 +968,6 @@ Object* KeyedLoadStubCompiler::CompileLoadConstant(String* name,
|
|||||||
// -- sp[0] : key
|
// -- sp[0] : key
|
||||||
// -- sp[4] : receiver
|
// -- sp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Check the key is the cached one
|
// Check the key is the cached one
|
||||||
@ -1019,7 +994,6 @@ Object* KeyedLoadStubCompiler::CompileLoadInterceptor(JSObject* receiver,
|
|||||||
// -- sp[0] : key
|
// -- sp[0] : key
|
||||||
// -- sp[4] : receiver
|
// -- sp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Check the key is the cached one
|
// Check the key is the cached one
|
||||||
@ -1043,7 +1017,6 @@ Object* KeyedLoadStubCompiler::CompileLoadArrayLength(String* name) {
|
|||||||
// -- sp[0] : key
|
// -- sp[0] : key
|
||||||
// -- sp[4] : receiver
|
// -- sp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Check the key is the cached one
|
// Check the key is the cached one
|
||||||
@ -1067,8 +1040,6 @@ Object* KeyedLoadStubCompiler::CompileLoadStringLength(String* name) {
|
|||||||
// -- sp[0] : key
|
// -- sp[0] : key
|
||||||
// -- sp[4] : receiver
|
// -- sp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
|
|
||||||
Label miss;
|
Label miss;
|
||||||
__ IncrementCounter(&Counters::keyed_load_string_length, 1, r1, r3);
|
__ IncrementCounter(&Counters::keyed_load_string_length, 1, r1, r3);
|
||||||
|
|
||||||
@ -1095,7 +1066,6 @@ Object* KeyedLoadStubCompiler::CompileLoadFunctionPrototype(String* name) {
|
|||||||
// -- sp[0] : key
|
// -- sp[0] : key
|
||||||
// -- sp[4] : receiver
|
// -- sp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
GenerateLoadMiss(masm(), Code::KEYED_LOAD_IC);
|
GenerateLoadMiss(masm(), Code::KEYED_LOAD_IC);
|
||||||
|
|
||||||
return GetCode(CALLBACKS);
|
return GetCode(CALLBACKS);
|
||||||
@ -1112,7 +1082,6 @@ Object* KeyedStoreStubCompiler::CompileStoreField(JSObject* object,
|
|||||||
// -- lr : return address
|
// -- lr : return address
|
||||||
// -- [sp] : receiver
|
// -- [sp] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ IncrementCounter(&Counters::keyed_store_field, 1, r1, r3);
|
__ IncrementCounter(&Counters::keyed_store_field, 1, r1, r3);
|
||||||
|
@ -448,8 +448,6 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm,
|
|||||||
// TODO(1241006): Avoid having lazy compile stubs specialized by the
|
// TODO(1241006): Avoid having lazy compile stubs specialized by the
|
||||||
// number of arguments. It is not needed anymore.
|
// number of arguments. It is not needed anymore.
|
||||||
Object* StubCompiler::CompileLazyCompile(Code::Flags flags) {
|
Object* StubCompiler::CompileLazyCompile(Code::Flags flags) {
|
||||||
HandleScope scope;
|
|
||||||
|
|
||||||
// Enter an internal frame.
|
// Enter an internal frame.
|
||||||
__ EnterInternalFrame();
|
__ EnterInternalFrame();
|
||||||
|
|
||||||
@ -476,8 +474,6 @@ Object* CallStubCompiler::CompileCallField(Object* object,
|
|||||||
int index) {
|
int index) {
|
||||||
// ----------- S t a t e -------------
|
// ----------- S t a t e -------------
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Get the receiver from the stack.
|
// Get the receiver from the stack.
|
||||||
@ -528,8 +524,6 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
|
|||||||
CheckType check) {
|
CheckType check) {
|
||||||
// ----------- S t a t e -------------
|
// ----------- S t a t e -------------
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Get the receiver from the stack.
|
// Get the receiver from the stack.
|
||||||
@ -649,8 +643,6 @@ Object* CallStubCompiler::CompileCallInterceptor(Object* object,
|
|||||||
String* name) {
|
String* name) {
|
||||||
// ----------- S t a t e -------------
|
// ----------- S t a t e -------------
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Get the number of arguments.
|
// Get the number of arguments.
|
||||||
@ -729,8 +721,6 @@ Object* StoreStubCompiler::CompileStoreField(JSObject* object,
|
|||||||
// -- esp[0] : return address
|
// -- esp[0] : return address
|
||||||
// -- esp[4] : receiver
|
// -- esp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Get the object from the stack.
|
// Get the object from the stack.
|
||||||
@ -765,8 +755,6 @@ Object* StoreStubCompiler::CompileStoreCallback(JSObject* object,
|
|||||||
// -- esp[0] : return address
|
// -- esp[0] : return address
|
||||||
// -- esp[4] : receiver
|
// -- esp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Get the object from the stack.
|
// Get the object from the stack.
|
||||||
@ -821,8 +809,6 @@ Object* StoreStubCompiler::CompileStoreInterceptor(JSObject* receiver,
|
|||||||
// -- esp[0] : return address
|
// -- esp[0] : return address
|
||||||
// -- esp[4] : receiver
|
// -- esp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
// Get the object from the stack.
|
// Get the object from the stack.
|
||||||
@ -878,7 +864,6 @@ Object* KeyedStoreStubCompiler::CompileStoreField(JSObject* object,
|
|||||||
// -- esp[4] : key
|
// -- esp[4] : key
|
||||||
// -- esp[8] : receiver
|
// -- esp[8] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ IncrementCounter(&Counters::keyed_store_field, 1);
|
__ IncrementCounter(&Counters::keyed_store_field, 1);
|
||||||
@ -920,8 +905,6 @@ Object* LoadStubCompiler::CompileLoadField(JSObject* object,
|
|||||||
// -- esp[0] : return address
|
// -- esp[0] : return address
|
||||||
// -- esp[4] : receiver
|
// -- esp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
@ -942,8 +925,6 @@ Object* LoadStubCompiler::CompileLoadCallback(JSObject* object,
|
|||||||
// -- esp[0] : return address
|
// -- esp[0] : return address
|
||||||
// -- esp[4] : receiver
|
// -- esp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
@ -965,8 +946,6 @@ Object* LoadStubCompiler::CompileLoadConstant(JSObject* object,
|
|||||||
// -- esp[0] : return address
|
// -- esp[0] : return address
|
||||||
// -- esp[4] : receiver
|
// -- esp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
|
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
@ -987,7 +966,6 @@ Object* LoadStubCompiler::CompileLoadInterceptor(JSObject* receiver,
|
|||||||
// -- esp[0] : return address
|
// -- esp[0] : return address
|
||||||
// -- esp[4] : receiver
|
// -- esp[4] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
@ -1009,7 +987,6 @@ Object* KeyedLoadStubCompiler::CompileLoadField(String* name,
|
|||||||
// -- esp[4] : name
|
// -- esp[4] : name
|
||||||
// -- esp[8] : receiver
|
// -- esp[8] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
@ -1039,7 +1016,6 @@ Object* KeyedLoadStubCompiler::CompileLoadCallback(String* name,
|
|||||||
// -- esp[4] : name
|
// -- esp[4] : name
|
||||||
// -- esp[8] : receiver
|
// -- esp[8] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
@ -1070,7 +1046,6 @@ Object* KeyedLoadStubCompiler::CompileLoadConstant(String* name,
|
|||||||
// -- esp[4] : name
|
// -- esp[4] : name
|
||||||
// -- esp[8] : receiver
|
// -- esp[8] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
@ -1099,7 +1074,6 @@ Object* KeyedLoadStubCompiler::CompileLoadInterceptor(JSObject* receiver,
|
|||||||
// -- esp[4] : name
|
// -- esp[4] : name
|
||||||
// -- esp[8] : receiver
|
// -- esp[8] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
@ -1128,7 +1102,6 @@ Object* KeyedLoadStubCompiler::CompileLoadArrayLength(String* name) {
|
|||||||
// -- esp[4] : name
|
// -- esp[4] : name
|
||||||
// -- esp[8] : receiver
|
// -- esp[8] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
@ -1155,7 +1128,6 @@ Object* KeyedLoadStubCompiler::CompileLoadStringLength(String* name) {
|
|||||||
// -- esp[4] : name
|
// -- esp[4] : name
|
||||||
// -- esp[8] : receiver
|
// -- esp[8] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
@ -1182,7 +1154,6 @@ Object* KeyedLoadStubCompiler::CompileLoadFunctionPrototype(String* name) {
|
|||||||
// -- esp[4] : name
|
// -- esp[4] : name
|
||||||
// -- esp[8] : receiver
|
// -- esp[8] : receiver
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
HandleScope scope;
|
|
||||||
Label miss;
|
Label miss;
|
||||||
|
|
||||||
__ mov(eax, (Operand(esp, kPointerSize)));
|
__ mov(eax, (Operand(esp, kPointerSize)));
|
||||||
|
Loading…
Reference in New Issue
Block a user