summaryrefslogtreecommitdiff
path: root/include/llvm
diff options
context:
space:
mode:
authorKaelyn Uhrain <rikka@google.com>2013-12-06 23:09:24 +0000
committerKaelyn Uhrain <rikka@google.com>2013-12-06 23:09:24 +0000
commit46af5e8efabfcd57b5872cda3eb10d92ca1780d4 (patch)
tree990e70e98409d51b239b9888782562de967b65b7 /include/llvm
parent7db4f8d9d84371e16577e826ec2d60ba15e293db (diff)
downloadllvm-46af5e8efabfcd57b5872cda3eb10d92ca1780d4.tar.gz
llvm-46af5e8efabfcd57b5872cda3eb10d92ca1780d4.tar.bz2
llvm-46af5e8efabfcd57b5872cda3eb10d92ca1780d4.tar.xz
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
Diffstat (limited to 'include/llvm')
-rw-r--r--include/llvm/Transforms/Utils/ASanStackFrameLayout.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/llvm/Transforms/Utils/ASanStackFrameLayout.h b/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
index d39088ccb4..f5437208f9 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;