commit a691e34c57ce0c67ad69a549cc98a6e432ee8ea3
author Krzysztof Kosiński <krzysio@google.com> Fri Oct 07 21:58:43 2022 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 14 13:58:23 2022 +0000
tree 1fd84c15b88c1ab63099b02963b22caf119dc3c4
parent 645d7c94c75f7bb51461864ca013e62602d4173c

Fix some clang-tidy warnings.

- Local variables marked const cannot use NRVO.
- Merge identical if statements with identical bodies.

Test: presubmit
Change-Id: I7b0d7c864ec9d84a31d950b943f303ecfb249d51

runtime/subtype_check.h

diff --git a/runtime/subtype_check.h b/runtime/subtype_check.h
index ca1feb5..45ca84b 100644
--- a/runtime/subtype_check.h
+++ b/runtime/subtype_check.h
@@ -382,12 +382,12 @@
     if (UNLIKELY(!klass->HasSuperClass())) {
       // Object root always goes directly from Uninitialized -> Assigned.
 
-      const SubtypeCheckInfo root_sci = GetSubtypeCheckInfo(klass);
+      SubtypeCheckInfo root_sci = GetSubtypeCheckInfo(klass);
       if (root_sci.GetState() != SubtypeCheckInfo::kUninitialized) {
         return root_sci;  // No change needed.
       }
 
-      const SubtypeCheckInfo new_root_sci = root_sci.CreateRoot();
+      SubtypeCheckInfo new_root_sci = root_sci.CreateRoot();
       SetSubtypeCheckInfo(klass, new_root_sci);
 
       // The object root is always in the Uninitialized|Assigned state.

runtime/subtype_check_info.h

diff --git a/runtime/subtype_check_info.h b/runtime/subtype_check_info.h
index 05afd76..eef68d7 100644
--- a/runtime/subtype_check_info.h
+++ b/runtime/subtype_check_info.h
@@ -168,9 +168,8 @@
   //
   // Normally, return kSubtypeOf or kNotSubtypeOf.
   Result IsSubtypeOf(const SubtypeCheckInfo& target) {
-    if (target.GetState() != SubtypeCheckInfo::kAssigned) {
-      return Result::kUnknownSubtypeOf;
-    } else if (GetState() == SubtypeCheckInfo::kUninitialized) {
+    if (target.GetState() != SubtypeCheckInfo::kAssigned ||
+        GetState() == SubtypeCheckInfo::kUninitialized) {
       return Result::kUnknownSubtypeOf;
     }