Add back a static_cast<int32_t> to assembler-arm.cc to fix WebView build.
authorrmcilroy@chromium.org <rmcilroy@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Thu, 17 Jul 2014 10:34:59 +0000 (10:34 +0000)
committerrmcilroy@chromium.org <rmcilroy@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Thu, 17 Jul 2014 10:34:59 +0000 (10:34 +0000)
The WebView Mac builder is having trouble with resolving set_at_offset with an
intptr_t argument to the correct overload. Add back the static_cast which
was present before r22293 to resolve this.

R=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/398893003

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22446 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/arm/assembler-arm.cc

index dc57cf4..7df9202 100644 (file)
@@ -3685,7 +3685,8 @@ void ConstantPoolBuilder::Populate(Assembler* assm,
       if (type == ConstantPoolArray::INT64) {
         constant_pool->set_at_offset(offset, rinfo.data64());
       } else if (type == ConstantPoolArray::INT32) {
-        constant_pool->set_at_offset(offset, rinfo.data());
+        constant_pool->set_at_offset(offset,
+                                     static_cast<int32_t>(rinfo.data()));
       } else if (type == ConstantPoolArray::CODE_PTR) {
         constant_pool->set_at_offset(offset,
                                      reinterpret_cast<Address>(rinfo.data()));