commit a700a7516982c7f059e098933592cd7358c190bf
author Vladimir Marko <vmarko@google.com> Thu Oct 20 09:59:32 2022 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 20 11:54:41 2022 +0000
tree 20b37686ab6cc6056a2ca68537887b9e00e4c337
parent 29730bd23468cf16fc232a2bdd13edc89b6eccff

Fix wrong operator (`||` -> `&&`).

Test: testrunner.py --host --interpreter --no-image
Bug: 253570082
Change-Id: Ic1c5f250bcc7cffd5c6ad6f7d538dfa7b563e231

runtime/common_throws.cc

diff --git a/runtime/common_throws.cc b/runtime/common_throws.cc
index b898d11..031cedd 100644
--- a/runtime/common_throws.cc
+++ b/runtime/common_throws.cc
@@ -726,7 +726,7 @@
     // TODO: Initialize these classes during `ClassLinker` initialization to avoid doing it here.
     auto ensure_initialized = [self](Handle<mirror::Class> klass)
         REQUIRES_SHARED(Locks::mutator_lock_) {
-      if (UNLIKELY(!klass->IsVisiblyInitialized()) ||
+      if (UNLIKELY(!klass->IsVisiblyInitialized()) &&
           UNLIKELY(!Runtime::Current()->GetClassLinker()->EnsureInitialized(
                         self, klass, /*can_init_fields=*/ true, /*can_init_parents=*/ true))) {
         LOG(WARNING) << "Failed to initialize class " << klass->PrettyDescriptor();