From: Kaelyn Uhrain <rikka@google.com>
Date: Fri, 6 Dec 2013 23:09:24 +0000 (+0000)
Subject: Fix a narrowing warning due to a type mismatch (size_t vs uint64).
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=46af5e8efabfcd57b5872cda3eb10d92ca1780d4;p=oota-llvm.git

Fix a narrowing warning due to a type mismatch (size_t vs uint64).

lib/Transforms/Instrumentation/AddressSanitizer.cpp:1405:36: error: non-constant-expression cannot be narrowed from type 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
    getAllocaSizeInBytes(AI),
    ^~~~~~~~~~~~~~~~~~~~~~~~

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

diff --git a/include/llvm/Transforms/Utils/ASanStackFrameLayout.h b/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
index d39088ccb4a..f5437208f91 100644
--- a/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
+++ b/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
@@ -29,7 +29,7 @@ static const int kAsanStackRightRedzoneMagic = 0xf3;
 struct ASanStackVariableDescription {
   const char *Name;  // Name of the variable that will be displayed by asan
                      // if a stack-related bug is reported.
-  size_t Size;       // Size of the variable in bytes.
+  uint64_t Size;     // Size of the variable in bytes.
   size_t Alignment;  // Alignment of the variable (power of 2).
   AllocaInst *AI;    // The actual AllocaInst.
   size_t Offset;     // Offset from the beginning of the frame;