Merge V8 5.2.361.47 DO NOT MERGE
https://chromium.googlesource.com/v8/v8/+/5.2.361.47
FPIIM-449
Change-Id: Ibec421b85a9b88cb3a432ada642e469fe7e78346
(cherry picked from commit bcf72ee8e3b26f1d0726869c7ddb3921c68b09a8)
diff --git a/src/ic/arm64/stub-cache-arm64.cc b/src/ic/arm64/stub-cache-arm64.cc
index eb82f2a..8d378ce 100644
--- a/src/ic/arm64/stub-cache-arm64.cc
+++ b/src/ic/arm64/stub-cache-arm64.cc
@@ -23,10 +23,9 @@
//
// 'receiver', 'name' and 'offset' registers are preserved on miss.
static void ProbeTable(Isolate* isolate, MacroAssembler* masm,
- Code::Kind ic_kind, Code::Flags flags,
- StubCache::Table table, Register receiver, Register name,
- Register offset, Register scratch, Register scratch2,
- Register scratch3) {
+ Code::Flags flags, StubCache::Table table,
+ Register receiver, Register name, Register offset,
+ Register scratch, Register scratch2, Register scratch3) {
// Some code below relies on the fact that the Entry struct contains
// 3 pointers (name, code, map).
STATIC_ASSERT(sizeof(StubCache::Entry) == (3 * kPointerSize));
@@ -95,9 +94,6 @@
Isolate* isolate = masm->isolate();
Label miss;
- // Make sure the flags does not name a specific type.
- DCHECK(Code::ExtractTypeFromFlags(flags) == 0);
-
// Make sure that there are no register conflicts.
DCHECK(!AreAliased(receiver, name, scratch, extra, extra2, extra3));
@@ -140,8 +136,8 @@
CountTrailingZeros(kPrimaryTableSize, 64));
// Probe the primary table.
- ProbeTable(isolate, masm, ic_kind, flags, kPrimary, receiver, name, scratch,
- extra, extra2, extra3);
+ ProbeTable(isolate, masm, flags, kPrimary, receiver, name, scratch, extra,
+ extra2, extra3);
// Primary miss: Compute hash for secondary table.
__ Sub(scratch, scratch, Operand(name, LSR, kCacheIndexShift));
@@ -149,8 +145,8 @@
__ And(scratch, scratch, kSecondaryTableSize - 1);
// Probe the secondary table.
- ProbeTable(isolate, masm, ic_kind, flags, kSecondary, receiver, name, scratch,
- extra, extra2, extra3);
+ ProbeTable(isolate, masm, flags, kSecondary, receiver, name, scratch, extra,
+ extra2, extra3);
// Cache miss: Fall-through and let caller handle the miss by
// entering the runtime system.