1 files changed, 7 insertions, 0 deletions
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 49227e9195..aa7bb0812a 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -2333,6 +2333,7 @@ unsigned FunctionDecl::getMemoryFunctionKind() const {
     return Builtin::BIstrncasecmp;
 
   case Builtin::BI__builtin_strncat:
+  case Builtin::BI__builtin___strncat_chk:
   case Builtin::BIstrncat:
     return Builtin::BIstrncat;
 
@@ -2340,6 +2341,10 @@ unsigned FunctionDecl::getMemoryFunctionKind() const {
   case Builtin::BIstrndup:
     return Builtin::BIstrndup;
 
+  case Builtin::BI__builtin_strlen:
+  case Builtin::BIstrlen:
+    return Builtin::BIstrlen;
+
   default:
     if (isExternC()) {
       if (FnInfo->isStr("memset"))
@@ -2360,6 +2365,8 @@ unsigned FunctionDecl::getMemoryFunctionKind() const {
         return Builtin::BIstrncat;
       else if (FnInfo->isStr("strndup"))
         return Builtin::BIstrndup;
+      else if (FnInfo->isStr("strlen"))
+        return Builtin::BIstrlen;
     }
     break;
   }