aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/clang/Parse/AttributeList.h1
-rw-r--r--lib/Parse/AttributeList.cpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/include/clang/Parse/AttributeList.h b/include/clang/Parse/AttributeList.h
index c5b058202c..7775981baf 100644
--- a/include/clang/Parse/AttributeList.h
+++ b/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/lib/Parse/AttributeList.cpp b/lib/Parse/AttributeList.cpp
index 352869957a..5b70a5908d 100644
--- a/lib/Parse/AttributeList.cpp
+++ b/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;