diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-06-24 17:04:17 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-06-24 20:03:01 -0700 |
| commit | 71e46c1a2e1a8c2ef87b6137e8503dd12e18bb8d (patch) | |
| tree | 4c987a661624c1d7ffea19b2beda45dbfcea73c7 /runtime/gc | |
| parent | 6d20c2e2d88de0116203e2d6ba80b996f858abc1 (diff) | |
| download | art-71e46c1a2e1a8c2ef87b6137e8503dd12e18bb8d.zip art-71e46c1a2e1a8c2ef87b6137e8503dd12e18bb8d.tar.gz art-71e46c1a2e1a8c2ef87b6137e8503dd12e18bb8d.tar.bz2 | |
Fix force copy
We now correctly pass the returned pointer back onto the release functions.
Bug: 22056708
Change-Id: I1a7300d3a4522a3c81b432ec742ae1c0bd00b51e
(cherry picked from commit b735bd9c04aa291d0a1bdc2c0a094a1a75ad0596)
Diffstat (limited to 'runtime/gc')
| -rw-r--r-- | runtime/gc/heap.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index 57557e2..d428267 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -745,7 +745,7 @@ void Heap::IncrementDisableMovingGC(Thread* self) { void Heap::DecrementDisableMovingGC(Thread* self) { MutexLock mu(self, *gc_complete_lock_); - CHECK_GE(disable_moving_gc_count_, 0U); + CHECK_GT(disable_moving_gc_count_, 0U); --disable_moving_gc_count_; } |