From 94d6a1368229a2ce7532b1719a7da7e7176d065d Mon Sep 17 00:00:00 2001 From: "dcarney@chromium.org" Date: Fri, 7 Jun 2013 08:15:00 +0000 Subject: [PATCH] build fix for build fix for 14990 BUG= R=svenpanne@chromium.org Review URL: https://codereview.chromium.org/16409011 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14993 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- include/v8.h | 5 +++-- test/cctest/test-api.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/v8.h b/include/v8.h index e35cc7a..519330a 100644 --- a/include/v8.h +++ b/include/v8.h @@ -38,7 +38,6 @@ #ifndef V8_H_ #define V8_H_ -#include #include "v8stdint.h" #ifdef _WIN32 @@ -5683,7 +5682,9 @@ void ReturnValue::Set(int32_t i) { template void ReturnValue::Set(uint32_t i) { typedef internal::Internals I; - if (V8_LIKELY(i <= INT32_MAX)) { + // Can't simply use INT32_MAX here for whatever reason. + bool fits_into_int32_t = (i & (1 << 31)) == 0; + if (V8_LIKELY(fits_into_int32_t)) { Set(static_cast(i)); return; } diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc index 22b9378..f6d30a9 100755 --- a/test/cctest/test-api.cc +++ b/test/cctest/test-api.cc @@ -1099,7 +1099,7 @@ THREADED_TEST(FastReturnValues) { // check int32_t and uint32_t int32_t int_values[] = { 0, 234, -723, - i::Smi::kMinValue, i::Smi::kMaxValue, INT32_MAX, INT32_MIN + i::Smi::kMinValue, i::Smi::kMaxValue }; for (size_t i = 0; i < ARRAY_SIZE(int_values); i++) { for (int modifier = -1; modifier <= 1; modifier++) { -- 2.7.4