Fix compile failure from revision 6934 and win64 compile failure from revision 6931.

Review URL: http://codereview.chromium.org/6576033

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

diff --git a/src/runtime.cc b/src/runtime.cc
index d40565c95858ce16061405f555c86367b98dba50..74c114619554f96b898398997bdc4788ddbbbc85 100644 (file)
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -8274,6 +8274,7 @@ static void CollectElementIndices(Handle<JSObject> object,
         }
         default:
           UNREACHABLE();
+          dense_elements_length = 0;
           break;
       }
       uint32_t length = static_cast<uint32_t>(dense_elements_length);

diff --git a/src/x64/deoptimizer-x64.cc b/src/x64/deoptimizer-x64.cc
index 75b0376fa67f52aa528f4ee0ab11620440cfb37c..6278142858b6314a82458fb2ccafda37b1b83878 100644 (file)
--- a/src/x64/deoptimizer-x64.cc
+++ b/src/x64/deoptimizer-x64.cc
@@ -304,7 +304,7 @@ void Deoptimizer::DoComputeOsrOutputFrame() {
   USE(height_in_bytes);
 
   unsigned fixed_size = ComputeFixedSize(function_);
-  unsigned input_frame_size = input_->GetFrameSize();
+  unsigned input_frame_size = static_cast<unsigned>(input_->GetFrameSize());
   ASSERT(fixed_size + height_in_bytes == input_frame_size);
 
   unsigned stack_slot_size = optimized_code_->stack_slots() * kPointerSize;