diff options
Diffstat (limited to 'deps/v8/src/x64/code-stubs-x64.cc')
-rw-r--r-- | deps/v8/src/x64/code-stubs-x64.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/deps/v8/src/x64/code-stubs-x64.cc b/deps/v8/src/x64/code-stubs-x64.cc index 5310a64714..d13181eea3 100644 --- a/deps/v8/src/x64/code-stubs-x64.cc +++ b/deps/v8/src/x64/code-stubs-x64.cc @@ -107,7 +107,7 @@ void JSEntryStub::Generate(MacroAssembler* masm) { ExternalReference pending_exception = ExternalReference::Create( IsolateAddressId::kPendingExceptionAddress, isolate()); __ Store(pending_exception, rax); - __ LoadRoot(rax, Heap::kExceptionRootIndex); + __ LoadRoot(rax, RootIndex::kException); __ jmp(&exit); // Invoke: Link this frame into the handler chain. @@ -352,19 +352,19 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm, __ CmpInstanceType(map, FIRST_JS_RECEIVER_TYPE); __ j(above_equal, &ok, Label::kNear); - __ CompareRoot(map, Heap::kHeapNumberMapRootIndex); + __ CompareRoot(map, RootIndex::kHeapNumberMap); __ j(equal, &ok, Label::kNear); - __ CompareRoot(return_value, Heap::kUndefinedValueRootIndex); + __ CompareRoot(return_value, RootIndex::kUndefinedValue); __ j(equal, &ok, Label::kNear); - __ CompareRoot(return_value, Heap::kTrueValueRootIndex); + __ CompareRoot(return_value, RootIndex::kTrueValue); __ j(equal, &ok, Label::kNear); - __ CompareRoot(return_value, Heap::kFalseValueRootIndex); + __ CompareRoot(return_value, RootIndex::kFalseValue); __ j(equal, &ok, Label::kNear); - __ CompareRoot(return_value, Heap::kNullValueRootIndex); + __ CompareRoot(return_value, RootIndex::kNullValue); __ j(equal, &ok, Label::kNear); __ Abort(AbortReason::kAPICallReturnedInvalidObject); @@ -428,15 +428,15 @@ void CallApiCallbackStub::Generate(MacroAssembler* masm) { __ PopReturnAddressTo(return_address); // new target - __ PushRoot(Heap::kUndefinedValueRootIndex); + __ PushRoot(RootIndex::kUndefinedValue); // call data __ Push(call_data); // return value - __ PushRoot(Heap::kUndefinedValueRootIndex); + __ PushRoot(RootIndex::kUndefinedValue); // return value default - __ PushRoot(Heap::kUndefinedValueRootIndex); + __ PushRoot(RootIndex::kUndefinedValue); // isolate Register scratch = call_data; __ Move(scratch, ExternalReference::isolate_address(masm->isolate())); @@ -526,7 +526,7 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) { __ PopReturnAddressTo(scratch); __ Push(receiver); __ Push(FieldOperand(callback, AccessorInfo::kDataOffset)); - __ LoadRoot(kScratchRegister, Heap::kUndefinedValueRootIndex); + __ LoadRoot(kScratchRegister, RootIndex::kUndefinedValue); __ Push(kScratchRegister); // return value __ Push(kScratchRegister); // return value default __ PushAddress(ExternalReference::isolate_address(isolate())); |