summaryrefslogtreecommitdiffstats
path: root/llvm/lib/IR/Attributes.cpp
diff options
context:
space:
mode:
authorMatt Arsenault <Matthew.Arsenault@amd.com>2016-07-18 22:12:46 +0000
committerMatt Arsenault <Matthew.Arsenault@amd.com>2016-07-18 22:12:46 +0000
commit4ced16dd2efd1793bd5c294c807d75737a06e7f6 (patch)
tree6e5cf3ea00ebe4c0083587da1184098270400301 /llvm/lib/IR/Attributes.cpp
parent0bd990758184c47d006f0f4dbc0ab9ac74c39100 (diff)
downloadbcm5719-llvm-4ced16dd2efd1793bd5c294c807d75737a06e7f6.tar.gz
bcm5719-llvm-4ced16dd2efd1793bd5c294c807d75737a06e7f6.zip
Fix -Wreturn-type with gcc 4.8 and libc++
llvm-svn: 275922
Diffstat (limited to 'llvm/lib/IR/Attributes.cpp')
-rw-r--r--llvm/lib/IR/Attributes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/IR/Attributes.cpp b/llvm/lib/IR/Attributes.cpp
index d774c1ae9df..4dfeacfbbfc 100644
--- a/llvm/lib/IR/Attributes.cpp
+++ b/llvm/lib/IR/Attributes.cpp
@@ -1158,7 +1158,7 @@ uint64_t AttributeSet::getDereferenceableOrNullBytes(unsigned Index) const {
std::pair<unsigned, Optional<unsigned>>
AttributeSet::getAllocSizeArgs(unsigned Index) const {
AttributeSetNode *ASN = getAttributes(Index);
- return ASN ? ASN->getAllocSizeArgs() : std::make_pair(0, 0);
+ return ASN ? ASN->getAllocSizeArgs() : std::make_pair(0u, Optional<unsigned>(0u));
}
std::string AttributeSet::getAsString(unsigned Index, bool InAttrGrp) const {
OpenPOWER on IntegriCloud