Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Side by Side Diff: src/runtime.cc

Issue 19248002: Fix unaligned accesses in back_edge tables. (Closed) Base URL: https://github.com/v8/v8.git@gbl
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« src/deoptimizer.cc ('K') | « src/objects.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 8520 matching lines...) Expand 10 before | Expand all | Expand 10 after
8531 ASSERT(frame->LookupCode() == *unoptimized); 8531 ASSERT(frame->LookupCode() == *unoptimized);
8532 ASSERT(unoptimized->contains(frame->pc())); 8532 ASSERT(unoptimized->contains(frame->pc()));
8533 8533
8534 // Use linear search of the unoptimized code's back edge table to find 8534 // Use linear search of the unoptimized code's back edge table to find
8535 // the AST id matching the PC. 8535 // the AST id matching the PC.
8536 Address start = unoptimized->instruction_start(); 8536 Address start = unoptimized->instruction_start();
8537 unsigned target_pc_offset = static_cast<unsigned>(frame->pc() - start); 8537 unsigned target_pc_offset = static_cast<unsigned>(frame->pc() - start);
8538 Address table_cursor = start + unoptimized->back_edge_table_offset(); 8538 Address table_cursor = start + unoptimized->back_edge_table_offset();
8539 uint32_t table_length = Memory::uint32_at(table_cursor); 8539 uint32_t table_length = Memory::uint32_at(table_cursor);
8540 table_cursor += kIntSize; 8540 table_cursor += kIntSize;
8541 uint8_t loop_depth = 0; 8541 uint32_t loop_depth = 0;
8542 for (unsigned i = 0; i < table_length; ++i) { 8542 for (unsigned i = 0; i < table_length; ++i) {
8543 // Table entries are (AST id, pc offset) pairs. 8543 // Table entries are (AST id, pc offset) pairs.
8544 uint32_t pc_offset = Memory::uint32_at(table_cursor + kIntSize); 8544 uint32_t pc_offset = Memory::uint32_at(table_cursor + kIntSize);
8545 if (pc_offset == target_pc_offset) { 8545 if (pc_offset == target_pc_offset) {
8546 ast_id = BailoutId(static_cast<int>(Memory::uint32_at(table_cursor))); 8546 ast_id = BailoutId(static_cast<int>(Memory::uint32_at(table_cursor)));
8547 loop_depth = Memory::uint8_at(table_cursor + 2 * kIntSize); 8547 loop_depth = Memory::uint32_at(table_cursor + 2 * kIntSize);
8548 break; 8548 break;
8549 } 8549 }
8550 table_cursor += FullCodeGenerator::kBackEdgeEntrySize; 8550 table_cursor += FullCodeGenerator::kBackEdgeEntrySize;
8551 } 8551 }
8552 ASSERT(!ast_id.IsNone()); 8552 ASSERT(!ast_id.IsNone());
8553 if (FLAG_trace_osr) { 8553 if (FLAG_trace_osr) {
8554 PrintF("[replacing on-stack at AST id %d, loop depth %d in ", 8554 PrintF("[replacing on-stack at AST id %d, loop depth %d in ",
8555 ast_id.ToInt(), loop_depth); 8555 ast_id.ToInt(), loop_depth);
8556 function->PrintName(); 8556 function->PrintName();
8557 PrintF("]\n"); 8557 PrintF("]\n");
(...skipping 5519 matching lines...) Expand 10 before | Expand all | Expand 10 after
14077 // Handle last resort GC and make sure to allow future allocations 14077 // Handle last resort GC and make sure to allow future allocations
14078 // to grow the heap without causing GCs (if possible). 14078 // to grow the heap without causing GCs (if possible).
14079 isolate->counters()->gc_last_resort_from_js()->Increment(); 14079 isolate->counters()->gc_last_resort_from_js()->Increment();
14080 isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags, 14080 isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags,
14081 "Runtime::PerformGC"); 14081 "Runtime::PerformGC");
14082 } 14082 }
14083 } 14083 }
14084 14084
14085 14085
14086 } } // namespace v8::internal 14086 } } // namespace v8::internal
OLDNEW
« src/deoptimizer.cc ('K') | « src/objects.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698