PPC: Eliminate redundant descriptor ElementTransitionAndStoreDescriptor.

Port 26ffee2c718308bb85be072ed32479e4aa8e7e6b

Original commit message:
    It's just the same as StoreTransitionDescriptor.

R=mvstanton@chromium.org, dstence@us.ibm.com, michael_dawson@ca.ibm.com
BUG=

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

Cr-Commit-Position: refs/heads/master@{#29819}

diff --git a/src/ic/ppc/access-compiler-ppc.cc b/src/ic/ppc/access-compiler-ppc.cc
index aa3859a62c74c3ef6aaeef21a95bd8c20abba7c9..33077403056edead82bcfd9580b1dbdcab85a777 100644 (file)
--- a/src/ic/ppc/access-compiler-ppc.cc
+++ b/src/ic/ppc/access-compiler-ppc.cc
@@ -33,7 +33,7 @@ Register* PropertyAccessCompiler::store_calling_convention() {
   // receiver, name, scratch1, scratch2, scratch3.
   Register receiver = StoreDescriptor::ReceiverRegister();
   Register name = StoreDescriptor::NameRegister();
-  DCHECK(r6.is(ElementTransitionAndStoreDescriptor::MapRegister()));
+  DCHECK(r6.is(StoreTransitionDescriptor::MapRegister()));
   static Register registers[] = {receiver, name, r6, r7, r8};
   return registers;
 }

diff --git a/src/ic/ppc/ic-compiler-ppc.cc b/src/ic/ppc/ic-compiler-ppc.cc
index ad72c231de9c9a1fa9b3f7aa21e70657d5868dee..80881b931ed348df43c59517411a6680d350139b 100644 (file)
--- a/src/ic/ppc/ic-compiler-ppc.cc
+++ b/src/ic/ppc/ic-compiler-ppc.cc
@@ -63,7 +63,7 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(MapHandleList* maps,
   // Polymorphic keyed stores may use the map register
   Register map_reg = scratch1();
   DCHECK(kind() != Code::KEYED_STORE_IC ||
-         map_reg.is(ElementTransitionAndStoreDescriptor::MapRegister()));
+         map_reg.is(StoreTransitionDescriptor::MapRegister()));
 
   int receiver_count = maps->length();
   int number_of_handled_maps = 0;

diff --git a/src/ppc/interface-descriptors-ppc.cc b/src/ppc/interface-descriptors-ppc.cc
index 9bcbf9cfccb370b7ade194ebf2df6ef7894e431c..dbf715180a4b1b1c4731e663a5c3fae6ff38a4fa 100644 (file)
--- a/src/ppc/interface-descriptors-ppc.cc
+++ b/src/ppc/interface-descriptors-ppc.cc
@@ -47,9 +47,6 @@ const Register StoreGlobalViaContextDescriptor::NameRegister() { return r6; }
 const Register StoreGlobalViaContextDescriptor::ValueRegister() { return r3; }
 
 
-const Register ElementTransitionAndStoreDescriptor::MapRegister() { return r6; }
-
-
 const Register InstanceofDescriptor::left() { return r3; }
 const Register InstanceofDescriptor::right() { return r4; }