Merge bleeding_edge revision (5922, 5934] to isolates branch....

src/frames.cc

Index: src/frames.cc
===================================================================
--- src/frames.cc	(revision 6894)
+++ src/frames.cc	(working copy)
@@ -663,7 +663,7 @@
 void JavaScriptFrame::Summarize(List<FrameSummary>* functions) {
   ASSERT(functions->length() == 0);
   Code* code_pointer = LookupCode(Isolate::Current());
-  int offset = pc() - code_pointer->address();
+  int offset = static_cast<int>(pc() - code_pointer->address());
   FrameSummary summary(receiver(),
                        JSFunction::cast(function()),
                        code_pointer,
@@ -787,7 +787,7 @@
   ASSERT(code->kind() == Code::OPTIMIZED_FUNCTION);
 
   SafepointTable table(code);
-  unsigned pc_offset = pc() - code->instruction_start();
+  unsigned pc_offset = static_cast<unsigned>(pc() - code->instruction_start());
   for (unsigned i = 0; i < table.length(); i++) {
     if (table.GetPcOffset(i) == pc_offset) {
       *deopt_index = table.GetDeoptimizationIndex(i);