[v8-dev] Fast fix to make tree green.

[antonm]

Reviewers: Christian Plesner Hansen,

Description:
Fast fix to make tree green.


Please review this at http://codereview.chromium.org/256041

SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/

Affected files:
   M     src/checks.h
   M     test/cctest/test-api.cc


Index: test/cctest/test-api.cc
===================================================================
--- test/cctest/test-api.cc     (revision 3013)
+++ test/cctest/test-api.cc     (working copy)
@@ -702,12 +702,18 @@
  }


+#if V8_HOST_ARCH_64_BIT
+# define CAST_TO_INT64(x) (int(x))
+#else
+# define CAST_TO_INT64(x) (int64_t(x))
+#endif
+
  THREADED_TEST(TinyInteger) {
    v8::HandleScope scope;
    LocalContext env;
    int32_t value = 239;
    Local<v8::Integer> value_obj = v8::Integer::New(value);
-  CHECK_EQ(int64_t(value), value_obj->Value());
+  CHECK_EQ(CAST_TO_INT64(value), value_obj->Value());
  }


@@ -718,7 +724,7 @@
    CHECK(i::Smi::IsValid(value));
    CHECK(!i::Smi::IsValid(value + 1));
    Local<v8::Integer> value_obj = v8::Integer::New(value);
-  CHECK_EQ(int64_t(value), value_obj->Value());
+  CHECK_EQ(CAST_TO_INT64(value), value_obj->Value());
  }


@@ -728,7 +734,7 @@
    int32_t value = (1 << 30) + 1;
    CHECK(!i::Smi::IsValid(value));
    Local<v8::Integer> value_obj = v8::Integer::New(value);
-  CHECK_EQ(int64_t(value), value_obj->Value());
+  CHECK_EQ(CAST_TO_INT64(value), value_obj->Value());
  }


@@ -737,7 +743,7 @@
    LocalContext env;
    uint32_t value = 239;
    Local<v8::Integer> value_obj = v8::Integer::New(value);
-  CHECK_EQ(int64_t(value), value_obj->Value());
+  CHECK_EQ(CAST_TO_INT64(value), value_obj->Value());
  }


@@ -748,7 +754,7 @@
    CHECK(i::Smi::IsValid(value));
    CHECK(!i::Smi::IsValid(value + 1));
    Local<v8::Integer> value_obj = v8::Integer::New(value);
-  CHECK_EQ(int64_t(value), value_obj->Value());
+  CHECK_EQ(CAST_TO_INT64(value), value_obj->Value());
  }


@@ -758,7 +764,7 @@
    uint32_t value = (1 << 30) + 1;
    CHECK(!i::Smi::IsValid(value));
    Local<v8::Integer> value_obj = v8::Integer::New(value);
-  CHECK_EQ(int64_t(value), value_obj->Value());
+  CHECK_EQ(CAST_TO_INT64(value), value_obj->Value());
  }


@@ -767,7 +773,7 @@
    LocalContext env;
    uint32_t value = uint32_t(0xffffffff);
    Local<v8::Integer> value_obj = v8::Integer::New(value);
-  CHECK_EQ(int64_t(value), value_obj->Value());
+  CHECK_EQ(CAST_TO_INT64(value), value_obj->Value());
  }


Index: src/checks.h
===================================================================
--- src/checks.h        (revision 3013)
+++ src/checks.h        (working copy)
@@ -80,6 +80,7 @@
    }
  }

+#if !V8_HOST_ARCH_64_BIT
  // Helper function used by the CHECK_EQ function when given int64_t
  // arguments.  Should not be called directly.
  static inline void CheckEqualsHelper(const char* file, int line,
@@ -98,6 +99,7 @@
               uint32_t(value >> 32), uint32_t(value));
    }
  }
+#endif


  // Helper function used by the CHECK_NE function when given int



--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---