| Index: src/stub-cache.h
|
| diff --git a/src/stub-cache.h b/src/stub-cache.h
|
| index ebf0bd3c917b5e06ba80f0a4bedb5bd1703def23..c153723ab26189fa0fe1fab53d80151f31300422 100644
|
| --- a/src/stub-cache.h
|
| +++ b/src/stub-cache.h
|
| @@ -92,11 +92,11 @@ class StubCache {
|
| InlineCacheHolderFlag cache_holder = OWN_MAP);
|
|
|
| Handle<Code> ComputeMonomorphicIC(Handle<Name> name,
|
| - Handle<Type> type,
|
| + Handle<HeapType> type,
|
| Handle<Code> handler,
|
| ExtraICState extra_ic_state);
|
|
|
| - Handle<Code> ComputeLoadNonexistent(Handle<Name> name, Handle<Type> type);
|
| + Handle<Code> ComputeLoadNonexistent(Handle<Name> name, Handle<HeapType> type);
|
|
|
| Handle<Code> ComputeKeyedLoadElement(Handle<Map> receiver_map);
|
|
|
| @@ -461,7 +461,7 @@ class StubCompiler BASE_EMBEDDED {
|
| // The function can optionally (when save_at_depth !=
|
| // kInvalidProtoDepth) save the object at the given depth by moving
|
| // it to [esp + kPointerSize].
|
| - Register CheckPrototypes(Handle<Type> type,
|
| + Register CheckPrototypes(Handle<HeapType> type,
|
| Register object_reg,
|
| Handle<JSObject> holder,
|
| Register holder_reg,
|
| @@ -474,7 +474,7 @@ class StubCompiler BASE_EMBEDDED {
|
| scratch2, name, kInvalidProtoDepth, miss, check);
|
| }
|
|
|
| - Register CheckPrototypes(Handle<Type> type,
|
| + Register CheckPrototypes(Handle<HeapType> type,
|
| Register object_reg,
|
| Handle<JSObject> holder,
|
| Register holder_reg,
|
| @@ -530,7 +530,7 @@ class BaseLoadStoreStubCompiler: public StubCompiler {
|
| }
|
| virtual ~BaseLoadStoreStubCompiler() { }
|
|
|
| - Handle<Code> CompileMonomorphicIC(Handle<Type> type,
|
| + Handle<Code> CompileMonomorphicIC(Handle<HeapType> type,
|
| Handle<Code> handler,
|
| Handle<Name> name);
|
|
|
| @@ -556,7 +556,7 @@ class BaseLoadStoreStubCompiler: public StubCompiler {
|
| }
|
|
|
| protected:
|
| - virtual Register HandlerFrontendHeader(Handle<Type> type,
|
| + virtual Register HandlerFrontendHeader(Handle<HeapType> type,
|
| Register object_reg,
|
| Handle<JSObject> holder,
|
| Handle<Name> name,
|
| @@ -564,7 +564,7 @@ class BaseLoadStoreStubCompiler: public StubCompiler {
|
|
|
| virtual void HandlerFrontendFooter(Handle<Name> name, Label* miss) = 0;
|
|
|
| - Register HandlerFrontend(Handle<Type> type,
|
| + Register HandlerFrontend(Handle<HeapType> type,
|
| Register object_reg,
|
| Handle<JSObject> holder,
|
| Handle<Name> name);
|
| @@ -623,32 +623,32 @@ class LoadStubCompiler: public BaseLoadStoreStubCompiler {
|
| cache_holder) { }
|
| virtual ~LoadStubCompiler() { }
|
|
|
| - Handle<Code> CompileLoadField(Handle<Type> type,
|
| + Handle<Code> CompileLoadField(Handle<HeapType> type,
|
| Handle<JSObject> holder,
|
| Handle<Name> name,
|
| PropertyIndex index,
|
| Representation representation);
|
|
|
| - Handle<Code> CompileLoadCallback(Handle<Type> type,
|
| + Handle<Code> CompileLoadCallback(Handle<HeapType> type,
|
| Handle<JSObject> holder,
|
| Handle<Name> name,
|
| Handle<ExecutableAccessorInfo> callback);
|
|
|
| - Handle<Code> CompileLoadCallback(Handle<Type> type,
|
| + Handle<Code> CompileLoadCallback(Handle<HeapType> type,
|
| Handle<JSObject> holder,
|
| Handle<Name> name,
|
| const CallOptimization& call_optimization);
|
|
|
| - Handle<Code> CompileLoadConstant(Handle<Type> type,
|
| + Handle<Code> CompileLoadConstant(Handle<HeapType> type,
|
| Handle<JSObject> holder,
|
| Handle<Name> name,
|
| Handle<Object> value);
|
|
|
| - Handle<Code> CompileLoadInterceptor(Handle<Type> type,
|
| + Handle<Code> CompileLoadInterceptor(Handle<HeapType> type,
|
| Handle<JSObject> holder,
|
| Handle<Name> name);
|
|
|
| - Handle<Code> CompileLoadViaGetter(Handle<Type> type,
|
| + Handle<Code> CompileLoadViaGetter(Handle<HeapType> type,
|
| Handle<JSObject> holder,
|
| Handle<Name> name,
|
| Handle<JSFunction> getter);
|
| @@ -657,11 +657,11 @@ class LoadStubCompiler: public BaseLoadStoreStubCompiler {
|
| Register receiver,
|
| Handle<JSFunction> getter);
|
|
|
| - Handle<Code> CompileLoadNonexistent(Handle<Type> type,
|
| + Handle<Code> CompileLoadNonexistent(Handle<HeapType> type,
|
| Handle<JSObject> last,
|
| Handle<Name> name);
|
|
|
| - Handle<Code> CompileLoadGlobal(Handle<Type> type,
|
| + Handle<Code> CompileLoadGlobal(Handle<HeapType> type,
|
| Handle<GlobalObject> holder,
|
| Handle<PropertyCell> cell,
|
| Handle<Name> name,
|
| @@ -670,7 +670,7 @@ class LoadStubCompiler: public BaseLoadStoreStubCompiler {
|
| static Register* registers();
|
|
|
| protected:
|
| - virtual Register HandlerFrontendHeader(Handle<Type> type,
|
| + virtual Register HandlerFrontendHeader(Handle<HeapType> type,
|
| Register object_reg,
|
| Handle<JSObject> holder,
|
| Handle<Name> name,
|
| @@ -678,12 +678,12 @@ class LoadStubCompiler: public BaseLoadStoreStubCompiler {
|
|
|
| virtual void HandlerFrontendFooter(Handle<Name> name, Label* miss);
|
|
|
| - Register CallbackHandlerFrontend(Handle<Type> type,
|
| + Register CallbackHandlerFrontend(Handle<HeapType> type,
|
| Register object_reg,
|
| Handle<JSObject> holder,
|
| Handle<Name> name,
|
| Handle<Object> callback);
|
| - void NonexistentHandlerFrontend(Handle<Type> type,
|
| + void NonexistentHandlerFrontend(Handle<HeapType> type,
|
| Handle<JSObject> last,
|
| Handle<Name> name);
|
|
|
| @@ -819,7 +819,7 @@ class StoreStubCompiler: public BaseLoadStoreStubCompiler {
|
| }
|
|
|
| protected:
|
| - virtual Register HandlerFrontendHeader(Handle<Type> type,
|
| + virtual Register HandlerFrontendHeader(Handle<HeapType> type,
|
| Register object_reg,
|
| Handle<JSObject> holder,
|
| Handle<Name> name,
|
|
|