Author: arphaman
Date: Wed Mar 20 13:02:00 2019
New Revision: 356605
URL: http://llvm.org/viewvc/llvm-project?rev=356605&view=rev
Log:
Fix implicit ios -> watchOS availability version mapping for
versions that have the major number only
rdar://48018651
Modified:
cfe/trunk/lib/Sema/SemaDeclAttr.cpp
cfe/trunk/test/Sema/attr-availability-watchos.c
Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=356605&r1=356604&r2=356605&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Wed Mar 20 13:02:00 2019
@@ -2508,6 +2508,7 @@ static void handleAvailabilityAttr(Sema
else
return VersionTuple(NewMajor, Version.getMinor().getValue());
}
+ return VersionTuple(NewMajor);
}
return VersionTuple(2, 0);
Modified: cfe/trunk/test/Sema/attr-availability-watchos.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/attr-availability-watchos.c?rev=356605&r1=356604&r2=356605&view=diff
==============================================================================
--- cfe/trunk/test/Sema/attr-availability-watchos.c (original)
+++ cfe/trunk/test/Sema/attr-availability-watchos.c Wed Mar 20 13:02:00 2019
@@ -52,3 +52,9 @@ void test_watchos() {
f5c_watchos(0); // expected-warning {{'f5c_watchos' is deprecated: first
deprecated in watchOS 2.0}}
f6_watchos(0); // expected-warning {{'f6_watchos' is deprecated: first
deprecated in watchOS 3.0}}
}
+
+void deprecatedAfterIntroduced()
__attribute__((availability(ios,introduced=9.3,deprecated=10))); //
expected-note {{here}}
+
+void test_ios_correctly_map_to_watchos() {
+ deprecatedAfterIntroduced(); // expected-warning
{{'deprecatedAfterIntroduced' is deprecated: first deprecated in watchOS 3}}
+}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
