AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Add assertions to FrameSummary and Code::SourcePosition.

Browse Source 
Make sure we don't use arbitrary optimized code in FrameSummary.

R=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/1846183002

Cr-Commit-Position: refs/heads/master@{#35191}
This commit is contained in:
yangguo 2016-04-01 02:06:44 -07:00 committed by Commit bot
parent 6761224c97
commit 1f895a06bd
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/frames.cc
View File

@ -954,6 +954,15 @@ void JavaScriptFrame::RestoreOperandStack(FixedArray* store) {
}
}
namespace {
bool CannotDeoptFromAsmCode(Code* code, JSFunction* function) {
return code->is_turbofanned() && function->shared()->asm_function() &&
!FLAG_turbo_asm_deoptimization;
}
} // namespace
FrameSummary::FrameSummary(Object* receiver, JSFunction* function,
AbstractCode* abstract_code, int code_offset,
bool is_constructor)
@ -961,7 +970,11 @@ FrameSummary::FrameSummary(Object* receiver, JSFunction* function,
function_(function),
abstract_code_(abstract_code),
code_offset_(code_offset),
is_constructor_(is_constructor) {}
is_constructor_(is_constructor) {
DCHECK(abstract_code->IsBytecodeArray() ||
Code::cast(abstract_code)->kind() != Code::OPTIMIZED_FUNCTION ||
CannotDeoptFromAsmCode(Code::cast(abstract_code), function));
}
void FrameSummary::Print() {
PrintF("receiver: ");
@ -973,7 +986,10 @@ void FrameSummary::Print() {
if (abstract_code_->IsCode()) {
Code* code = abstract_code_->GetCode();
if (code->kind() == Code::FUNCTION) PrintF(" UNOPT ");
if (code->kind() == Code::OPTIMIZED_FUNCTION) PrintF(" OPT ");
if (code->kind() == Code::OPTIMIZED_FUNCTION) {
DCHECK(CannotDeoptFromAsmCode(code, *function()));
PrintF(" ASM ");
}
} else {
PrintF(" BYTECODE ");
}
@ -989,8 +1005,7 @@ void OptimizedFrame::Summarize(List<FrameSummary>* frames) {
// TODO(turbofan): Revisit once we support deoptimization across the board.
Code* code = LookupCode();
if (code->kind() == Code::BUILTIN ||
(code->is_turbofanned() && function()->shared()->asm_function() &&
!FLAG_turbo_asm_deoptimization)) {
CannotDeoptFromAsmCode(code, function())) {
return JavaScriptFrame::Summarize(frames);
}

2
src/objects.cc
View File

@ -14057,6 +14057,8 @@ int Code::SourcePosition(int code_offset) {
}
it.next();
}
DCHECK(kind() == FUNCTION || is_optimized_code() && is_turbofanned() ||
is_wasm_code() || position == RelocInfo::kNoPosition);
return position;
}