[compiler-rt] [NFC][sanitizer] Remove #elif to simplify ThreadDescriptorSizeFallback (PR #108911)

[Vitaly Buka via llvm-commits]

https://github.com/vitalybuka updated https://github.com/llvm/llvm-project/pull/108911

>From 508dd1d5234797e5c7f4d52532ee5ec389fdd3f5 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Mon, 16 Sep 2024 19:20:02 -0700
Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20change?=
 =?UTF-8?q?s=20to=20main=20this=20commit=20is=20based=20on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Created using spr 1.3.4

[skip ci]
---
 .../sanitizer_linux_libcdep.cpp               | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
index 8983ae5b6a69b7..a5101291904430 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
@@ -259,26 +259,26 @@ static uptr ThreadDescriptorSizeFallback() {
     if (SANITIZER_X32)
       return 1728;  // Assume only one particular version for x32.
     // For ARM sizeof(struct pthread) changed in Glibc 2.23.
-    else if (SANITIZER_ARM)
+    if (SANITIZER_ARM)
       return minor <= 22 ? 1120 : 1216;
-    else if (minor <= 3)
+    if (minor <= 3)
       return FIRST_32_SECOND_64(1104, 1696);
-    else if (minor == 4)
+    if (minor == 4)
       return FIRST_32_SECOND_64(1120, 1728);
-    else if (minor == 5)
+    if (minor == 5)
       return FIRST_32_SECOND_64(1136, 1728);
-    else if (minor <= 9)
+    if (minor <= 9)
       return FIRST_32_SECOND_64(1136, 1712);
-    else if (minor == 10)
+    if (minor == 10)
       return FIRST_32_SECOND_64(1168, 1776);
-    else if (minor == 11 || (minor == 12 && patch == 1))
+    if (minor == 11 || (minor == 12 && patch == 1))
       return FIRST_32_SECOND_64(1168, 2288);
-    else if (minor <= 14)
+    if (minor <= 14)
       return FIRST_32_SECOND_64(1168, 2304);
-    else if (minor < 32)  // Unknown version
+    if (minor < 32)  // Unknown version
       return FIRST_32_SECOND_64(1216, 2304);
-    else  // minor == 32
-      return FIRST_32_SECOND_64(1344, 2496);
+    // minor == 32
+    return FIRST_32_SECOND_64(1344, 2496);
   }
   return 0;
 #    elif defined(__s390__) || defined(__sparc__)
@@ -302,10 +302,9 @@ static uptr ThreadDescriptorSizeFallback() {
     // glibc version
     if (minor <= 28)  // WARNING: the highest tested version is 2.29
       return 1772;    // no guarantees for this one
-    else if (minor <= 31)
+    if (minor <= 31)
       return 1772;  // tested against glibc 2.29, 2.31
-    else
-      return 1936;  // tested against glibc 2.32
+    return 1936;    // tested against glibc 2.32
   }
   return 0;
 #    elif defined(__aarch64__)