Chromium Code Reviews| Index: src/compiler.cc |
| diff --git a/src/compiler.cc b/src/compiler.cc |
| index 35c581f6b09b2bdb09fc3edb499e15ced5005e43..4ab16c5750b052ac0ae2d541ce423feffe4d2423 100644 |
| --- a/src/compiler.cc |
| +++ b/src/compiler.cc |
| @@ -221,33 +221,21 @@ void CompilationInfo::RollbackDependencies() { |
| int CompilationInfo::num_parameters() const { |
| - if (IsStub()) { |
| - DCHECK(parameter_count_ > 0); |
| - return parameter_count_; |
| - } else { |
| - return scope()->num_parameters(); |
| - } |
| + return scope() == nullptr ? parameter_count_ : scope()->num_parameters(); |
|
titzer
2015/03/18 09:25:53
Maybe we should have a has_scope() predicate?
Sven Panne
2015/03/18 10:40:08
Done.
|
| } |
| int CompilationInfo::num_heap_slots() const { |
| - if (IsStub()) { |
| - return 0; |
| - } else { |
| - return scope()->num_heap_slots(); |
| - } |
| + return scope() == nullptr ? 0 : scope()->num_heap_slots(); |
| } |
| Code::Flags CompilationInfo::flags() const { |
| - if (IsStub()) { |
| - return Code::ComputeFlags(code_stub()->GetCodeKind(), |
| - code_stub()->GetICState(), |
| - code_stub()->GetExtraICState(), |
| - code_stub()->GetStubType()); |
| - } else { |
| - return Code::ComputeFlags(Code::OPTIMIZED_FUNCTION); |
| - } |
| + return code_stub() != nullptr |
| + ? Code::ComputeFlags( |
| + code_stub()->GetCodeKind(), code_stub()->GetICState(), |
| + code_stub()->GetExtraICState(), code_stub()->GetStubType()) |
| + : Code::ComputeFlags(Code::OPTIMIZED_FUNCTION); |
| } |