Reviewers: Weiliang, Toon Verwaest,

Message:
weiliang.
please review this patch.
thanks.

Description:
X87: Clean up name distinction between Keyed ICs and Element Handlers

port r22679.

original commit message:

  Clean up name distinction between Keyed ICs and Element Handlers

BUG=

Please review this at https://codereview.chromium.org/426083006/

SVN Base: https://chromium.googlesource.com/external/v8.git@bleeding_edge

Affected files (+7, -8 lines):
  M src/x87/ic-x87.cc
  M src/x87/macro-assembler-x87.cc
  M src/x87/stub-cache-x87.cc


Index: src/x87/ic-x87.cc
diff --git a/src/x87/ic-x87.cc b/src/x87/ic-x87.cc
index c577efb5ded74da055c4384da480e99b6a8dce28..badd007dca6cb23a906200c9f288ac9aed51a087 100644
--- a/src/x87/ic-x87.cc
+++ b/src/x87/ic-x87.cc
@@ -579,9 +579,8 @@ void KeyedLoadIC::GenerateIndexedInterceptor(MacroAssembler* masm) {
   __ push(scratch);   // return address

   // Perform tail call to the entry.
-  ExternalReference ref =
-      ExternalReference(IC_Utility(kKeyedLoadPropertyWithInterceptor),
-                        masm->isolate());
+  ExternalReference ref = ExternalReference(
+      IC_Utility(kLoadElementWithInterceptor), masm->isolate());
   __ TailCallExternalReference(ref, 2, 1);

   __ bind(&slow);
Index: src/x87/macro-assembler-x87.cc
diff --git a/src/x87/macro-assembler-x87.cc b/src/x87/macro-assembler-x87.cc
index 3841d354a0b3f5e20fedd2ee0c3c739899fa028e..df2819e1e7152a593adc5ab14c4ae2bf1f7fb1fa 100644
--- a/src/x87/macro-assembler-x87.cc
+++ b/src/x87/macro-assembler-x87.cc
@@ -1173,7 +1173,7 @@ void MacroAssembler::CheckAccessGlobalProxy(Register holder_reg,


// Compute the hash code from the untagged key. This must be kept in sync with
-// ComputeIntegerHash in utils.h and KeyedLoadGenericElementStub in
+// ComputeIntegerHash in utils.h and KeyedLoadGenericStub in
 // code-stub-hydrogen.cc
 //
 // Note: r0 will contain hash code
Index: src/x87/stub-cache-x87.cc
diff --git a/src/x87/stub-cache-x87.cc b/src/x87/stub-cache-x87.cc
index a91b5eab1a38f36e82372312dccc2532a02a2928..6a4e5be653fe661b1a0b0f3ab1de94f6e34e7c8f 100644
--- a/src/x87/stub-cache-x87.cc
+++ b/src/x87/stub-cache-x87.cc
@@ -1122,8 +1122,8 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreInterceptor(
   __ push(scratch1());  // restore return address

   // Do tail-call to the runtime system.
-  ExternalReference store_ic_property =
- ExternalReference(IC_Utility(IC::kStoreInterceptorProperty), isolate());
+  ExternalReference store_ic_property = ExternalReference(
+      IC_Utility(IC::kStorePropertyWithInterceptor), isolate());
   __ TailCallExternalReference(store_ic_property, 3, 1);

   // Return the generated code.
@@ -1145,7 +1145,7 @@ void NamedStoreHandlerCompiler::GenerateStoreArrayLength() {
 }


-Handle<Code> PropertyICCompiler::CompileIndexedStorePolymorphic(
+Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
     MapHandleList* receiver_maps, CodeHandleList* handler_stubs,
     MapHandleList* transitioned_maps) {
   Label miss;
@@ -1343,7 +1343,7 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types,
 #define __ ACCESS_MASM(masm)


-void IndexedHandlerCompiler::GenerateLoadDictionaryElement(
+void ElementHandlerCompiler::GenerateLoadDictionaryElement(
     MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- ecx    : key


--
--
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/d/optout.

Reply via email to