diff options
| author | 2015-11-14 02:15:09 +0000 | |
|---|---|---|
| committer | 2015-11-14 02:15:09 +0000 | |
| commit | dd4cbcc924c8ba2a578914a4a366996693bdcd74 (patch) | |
| tree | 2fe66e258de36bcebc913d48e04468b7c639578f /runtime/runtime.cc | |
| parent | 0e06a0989f4fc53e0d281a5a2cb5b5a17feaea0c (diff) | |
| parent | 04302dbb106d590ff72c0dfecda23d85b6565059 (diff) | |
Merge "Fix class unloading with the CC collector."
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 17f34c0e21..92a56a9b6e 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -820,6 +820,7 @@ static size_t OpenDexFiles(const std::vector<std::string>& dex_filenames, void Runtime::SetSentinel(mirror::Object* sentinel) { CHECK(sentinel_.Read() == nullptr); CHECK(sentinel != nullptr); + CHECK(!heap_->IsMovableObject(sentinel)); sentinel_ = GcRoot<mirror::Object>(sentinel); } |