From 029f060544c3db266b08c5a082d13a71aca0b119 Mon Sep 17 00:00:00 2001 From: "balazs.kilvady@imgtec.com" Date: Thu, 18 Sep 2014 15:36:42 +0000 Subject: [PATCH] MIPS: Move state sentinels into TypeFeedbackVector. Port r24037 (d821bf9) Original commit message: These sentinels were in the wrong place, living in only tangentially related class TypeFeedbackInfo, but they codify state in the TypeFeedbackVector. BUG= R=dusan.milosavljevic@imgtec.com Review URL: https://codereview.chromium.org/583573003 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24046 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mips64/code-stubs-mips64.cc | 4 ++-- src/mips64/full-codegen-mips64.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc index 9ae9102..41ada8c 100644 --- a/src/mips64/code-stubs-mips64.cc +++ b/src/mips64/code-stubs-mips64.cc @@ -2480,9 +2480,9 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) { // a3 : slot in feedback vector (Smi) Label initialize, done, miss, megamorphic, not_array_function; - DCHECK_EQ(*TypeFeedbackInfo::MegamorphicSentinel(masm->isolate()), + DCHECK_EQ(*TypeFeedbackVector::MegamorphicSentinel(masm->isolate()), masm->isolate()->heap()->megamorphic_symbol()); - DCHECK_EQ(*TypeFeedbackInfo::UninitializedSentinel(masm->isolate()), + DCHECK_EQ(*TypeFeedbackVector::UninitializedSentinel(masm->isolate()), masm->isolate()->heap()->uninitialized_symbol()); // Load the cache state into a4. diff --git a/src/mips64/full-codegen-mips64.cc b/src/mips64/full-codegen-mips64.cc index a200c28..291e4ab 100644 --- a/src/mips64/full-codegen-mips64.cc +++ b/src/mips64/full-codegen-mips64.cc @@ -1175,7 +1175,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { __ bind(&fixed_array); __ li(a1, FeedbackVector()); - __ li(a2, Operand(TypeFeedbackInfo::MegamorphicSentinel(isolate()))); + __ li(a2, Operand(TypeFeedbackVector::MegamorphicSentinel(isolate()))); __ sd(a2, FieldMemOperand(a1, FixedArray::OffsetOfElementAt(slot))); __ li(a1, Operand(Smi::FromInt(1))); // Smi indicates slow check -- 2.7.4