| Index: src/objects.cc
 | 
| diff --git a/src/objects.cc b/src/objects.cc
 | 
| index af37cb114d615f7a4a6eb0cd51bce840a9527aa7..797dc7442e4aab265ded7002b588f86e4068734c 100644
 | 
| --- a/src/objects.cc
 | 
| +++ b/src/objects.cc
 | 
| @@ -10920,8 +10920,8 @@ int Script::GetColumnNumber(Handle<Script> script, int code_pos) {
 | 
|  
 | 
|    DisallowHeapAllocation no_allocation;
 | 
|    FixedArray* line_ends_array = FixedArray::cast(script->line_ends());
 | 
| -  line_number = line_number - script->line_offset()->value();
 | 
| -  if (line_number == 0) return code_pos + script->column_offset()->value();
 | 
| +  line_number = line_number - script->line_offset();
 | 
| +  if (line_number == 0) return code_pos + script->column_offset();
 | 
|    int prev_line_end_pos =
 | 
|        Smi::cast(line_ends_array->get(line_number - 1))->value();
 | 
|    return code_pos - (prev_line_end_pos + 1);
 | 
| @@ -10936,7 +10936,7 @@ int Script::GetLineNumberWithArray(int code_pos) {
 | 
|    if (line_ends_len == 0) return -1;
 | 
|  
 | 
|    if ((Smi::cast(line_ends_array->get(0)))->value() >= code_pos) {
 | 
| -    return line_offset()->value();
 | 
| +    return line_offset();
 | 
|    }
 | 
|  
 | 
|    int left = 0;
 | 
| @@ -10948,7 +10948,7 @@ int Script::GetLineNumberWithArray(int code_pos) {
 | 
|        left += half;
 | 
|      }
 | 
|    }
 | 
| -  return right + line_offset()->value();
 | 
| +  return right + line_offset();
 | 
|  }
 | 
|  
 | 
|  
 | 
| @@ -16179,10 +16179,9 @@ void DebugInfo::SetBreakPoint(Handle<DebugInfo> debug_info,
 | 
|    // Allocate new BreakPointInfo object and set the break point.
 | 
|    Handle<BreakPointInfo> new_break_point_info = Handle<BreakPointInfo>::cast(
 | 
|        isolate->factory()->NewStruct(BREAK_POINT_INFO_TYPE));
 | 
| -  new_break_point_info->set_code_position(Smi::FromInt(code_position));
 | 
| -  new_break_point_info->set_source_position(Smi::FromInt(source_position));
 | 
| -  new_break_point_info->
 | 
| -      set_statement_position(Smi::FromInt(statement_position));
 | 
| +  new_break_point_info->set_code_position(code_position);
 | 
| +  new_break_point_info->set_source_position(source_position);
 | 
| +  new_break_point_info->set_statement_position(statement_position);
 | 
|    new_break_point_info->set_break_point_objects(
 | 
|        isolate->heap()->undefined_value());
 | 
|    BreakPointInfo::SetBreakPoint(new_break_point_info, break_point_object);
 | 
| @@ -16244,7 +16243,7 @@ int DebugInfo::GetBreakPointInfoIndex(int code_position) {
 | 
|      if (!break_points()->get(i)->IsUndefined()) {
 | 
|        BreakPointInfo* break_point_info =
 | 
|            BreakPointInfo::cast(break_points()->get(i));
 | 
| -      if (break_point_info->code_position()->value() == code_position) {
 | 
| +      if (break_point_info->code_position() == code_position) {
 | 
|          return i;
 | 
|        }
 | 
|      }
 | 
| 
 |