diff --git a/clang/include/clang/Parse/AttributeList.h b/clang/include/clang/Parse/AttributeList.h
index c5b058202c10..7775981baf53 100644
--- a/clang/include/clang/Parse/AttributeList.h
+++ b/clang/include/clang/Parse/AttributeList.h
@@ -56,7 +56,6 @@ public:
     AT_fastcall,
     AT_format,
     AT_IBOutlet,          // Clang-specific.
-    AT_malloc,
     AT_mode,
     AT_noinline,
     AT_nonnull,
diff --git a/clang/lib/Parse/AttributeList.cpp b/clang/lib/Parse/AttributeList.cpp
index 352869957a5f..5b70a5908db9 100644
--- a/clang/lib/Parse/AttributeList.cpp
+++ b/clang/lib/Parse/AttributeList.cpp
@@ -60,11 +60,11 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) {
     break;
   case 5:
     if (!memcmp(Str, "alias", 5)) return AT_alias;
-    if (!memcmp(Str, "const", 5)) return IgnoredAttribute;  // FIXME!
+    if (!memcmp(Str, "const", 5)) return AT_const;
     break;
   case 6:
     if (!memcmp(Str, "packed", 6)) return AT_packed;
-    if (!memcmp(Str, "malloc", 6)) return AT_malloc;
+    if (!memcmp(Str, "malloc", 6)) return IgnoredAttribute;
     if (!memcmp(Str, "format", 6)) return AT_format;
     if (!memcmp(Str, "unused", 6)) return AT_unused;
     if (!memcmp(Str, "blocks", 6)) return AT_blocks;