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

Unified Diff: src/builtins/ia32/builtins-ia32.cc

Issue 2642933003: Revert of Revert [TypeFeedbackVector] Root literal arrays in function literal slots (Closed)
Patch Set: Created 3 years, 11 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/builtins/builtins-constructor.cc ('k') | src/builtins/mips/builtins-mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/builtins/ia32/builtins-ia32.cc
diff --git a/src/builtins/ia32/builtins-ia32.cc b/src/builtins/ia32/builtins-ia32.cc
index 9858529b5d0d8162db83a940da9a080c10b5c6cb..55f5bda940f94d6b9e4ed5d39be664ca165203d1 100644
--- a/src/builtins/ia32/builtins-ia32.cc
+++ b/src/builtins/ia32/builtins-ia32.cc
@@ -1027,6 +1027,12 @@
Register new_target = edx;
Register argument_count = eax;
+ // Do we have a valid feedback vector?
+ __ mov(ebx, FieldOperand(closure, JSFunction::kLiteralsOffset));
+ __ mov(ebx, FieldOperand(ebx, LiteralsArray::kFeedbackVectorOffset));
+ __ cmp(ebx, masm->isolate()->factory()->undefined_value());
+ __ j(equal, &gotta_call_runtime_no_stack);
+
__ push(argument_count);
__ push(new_target);
__ push(closure);
@@ -1039,7 +1045,6 @@
__ cmp(index, Immediate(Smi::FromInt(2)));
__ j(less, &gotta_call_runtime);
- // Find literals.
// edx : native context
// ebx : length / index
// eax : optimized code map
@@ -1057,20 +1062,6 @@
__ mov(temp, FieldOperand(temp, WeakCell::kValueOffset));
__ cmp(temp, native_context);
__ j(not_equal, &loop_bottom);
- // Literals available?
- __ mov(temp, FieldOperand(map, index, times_half_pointer_size,
- SharedFunctionInfo::kOffsetToPreviousLiterals));
- __ mov(temp, FieldOperand(temp, WeakCell::kValueOffset));
- __ JumpIfSmi(temp, &gotta_call_runtime);
-
- // Save the literals in the closure.
- __ mov(ecx, Operand(esp, 0));
- __ mov(FieldOperand(ecx, JSFunction::kLiteralsOffset), temp);
- __ push(index);
- __ RecordWriteField(ecx, JSFunction::kLiteralsOffset, temp, index,
- kDontSaveFPRegs, EMIT_REMEMBERED_SET, OMIT_SMI_CHECK);
- __ pop(index);
-
// Code available?
Register entry = ecx;
__ mov(entry, FieldOperand(map, index, times_half_pointer_size,
@@ -1078,7 +1069,7 @@
__ mov(entry, FieldOperand(entry, WeakCell::kValueOffset));
__ JumpIfSmi(entry, &try_shared);
- // Found literals and code. Get them into the closure and return.
+ // Found code. Get it into the closure and return.
__ pop(closure);
// Store code entry in the closure.
__ lea(entry, FieldOperand(entry, Code::kHeaderSize));
@@ -1112,7 +1103,7 @@
__ cmp(index, Immediate(Smi::FromInt(1)));
__ j(greater, &loop_top);
- // We found neither literals nor code.
+ // We found no code.
__ jmp(&gotta_call_runtime);
__ bind(&try_shared);
« no previous file with comments | « src/builtins/builtins-constructor.cc ('k') | src/builtins/mips/builtins-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698