diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-04-21 16:50:40 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-04-22 12:44:27 -0700 |
| commit | 2cebb24bfc3247d3e9be138a3350106737455918 (patch) | |
| tree | d04d27d21b3c7733d784e303f01f873bb99e7770 /runtime/stack.h | |
| parent | 1f02f1a7b3073b8fef07770a67fbf94afad317f0 (diff) | |
| download | art-2cebb24bfc3247d3e9be138a3350106737455918.zip art-2cebb24bfc3247d3e9be138a3350106737455918.tar.gz art-2cebb24bfc3247d3e9be138a3350106737455918.tar.bz2 | |
Replace NULL with nullptr
Also fixed some lines that were too long, and a few other minor
details.
Change-Id: I6efba5fb6e03eb5d0a300fddb2a75bf8e2f175cb
Diffstat (limited to 'runtime/stack.h')
| -rw-r--r-- | runtime/stack.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/stack.h b/runtime/stack.h index fbb0aa4..ed9e458 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -295,11 +295,12 @@ class ShadowFrame { } StackReference<mirror::Object>* References() { - return const_cast<StackReference<mirror::Object>*>(const_cast<const ShadowFrame*>(this)->References()); + return const_cast<StackReference<mirror::Object>*>( + const_cast<const ShadowFrame*>(this)->References()); } const uint32_t number_of_vregs_; - // Link to previous shadow frame or NULL. + // Link to previous shadow frame or null. ShadowFrame* link_; mirror::ArtMethod* method_; uint32_t dex_pc_; @@ -571,7 +572,8 @@ class StackVisitor { * Special temporaries may have custom locations and the logic above deals with that. * However, non-special temporaries are placed relative to the outs. */ - int temps_start = sizeof(StackReference<mirror::ArtMethod>) + code_item->outs_size_ * sizeof(uint32_t); + int temps_start = sizeof(StackReference<mirror::ArtMethod>) + + code_item->outs_size_ * sizeof(uint32_t); int relative_offset = (reg - (temp_threshold + max_num_special_temps)) * sizeof(uint32_t); return temps_start + relative_offset; } else if (reg < num_regs) { |