diff options
| author | 2017-02-14 22:11:34 +0000 | |
|---|---|---|
| committer | 2017-02-14 22:11:35 +0000 | |
| commit | fe35fe172a7d3469ebf1dae9cca7e1ac8aefcba7 (patch) | |
| tree | 3bf964f7786227f8104eeba08fe2e1768109a764 /compiler/optimizing/optimizing_compiler.cc | |
| parent | a0637543dc82dfd54feda7c80da017bd39b1d2d5 (diff) | |
| parent | fa4333dcb481e564f54726b4e6f8153612df835e (diff) | |
Merge "ART: Add operator == and != with nullptr to Handle"
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 727ca7d893..8638e346fb 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -1214,7 +1214,7 @@ bool OptimizingCompiler::JitCompile(Thread* self, Handle<mirror::ObjectArray<mirror::Object>> roots( hs.NewHandle(mirror::ObjectArray<mirror::Object>::Alloc( self, class_linker->GetClassRoot(ClassLinker::kObjectArrayClass), number_of_roots))); - if (roots.Get() == nullptr) { + if (roots == nullptr) { // Out of memory, just clear the exception to avoid any Java exception uncaught problems. DCHECK(self->IsExceptionPending()); self->ClearException(); |