AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

PPC/s390: [nojit] Consistently use DCHECKs in CallApi helper

Browse Source 
Port 8c7a29b201

Original Commit Message:

    This addresses follow-up comments to https://crrev.com/c/1354887/.

    Use DCHECKs instead of CHECKs and make the branch order consistent
    across architectures.

R=jgruber@chromium.org, joransiu@ca.ibm.com, michael_dawson@ca.ibm.com
BUG=
LOG=N

Change-Id: Ic974e31905e15d91efae026837095693f0c01b66
Reviewed-on: https://chromium-review.googlesource.com/c/1365681
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Reviewed-by: Joran Siu <joransiu@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#58104}
This commit is contained in:
Junliang Yan 2018-12-06 12:31:38 -05:00 committed by Commit Bot
parent b090d7e746
commit d79762a8ed
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/builtins/s390/builtins-s390.cc
View File

@ -2887,10 +2887,12 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
// Leave the API exit frame.
__ bind(&leave_exit_frame);
// LeaveExitFrame expects unwind space to be in a register.
if (stack_space_operand != nullptr) {
__ LoadP(r6, *stack_space_operand);
} else {
if (stack_space_operand == nullptr) {
DCHECK_NE(stack_space, 0);
__ mov(r6, Operand(stack_space));
} else {
DCHECK_EQ(stack_space, 0);
__ LoadP(r6, *stack_space_operand);
}
__ LeaveExitFrame(false, r6, stack_space_operand != nullptr);