summaryrefslogtreecommitdiffstats
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
commit27fddbaf2145eb109b1c5f3d81106454e6a45bbf (patch)
tree2d54271484aed8d216d562d16219a78d14c3f101
parent27aa00155898b1bdee2da52a67c49c5bf00e4230 (diff)
downloadbcm5719-llvm-27fddbaf2145eb109b1c5f3d81106454e6a45bbf.tar.gz
bcm5719-llvm-27fddbaf2145eb109b1c5f3d81106454e6a45bbf.zip
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), ^~~~~~~~~~~~~~~~~~~~~~~~ llvm-svn: 196623
-rw-r--r--llvm/include/llvm/Transforms/Utils/ASanStackFrameLayout.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/include/llvm/Transforms/Utils/ASanStackFrameLayout.h b/llvm/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
index d39088ccb4a..f5437208f91 100644
--- a/llvm/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
+++ b/llvm/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;
OpenPOWER on IntegriCloud