diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-19 21:19:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-19 21:19:55 +0000 |
| commit | 047c11adcbcbc0bcf210defdfcbada763961ffee (patch) | |
| tree | bd7cc7f7744c49047b47815494ad337135ff7968 /runtime | |
| parent | 47687a4643b2d8f950a280a5e1298c277da127aa (diff) | |
| parent | 13bf2e6a6c14bccf5377998b7568100ffd417f8e (diff) | |
| download | android_art-047c11adcbcbc0bcf210defdfcbada763961ffee.tar.gz android_art-047c11adcbcbc0bcf210defdfcbada763961ffee.tar.bz2 android_art-047c11adcbcbc0bcf210defdfcbada763961ffee.zip | |
Merge "Check and log a to-space overflow explicitly."
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/gc/collector/semi_space.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/gc/collector/semi_space.cc b/runtime/gc/collector/semi_space.cc index 95a2c96091..d4e26ab083 100644 --- a/runtime/gc/collector/semi_space.cc +++ b/runtime/gc/collector/semi_space.cc @@ -590,6 +590,7 @@ mirror::Object* SemiSpace::MarkNonForwardedObject(mirror::Object* obj) { // If it's allocated after the last GC (younger), copy it to the to-space. forward_address = to_space_->AllocThreadUnsafe(self_, object_size, &bytes_allocated, nullptr); } + CHECK(forward_address != nullptr) << "Out of memory in the to-space."; ++objects_moved_; bytes_moved_ += bytes_allocated; // Copy over the object and add it to the mark stack since we still need to update its |