Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Unified Diff: src/x64/lithium-codegen-x64.cc

Issue 1081883002: Remove unnecessary options from HTailCallThroughMegamorphicCache (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Ports. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/mips64/lithium-mips64.cc ('k') | src/x64/lithium-x64.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/x64/lithium-codegen-x64.cc
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
index 3b72d690fe514c17d17d939b3ad3b13d24748b86..245ca5ce96c1ac382f8098e645560dae9e306d0f 100644
--- a/src/x64/lithium-codegen-x64.cc
+++ b/src/x64/lithium-codegen-x64.cc
@@ -3553,28 +3553,13 @@ void LCodeGen::DoTailCallThroughMegamorphicCache(
DCHECK(name.is(LoadDescriptor::NameRegister()));
Register scratch = rdi;
DCHECK(!scratch.is(receiver) && !scratch.is(name));
- DCHECK(!FLAG_vector_ics ||
- !AreAliased(ToRegister(instr->slot()), ToRegister(instr->vector()),
- scratch));
- // Important for the tail-call.
- bool must_teardown_frame = NeedsEagerFrame();
+ // The probe will tail call to a handler if found.
+ isolate()->stub_cache()->GenerateProbe(masm(), Code::LOAD_IC,
+ instr->hydrogen()->flags(), false,
+ receiver, name, scratch, no_reg);
- if (!instr->hydrogen()->is_just_miss()) {
- // The probe will tail call to a handler if found.
- DCHECK(!instr->hydrogen()->is_keyed_load());
- isolate()->stub_cache()->GenerateProbe(
- masm(), Code::LOAD_IC, instr->hydrogen()->flags(), must_teardown_frame,
- receiver, name, scratch, no_reg);
- }
-
- // Tail call to miss if we ended up here.
- if (must_teardown_frame) __ leave();
- if (instr->hydrogen()->is_keyed_load()) {
- KeyedLoadIC::GenerateMiss(masm());
- } else {
- LoadIC::GenerateMiss(masm());
- }
+ LoadIC::GenerateMiss(masm());
}
« no previous file with comments | « src/mips64/lithium-mips64.cc ('k') | src/x64/lithium-x64.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698