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

Unified Diff: src/ia32/lithium-codegen-ia32.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/hydrogen-instructions.h ('k') | src/ia32/lithium-ia32.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ia32/lithium-codegen-ia32.cc
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
index 72bb270e7a6fcfe384da3579b12a989e721b9cd2..6d26fde2708e584ef4aa9f81e0a6fec084316964 100644
--- a/src/ia32/lithium-codegen-ia32.cc
+++ b/src/ia32/lithium-codegen-ia32.cc
@@ -3473,44 +3473,18 @@ void LCodeGen::DoTailCallThroughMegamorphicCache(
Register name = ToRegister(instr->name());
DCHECK(receiver.is(LoadDescriptor::ReceiverRegister()));
DCHECK(name.is(LoadDescriptor::NameRegister()));
- Register slot = FLAG_vector_ics ? ToRegister(instr->slot()) : no_reg;
- Register vector = FLAG_vector_ics ? ToRegister(instr->vector()) : no_reg;
-
Register scratch = ebx;
Register extra = edi;
- DCHECK(!extra.is(slot) && !extra.is(vector));
DCHECK(!scratch.is(receiver) && !scratch.is(name));
DCHECK(!extra.is(receiver) && !extra.is(name));
- // Important for the tail-call.
- bool must_teardown_frame = NeedsEagerFrame();
-
- if (!instr->hydrogen()->is_just_miss()) {
- if (FLAG_vector_ics) {
- __ push(slot);
- __ push(vector);
- }
+ // The probe will tail call to a handler if found.
+ // If --vector-ics is on, then it knows to pop the two args first.
+ isolate()->stub_cache()->GenerateProbe(masm(), Code::LOAD_IC,
+ instr->hydrogen()->flags(), false,
+ receiver, name, scratch, extra);
- // The probe will tail call to a handler if found.
- // If --vector-ics is on, then it knows to pop the two args first.
- DCHECK(!instr->hydrogen()->is_keyed_load());
- isolate()->stub_cache()->GenerateProbe(
- masm(), Code::LOAD_IC, instr->hydrogen()->flags(), must_teardown_frame,
- receiver, name, scratch, extra);
-
- if (FLAG_vector_ics) {
- __ pop(vector);
- __ pop(slot);
- }
- }
-
- // 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/hydrogen-instructions.h ('k') | src/ia32/lithium-ia32.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698