From: Craig Topper <craig.topper@gmail.com>
Date: Tue, 1 Dec 2015 06:12:59 +0000 (+0000)
Subject: Use array_lengthof instead of manually calculating it. NFC
X-Git-Tag: android-x86-7.1-r4~40809
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9654ce949f87b5e7713504ad79fb6bee41b3ce1c;p=android-x86%2Fexternal-llvm.git

Use array_lengthof instead of manually calculating it. NFC

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254380 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Support/Unix/Signals.inc b/lib/Support/Unix/Signals.inc
index de98d4adf99..061cdb3da21 100644
--- a/lib/Support/Unix/Signals.inc
+++ b/lib/Support/Unix/Signals.inc
@@ -86,12 +86,11 @@ static unsigned NumRegisteredSignals = 0;
 static struct {
   struct sigaction SA;
   int SigNo;
-} RegisteredSignalInfo[(sizeof(IntSigs)+sizeof(KillSigs))/sizeof(KillSigs[0])];
+} RegisteredSignalInfo[array_lengthof(IntSigs) + array_lengthof(KillSigs)];
 
 
 static void RegisterHandler(int Signal) {
-  assert(NumRegisteredSignals <
-         sizeof(RegisteredSignalInfo)/sizeof(RegisteredSignalInfo[0]) &&
+  assert(NumRegisteredSignals < array_lengthof(RegisteredSignalInfo) &&
          "Out of space for signal handlers!");
 
   struct sigaction NewHandler;