From: Dean Michael Berris <dberris@google.com>
Date: Mon, 19 Dec 2016 03:47:35 +0000 (+0000)
Subject: [XRay][compiler-rt] Explicitly include <cstdint> for types
X-Git-Tag: llvmorg-4.0.0-rc1~1730
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4527ebecb6f1b50858182565ab09018d0415c001;p=platform%2Fupstream%2Fllvm.git

[XRay][compiler-rt] Explicitly include <cstdint> for types

This is an attempt to un-break the ARM7, AArch64 builds.

Follow-up on D25360.

llvm-svn: 290078
---

diff --git a/compiler-rt/lib/xray/xray_inmemory_log.cc b/compiler-rt/lib/xray/xray_inmemory_log.cc
index fc1cfd7..7ec56f4 100644
--- a/compiler-rt/lib/xray/xray_inmemory_log.cc
+++ b/compiler-rt/lib/xray/xray_inmemory_log.cc
@@ -16,6 +16,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <cassert>
+#include <cstdint>
 #include <cstdio>
 #include <fcntl.h>
 #include <mutex>
@@ -113,8 +114,7 @@ static int __xray_OpenLogFile() XRAY_NEVER_INSTRUMENT {
   static char TmpWildcardPattern[] = "XXXXXX";
   auto E = internal_strncat(TmpFilename, flags()->xray_logfile_base,
                             sizeof(TmpFilename) - 10);
-  if (static_cast<size_t>((E + 6) - TmpFilename) >
-      (sizeof(TmpFilename) - 1)) {
+  if (static_cast<size_t>((E + 6) - TmpFilename) > (sizeof(TmpFilename) - 1)) {
     Report("XRay log file base too long: %s\n", flags()->xray_logfile_base);
     return -1;
   }