| Index: src/arm/macro-assembler-arm.cc
|
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
|
| index 7089a6213de8b2e0494dc085f5fe8ff4411b5312..e307f1fc36d24ad6743a6e3c5bbc195de77ff420 100644
|
| --- a/src/arm/macro-assembler-arm.cc
|
| +++ b/src/arm/macro-assembler-arm.cc
|
| @@ -179,7 +179,7 @@ void MacroAssembler::Call(Address target,
|
|
|
| int MacroAssembler::CallSize(Handle<Code> code,
|
| RelocInfo::Mode rmode,
|
| - unsigned ast_id,
|
| + TypeFeedbackId ast_id,
|
| Condition cond) {
|
| return CallSize(reinterpret_cast<Address>(code.location()), rmode, cond);
|
| }
|
| @@ -187,12 +187,12 @@ int MacroAssembler::CallSize(Handle<Code> code,
|
|
|
| void MacroAssembler::Call(Handle<Code> code,
|
| RelocInfo::Mode rmode,
|
| - unsigned ast_id,
|
| + TypeFeedbackId ast_id,
|
| Condition cond) {
|
| Label start;
|
| bind(&start);
|
| ASSERT(RelocInfo::IsCodeTarget(rmode));
|
| - if (rmode == RelocInfo::CODE_TARGET && ast_id != kNoASTId) {
|
| + if (rmode == RelocInfo::CODE_TARGET && !ast_id.IsNone()) {
|
| SetRecordedAstId(ast_id);
|
| rmode = RelocInfo::CODE_TARGET_WITH_ID;
|
| }
|
| @@ -2136,7 +2136,7 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
|
|
|
| void MacroAssembler::CallStub(CodeStub* stub, Condition cond) {
|
| ASSERT(AllowThisStubCall(stub)); // Stub calls are not allowed in some stubs.
|
| - Call(stub->GetCode(), RelocInfo::CODE_TARGET, kNoASTId, cond);
|
| + Call(stub->GetCode(), RelocInfo::CODE_TARGET, TypeFeedbackId::None(), cond);
|
| }
|
|
|
|
|
|
|