| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 for (int i = 0; i < deferred_heap_numbers_.length(); i++) { | 625 for (int i = 0; i < deferred_heap_numbers_.length(); i++) { |
| 626 HeapNumberMaterializationDescriptor d = deferred_heap_numbers_[i]; | 626 HeapNumberMaterializationDescriptor d = deferred_heap_numbers_[i]; |
| 627 | 627 |
| 628 // Check of the heap number to materialize actually belong to the frame | 628 // Check of the heap number to materialize actually belong to the frame |
| 629 // being extracted. | 629 // being extracted. |
| 630 Address slot = d.slot_address(); | 630 Address slot = d.slot_address(); |
| 631 if (parameters_top <= slot && slot < parameters_bottom) { | 631 if (parameters_top <= slot && slot < parameters_bottom) { |
| 632 Handle<Object> num = isolate_->factory()->NewNumber(d.value()); | 632 Handle<Object> num = isolate_->factory()->NewNumber(d.value()); |
| 633 | 633 |
| 634 int index = (info->parameters_count() - 1) - | 634 int index = (info->parameters_count() - 1) - |
| 635 (slot - parameters_top) / kPointerSize; | 635 static_cast<int>(slot - parameters_top) / kPointerSize; |
| 636 | 636 |
| 637 if (FLAG_trace_deopt) { | 637 if (FLAG_trace_deopt) { |
| 638 PrintF("Materializing a new heap number %p [%e] in slot %p" | 638 PrintF("Materializing a new heap number %p [%e] in slot %p" |
| 639 "for parameter slot #%d\n", | 639 "for parameter slot #%d\n", |
| 640 reinterpret_cast<void*>(*num), | 640 reinterpret_cast<void*>(*num), |
| 641 d.value(), | 641 d.value(), |
| 642 d.slot_address(), | 642 d.slot_address(), |
| 643 index); | 643 index); |
| 644 } | 644 } |
| 645 | 645 |
| 646 info->SetParameter(index, *num); | 646 info->SetParameter(index, *num); |
| 647 } else if (expressions_top <= slot && slot < expressions_bottom) { | 647 } else if (expressions_top <= slot && slot < expressions_bottom) { |
| 648 Handle<Object> num = isolate_->factory()->NewNumber(d.value()); | 648 Handle<Object> num = isolate_->factory()->NewNumber(d.value()); |
| 649 | 649 |
| 650 int index = info->expression_count() - 1 - | 650 int index = info->expression_count() - 1 - |
| 651 (slot - expressions_top) / kPointerSize; | 651 static_cast<int>(slot - expressions_top) / kPointerSize; |
| 652 | 652 |
| 653 if (FLAG_trace_deopt) { | 653 if (FLAG_trace_deopt) { |
| 654 PrintF("Materializing a new heap number %p [%e] in slot %p" | 654 PrintF("Materializing a new heap number %p [%e] in slot %p" |
| 655 "for expression slot #%d\n", | 655 "for expression slot #%d\n", |
| 656 reinterpret_cast<void*>(*num), | 656 reinterpret_cast<void*>(*num), |
| 657 d.value(), | 657 d.value(), |
| 658 d.slot_address(), | 658 d.slot_address(), |
| 659 index); | 659 index); |
| 660 } | 660 } |
| 661 | 661 |
| (...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1627 | 1627 |
| 1628 void DeoptimizedFrameInfo::Iterate(ObjectVisitor* v) { | 1628 void DeoptimizedFrameInfo::Iterate(ObjectVisitor* v) { |
| 1629 v->VisitPointer(BitCast<Object**>(&function_)); | 1629 v->VisitPointer(BitCast<Object**>(&function_)); |
| 1630 v->VisitPointers(parameters_, parameters_ + parameters_count_); | 1630 v->VisitPointers(parameters_, parameters_ + parameters_count_); |
| 1631 v->VisitPointers(expression_stack_, expression_stack_ + expression_count_); | 1631 v->VisitPointers(expression_stack_, expression_stack_ + expression_count_); |
| 1632 } | 1632 } |
| 1633 | 1633 |
| 1634 #endif // ENABLE_DEBUGGER_SUPPORT | 1634 #endif // ENABLE_DEBUGGER_SUPPORT |
| 1635 | 1635 |
| 1636 } } // namespace v8::internal | 1636 } } // namespace v8::internal |
| OLD | NEW |