commit 690d909ce1a37cf290ee6558f857a62b4179f10e
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Wed May 24 01:38:00 2017 +0000
committer Argyrios Kyrtzidis <kyrtzidis@apple.com> Tue May 23 18:38:49 2017 -0700
tree 30f88c1bf53d298ec02e1477abf2e68b03e9bf9c
parent a2b0fff7c7412cc68595f8af3a9f2fe93e7690b0

Change __has_feature(objc_diagnose_if_attr) to __has_feature(attribute_diagnose_if_objc) for consistency with rest of attribute checks.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@303713 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Lex/PPMacroExpansion.cpp

diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index b070772..e8e48d4 100644
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/lib/Lex/PPMacroExpansion.cpp
@@ -1126,6 +1126,7 @@
       .Case("attribute_overloadable", true)
       .Case("attribute_unavailable_with_message", true)
       .Case("attribute_unused_on_fields", true)
+      .Case("attribute_diagnose_if_objc", true)
       .Case("blocks", LangOpts.Blocks)
       .Case("c_thread_safety_attributes", true)
       .Case("cxx_exceptions", LangOpts.CXXExceptions)
@@ -1168,7 +1169,6 @@
       .Case("objc_generics", LangOpts.ObjC2)
       .Case("objc_generics_variance", LangOpts.ObjC2)
       .Case("objc_class_property", LangOpts.ObjC2)
-      .Case("objc_diagnose_if_attr", LangOpts.ObjC2)
       // C11 features
       .Case("c_alignas", LangOpts.C11)
       .Case("c_alignof", LangOpts.C11)

test/SemaObjC/diagnose_if.m

diff --git a/test/SemaObjC/diagnose_if.m b/test/SemaObjC/diagnose_if.m
index 7b3eabb..9f281e4 100644
--- a/test/SemaObjC/diagnose_if.m
+++ b/test/SemaObjC/diagnose_if.m
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 %s -verify -fno-builtin
 
-_Static_assert(__has_feature(objc_diagnose_if_attr), "feature check failed?");
+_Static_assert(__has_feature(attribute_diagnose_if_objc), "feature check failed?");
 
 #define _diagnose_if(...) __attribute__((diagnose_if(__VA_ARGS__)))