diff options
Diffstat (limited to 'deps/v8/src/full-codegen/arm/full-codegen-arm.cc')
-rw-r--r-- | deps/v8/src/full-codegen/arm/full-codegen-arm.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/deps/v8/src/full-codegen/arm/full-codegen-arm.cc b/deps/v8/src/full-codegen/arm/full-codegen-arm.cc index 4b61bf9ab8..e4e4b3a8a4 100644 --- a/deps/v8/src/full-codegen/arm/full-codegen-arm.cc +++ b/deps/v8/src/full-codegen/arm/full-codegen-arm.cc @@ -134,13 +134,13 @@ void FullCodeGenerator::Generate() { Comment cmnt(masm_, "[ Increment invocation count"); __ ldr(r2, FieldMemOperand(r1, JSFunction::kLiteralsOffset)); __ ldr(r2, FieldMemOperand(r2, LiteralsArray::kFeedbackVectorOffset)); - __ ldr(r9, FieldMemOperand(r2, TypeFeedbackVector::kInvocationCountIndex * + __ ldr(r9, FieldMemOperand(r2, FeedbackVector::kInvocationCountIndex * kPointerSize + - TypeFeedbackVector::kHeaderSize)); + FeedbackVector::kHeaderSize)); __ add(r9, r9, Operand(Smi::FromInt(1))); - __ str(r9, FieldMemOperand(r2, TypeFeedbackVector::kInvocationCountIndex * - kPointerSize + - TypeFeedbackVector::kHeaderSize)); + __ str(r9, FieldMemOperand( + r2, FeedbackVector::kInvocationCountIndex * kPointerSize + + FeedbackVector::kHeaderSize)); } { Comment cmnt(masm_, "[ Allocate locals"); @@ -846,7 +846,7 @@ void FullCodeGenerator::DeclareGlobals(Handle<FixedArray> pairs) { // Call the runtime to declare the globals. __ mov(r1, Operand(pairs)); __ mov(r0, Operand(Smi::FromInt(DeclareGlobalsFlags()))); - __ EmitLoadTypeFeedbackVector(r2); + __ EmitLoadFeedbackVector(r2); __ Push(r1, r0, r2); __ CallRuntime(Runtime::kDeclareGlobals); // Return value is ignored. @@ -1069,8 +1069,8 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { // We need to filter the key, record slow-path here. int const vector_index = SmiFromSlot(slot)->value(); - __ EmitLoadTypeFeedbackVector(r3); - __ mov(r2, Operand(TypeFeedbackVector::MegamorphicSentinel(isolate()))); + __ EmitLoadFeedbackVector(r3); + __ mov(r2, Operand(FeedbackVector::MegamorphicSentinel(isolate()))); __ str(r2, FieldMemOperand(r3, FixedArray::OffsetOfElementAt(vector_index))); // r0 contains the key. The receiver in r1 is the second argument to the @@ -1924,7 +1924,7 @@ void FullCodeGenerator::VisitCallNew(CallNew* expr) { __ ldr(r1, MemOperand(sp, arg_count * kPointerSize)); // Record call targets in unoptimized code. - __ EmitLoadTypeFeedbackVector(r2); + __ EmitLoadFeedbackVector(r2); __ mov(r3, Operand(SmiFromSlot(expr->CallNewFeedbackSlot()))); CallConstructStub stub(isolate()); |