Revert of [ic] [stubs] Don't use Code::flags in megamorphic stub cache hash computations.

src/ic/s390/stub-cache-s390.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_S390
 
 #include "src/ic/stub-cache.h"
 #include "src/codegen.h"
 #include "src/ic/ic.h"
 #include "src/interface-descriptors.h"
 
 namespace v8 {
 namespace internal {
 
 #define __ ACCESS_MASM(masm)
 
 static void ProbeTable(StubCache* stub_cache, MacroAssembler* masm,
-                       StubCache::Table table, Register receiver, Register name,
+                       Code::Flags flags, StubCache::Table table,
+                       Register receiver, Register name,
                        // Number of the cache entry, not scaled.
                        Register offset, Register scratch, Register scratch2,
                        Register offset_scratch) {
   ExternalReference key_offset(stub_cache->key_reference(table));
   ExternalReference value_offset(stub_cache->value_reference(table));
   ExternalReference map_offset(stub_cache->map_reference(table));
 
   uintptr_t key_off_addr = reinterpret_cast<uintptr_t>(key_offset.address());
   uintptr_t value_off_addr =
       reinterpret_cast<uintptr_t>(value_offset.address());
@@ skipping 33 matching lines @@
   // Check the map matches.
   __ LoadP(ip, MemOperand(base_addr, map_off_addr - key_off_addr));
   __ CmpP(ip, FieldMemOperand(receiver, HeapObject::kMapOffset));
   __ bne(&miss, Label::kNear);
 
   // Get the code entry from the cache.
   Register code = scratch2;
   scratch2 = no_reg;
   __ LoadP(code, MemOperand(base_addr, value_off_addr - key_off_addr));
 
-#ifdef DEBUG
   // Check that the flags match what we're looking for.
-  Code::Flags flags = Code::RemoveHolderFromFlags(
-      Code::ComputeHandlerFlags(stub_cache->ic_kind()));
   Register flags_reg = base_addr;
   base_addr = no_reg;
   __ LoadlW(flags_reg, FieldMemOperand(code, Code::kFlagsOffset));
 
   DCHECK(!r0.is(flags_reg));
   __ AndP(flags_reg, flags_reg, Operand(~Code::kFlagsNotUsedInLookup));
   __ CmpLogicalP(flags_reg, Operand(flags));
-  __ Check(eq, kUnexpectedValue);
+  __ bne(&miss, Label::kNear);
 
+#ifdef DEBUG
   if (FLAG_test_secondary_stub_cache && table == StubCache::kPrimary) {
     __ b(&miss, Label::kNear);
   } else if (FLAG_test_primary_stub_cache && table == StubCache::kSecondary) {
     __ b(&miss, Label::kNear);
   }
 #endif
 
   // Jump to the first instruction in the code stub.
   // TODO(joransiu): Combine into indirect branch
   __ la(code, MemOperand(code, Code::kHeaderSize - kHeapObjectTag));
   __ b(code);
 
   // Miss: fall through.
   __ bind(&miss);
 }
 
 void StubCache::GenerateProbe(MacroAssembler* masm, Register receiver,
                               Register name, Register scratch, Register extra,
                               Register extra2, Register extra3) {
+  Code::Flags flags =
+      Code::RemoveHolderFromFlags(Code::ComputeHandlerFlags(ic_kind_));
+
   Label miss;
 
 #if V8_TARGET_ARCH_S390X
   // Make sure that code is valid. The multiplying code relies on the
   // entry size being 24.
   DCHECK(sizeof(Entry) == 24);
 #else
   // Make sure that code is valid. The multiplying code relies on the
   // entry size being 12.
   DCHECK(sizeof(Entry) == 12);
@@ skipping 30 matching lines @@
   __ IncrementCounter(counters->megamorphic_stub_cache_probes(), 1, extra2,
                       extra3);
 
   // Check that the receiver isn't a smi.
   __ JumpIfSmi(receiver, &miss);
 
   // Get the map of the receiver and compute the hash.
   __ LoadlW(scratch, FieldMemOperand(name, Name::kHashFieldOffset));
   __ LoadP(ip, FieldMemOperand(receiver, HeapObject::kMapOffset));
   __ AddP(scratch, scratch, ip);
+  __ XorP(scratch, scratch, Operand(flags));
   // The mask omits the last two bits because they are not part of the hash.
   __ AndP(scratch, scratch,
           Operand((kPrimaryTableSize - 1) << kCacheIndexShift));
 
   // Probe the primary table.
-  ProbeTable(this, masm, kPrimary, receiver, name, scratch, extra, extra2,
-             extra3);
+  ProbeTable(this, masm, flags, kPrimary, receiver, name, scratch, extra,
+             extra2, extra3);
 
   // Primary miss: Compute hash for secondary probe.
   __ SubP(scratch, scratch, name);
+  __ AddP(scratch, scratch, Operand(flags));
   __ AndP(scratch, scratch,
           Operand((kSecondaryTableSize - 1) << kCacheIndexShift));
 
   // Probe the secondary table.
-  ProbeTable(this, masm, kSecondary, receiver, name, scratch, extra, extra2,
-             extra3);
+  ProbeTable(this, masm, flags, kSecondary, receiver, name, scratch, extra,
+             extra2, extra3);
 
   // Cache miss: Fall-through and let caller handle the miss by
   // entering the runtime system.
   __ bind(&miss);
   __ IncrementCounter(counters->megamorphic_stub_cache_misses(), 1, extra2,
                       extra3);
 }
 
 #undef __
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390