[llvm] r275922 - Fix -Wreturn-type with gcc 4.8 and libc++

[Matt Arsenault via llvm-commits]

Author: arsenm
Date: Mon Jul 18 17:12:46 2016
New Revision: 275922

URL: http://llvm.org/viewvc/llvm-project?rev=275922&view=rev
Log:
Fix -Wreturn-type with gcc 4.8 and libc++

Modified:
    llvm/trunk/lib/IR/Attributes.cpp

Modified: llvm/trunk/lib/IR/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Attributes.cpp?rev=275922&r1=275921&r2=275922&view=diff
==============================================================================
--- llvm/trunk/lib/IR/Attributes.cpp (original)
+++ llvm/trunk/lib/IR/Attributes.cpp Mon Jul 18 17:12:46 2016
@@ -1158,7 +1158,7 @@ uint64_t AttributeSet::getDereferenceabl
 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 {