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

Improve handling of debug name in CompilationInfo.

Browse Source 
R=mstarzinger@chromium.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#30441}
This commit is contained in:
titzer 2015-08-28 05:46:12 -07:00 committed by Commit bot
parent 5c55af556a
commit c6378f96e8
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/compiler.cc
View File

@ -156,7 +156,7 @@ CompilationInfo::CompilationInfo(const char* debug_name, Isolate* isolate,
: CompilationInfo(nullptr, nullptr, debug_name, STUB, isolate, zone) {}
CompilationInfo::CompilationInfo(ParseInfo* parse_info, CodeStub* code_stub,
const char* code_stub_debug_name, Mode mode,
const char* debug_name, Mode mode,
Isolate* isolate, Zone* zone)
: parse_info_(parse_info),
isolate_(isolate),
@ -179,7 +179,7 @@ CompilationInfo::CompilationInfo(ParseInfo* parse_info, CodeStub* code_stub,
optimization_id_(-1),
osr_expr_stack_height_(0),
function_type_(nullptr),
code_stub_debug_name_(code_stub_debug_name) {
debug_name_(debug_name) {
// Parameter count is number of stack parameters.
if (code_stub_ != NULL) {
CodeStubDescriptor descriptor(code_stub_);
@ -206,7 +206,7 @@ CompilationInfo::~CompilationInfo() {
void CompilationInfo::SetStub(CodeStub* code_stub) {
SetMode(STUB);
code_stub_ = code_stub;
code_stub_debug_name_ = CodeStub::MajorName(code_stub->MajorKey());
debug_name_ = CodeStub::MajorName(code_stub->MajorKey());
}
@ -311,15 +311,15 @@ void CompilationInfo::LogDeoptCallPosition(int pc_offset, int inlining_id) {
base::SmartArrayPointer<char> CompilationInfo::GetDebugName() const {
if (IsStub()) {
size_t len = strlen(code_stub_debug_name_) + 1;
base::SmartArrayPointer<char> name(new char[len]);
memcpy(name.get(), code_stub_debug_name_, len);
return name;
} else {
if (parse_info()) {
AllowHandleDereference allow_deref;
return literal()->debug_name()->ToCString();
return parse_info()->literal()->debug_name()->ToCString();
}
const char* str = debug_name_ ? debug_name_ : "unknown";
size_t len = strlen(str) + 1;
base::SmartArrayPointer<char> name(new char[len]);
memcpy(name.get(), str, len);
return name;
}

7
src/compiler.h
View File

@ -135,8 +135,7 @@ class CompilationInfo {
explicit CompilationInfo(ParseInfo* parse_info);
CompilationInfo(CodeStub* stub, Isolate* isolate, Zone* zone);
CompilationInfo(const char* code_stub_debug_name, Isolate* isolate,
Zone* zone);
CompilationInfo(const char* debug_name, Isolate* isolate, Zone* zone);
virtual ~CompilationInfo();
ParseInfo* parse_info() const { return parse_info_; }
@ -433,7 +432,7 @@ class CompilationInfo {
};
CompilationInfo(ParseInfo* parse_info, CodeStub* code_stub,
const char* code_stub_debug_name, Mode mode, Isolate* isolate,
const char* debug_name, Mode mode, Isolate* isolate,
Zone* zone);
Isolate* isolate_;
@ -503,7 +502,7 @@ class CompilationInfo {
Type::FunctionType* function_type_;
const char* code_stub_debug_name_;
const char* debug_name_;
DISALLOW_COPY_AND_ASSIGN(CompilationInfo);
};