Commit 48e9f76f authored by Junliang Yan's avatar Junliang Yan Committed by Commit Bot

Fix type mismatch error on s390

On s390, size_t is defined to be long unsigned int, while Address is unsigned
int. Therefore, GCC is complaining conflicting types for parameter 'T'
('long unsigned int' and 'unsigned int') for the Min function.

R=ofrobots@google.com, hpayer@chromium.org, mstarzinger@chromium.org, mlippautz@chromium.org

Change-Id: Ib04edebad24da694ccd06ff572ee50d3db7f87ff
Reviewed-on: https://chromium-review.googlesource.com/1035542Reviewed-by: 's avatarMichael Lippautz <mlippautz@chromium.org>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#52900}
parent 306b40c7
......@@ -1751,7 +1751,7 @@ Address SpaceWithLinearArea::ComputeLimit(Address start, Address end,
} else {
rounded_step = RoundSizeDownToObjectAlignment(static_cast<int>(step));
}
return Min(start + min_size + rounded_step, end);
return Min(static_cast<Address>(start + min_size + rounded_step), end);
} else {
// The entire node can be used as the linear allocation area.
return end;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment