commit 4df72b8a198e2d649c6be76628d80d984cc33395
author Stephen Hines <srhines@google.com> Tue Jul 15 21:41:06 2014 -0700
committer Stephen Hines <srhines@google.com> Fri Jul 25 00:39:10 2014 -0700
tree dd44f985f82d972bdf340daa7510ec44b033c4cf
parent c0dcf29143051cf34d6c032a7b385ac4579bd4ec

Remove errors/warnings from tautological comparisons.

Change-Id: I2728b08d55abccd14c111c6c9da93068d4e14275

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 9548022..dbae7dd 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -766,15 +766,11 @@
 }
 
 void Heap::RegisterGCAllocation(size_t bytes) {
-  if (this != nullptr) {
-    gc_memory_overhead_.FetchAndAddSequentiallyConsistent(bytes);
-  }
+  gc_memory_overhead_.FetchAndAddSequentiallyConsistent(bytes);
 }
 
 void Heap::RegisterGCDeAllocation(size_t bytes) {
-  if (this != nullptr) {
-    gc_memory_overhead_.FetchAndSubSequentiallyConsistent(bytes);
-  }
+  gc_memory_overhead_.FetchAndSubSequentiallyConsistent(bytes);
 }
 
 void Heap::DumpGcPerformanceInfo(std::ostream& os) {
@@ -1147,9 +1143,6 @@
 }
 
 void Heap::VerifyObjectBody(mirror::Object* obj) {
-  if (this == nullptr && verify_object_mode_ == kVerifyObjectModeDisabled) {
-    return;
-  }
   // Ignore early dawn of the universe verifications.
   if (UNLIKELY(static_cast<size_t>(num_bytes_allocated_.LoadRelaxed()) < 10 * KB)) {
     return;