Skip to content

Commit 0b5d510

Browse files
tshortlitshortli
committed
Tests: Adopt Clang availability domain declaration macros.
NFC.
1 parent 7ac68ce commit 0b5d510

File tree

7 files changed

+23
-50
lines changed

7 files changed

+23
-50
lines changed

‎test/ClangImporter/Inputs/availability_domains_bridging_header.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
#include <feature-availability.h>
2-
3-
static struct __AvailabilityDomain bay_bridge
4-
__attribute__((availability_domain(BayBridge))) = {
5-
__AVAILABILITY_DOMAIN_ENABLED, 0};
6-
static struct __AvailabilityDomain golden_gate_bridge
7-
__attribute__((availability_domain(GoldenGateBridge))) = {
8-
__AVAILABILITY_DOMAIN_DISABLED, 0};
1+
#include <availability_domain.h>
2+
3+
CLANG_DISABLED_AVAILABILITY_DOMAIN(BayBridge);
4+
CLANG_DISABLED_AVAILABILITY_DOMAIN(GoldenGateBridge);
95

106
#define AVAIL 0
117
#define UNAVAIL 1

‎test/IRGen/Inputs/AvailabilityDomains.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
#include <feature-availability.h>
2-
3-
static struct __AvailabilityDomain __EnabledDomain __attribute__((
4-
availability_domain(EnabledDomain))) = {__AVAILABILITY_DOMAIN_ENABLED, 0};
5-
6-
static struct __AvailabilityDomain __DisabledDomain __attribute__((
7-
availability_domain(DisabledDomain))) = {__AVAILABILITY_DOMAIN_DISABLED, 0};
1+
#include <availability_domain.h>
82

93
int dynamic_domain_pred();
104

11-
static struct __AvailabilityDomain __DynamicDomain
12-
__attribute__((availability_domain(DynamicDomain))) = {
13-
__AVAILABILITY_DOMAIN_DYNAMIC, dynamic_domain_pred};
5+
CLANG_ENABLED_AVAILABILITY_DOMAIN(EnabledDomain);
6+
CLANG_DISABLED_AVAILABILITY_DOMAIN(DisabledDomain);
7+
CLANG_DYNAMIC_AVAILABILITY_DOMAIN(DynamicDomain, dynamic_domain_pred);
148

159
#define AVAIL 0
1610
#define UNAVAIL 1

‎test/Inputs/custom-modules/availability-domains/Lakes.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#include <feature-availability.h>
1+
#include <availability_domain.h>
22

3-
static struct __AvailabilityDomain salt_domain __attribute__((
4-
availability_domain(Salt))) = {__AVAILABILITY_DOMAIN_ENABLED, 0};
3+
CLANG_ENABLED_AVAILABILITY_DOMAIN(Salt);
54

65
#define AVAIL 0
76
#define UNAVAIL 1

‎test/Inputs/custom-modules/availability-domains/Oceans.h‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
#include <Rivers.h>
2-
#include <feature-availability.h>
2+
#include <availability_domain.h>
33

44
int arctic_pred(void);
55
int pacific_pred(void);
66

7-
static struct __AvailabilityDomain arctic_domain
8-
__attribute__((availability_domain(Arctic))) = {
9-
__AVAILABILITY_DOMAIN_DYNAMIC, arctic_pred};
10-
static struct __AvailabilityDomain pacific_domain
11-
__attribute__((availability_domain(Pacific))) = {
12-
__AVAILABILITY_DOMAIN_DYNAMIC, pacific_pred};
7+
CLANG_DYNAMIC_AVAILABILITY_DOMAIN(Arctic, arctic_pred);
8+
CLANG_DYNAMIC_AVAILABILITY_DOMAIN(Pacific, pacific_pred);
139

1410
#define AVAIL 0
1511
#define UNAVAIL 1

‎test/Inputs/custom-modules/availability-domains/Rivers.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
#include <feature-availability.h>
1+
#include <availability_domain.h>
22

3-
static struct __AvailabilityDomain colorado_domain __attribute__((
4-
availability_domain(Colorado))) = {__AVAILABILITY_DOMAIN_DISABLED, 0};
3+
CLANG_DISABLED_AVAILABILITY_DOMAIN(Colorado);
54

65
__attribute__((deprecated("Use Colorado instead")))
7-
static struct __AvailabilityDomain grand_domain __attribute__((
8-
availability_domain(Grand))) = {__AVAILABILITY_DOMAIN_DISABLED, 0};
6+
CLANG_DISABLED_AVAILABILITY_DOMAIN(Grand);
97

108
#define AVAIL 0
119
#define UNAVAIL 1

‎test/Inputs/custom-modules/availability-domains/Seas.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
#include <feature-availability.h>
1+
#include <availability_domain.h>
22

3-
static struct __AvailabilityDomain baltic_domain __attribute__((
4-
availability_domain(Baltic))) = {__AVAILABILITY_DOMAIN_ENABLED, 0};
5-
static struct __AvailabilityDomain _mediterranean __attribute__((
6-
availability_domain(Mediterranean))) = {__AVAILABILITY_DOMAIN_ENABLED, 0};
3+
CLANG_ENABLED_AVAILABILITY_DOMAIN(Baltic);
4+
CLANG_DISABLED_AVAILABILITY_DOMAIN(Mediterranean);
75

86
#define AVAIL 0
97
#define UNAVAIL 1

‎test/SILGen/Inputs/AvailabilityDomains.h‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
1-
#include <feature-availability.h>
2-
3-
static struct __AvailabilityDomain __EnabledDomain
4-
__attribute__((availability_domain(EnabledDomain))) = {
5-
__AVAILABILITY_DOMAIN_ENABLED, 0};
6-
7-
static struct __AvailabilityDomain __DisabledDomain
8-
__attribute__((availability_domain(DisabledDomain))) = {
9-
__AVAILABILITY_DOMAIN_DISABLED, 0};
1+
#include <availability_domain.h>
102

113
int dynamic_domain_pred();
124

13-
static struct __AvailabilityDomain __DynamicDomain
14-
__attribute__((availability_domain(DynamicDomain))) = {
15-
__AVAILABILITY_DOMAIN_DYNAMIC, dynamic_domain_pred};
5+
CLANG_ENABLED_AVAILABILITY_DOMAIN(EnabledDomain);
6+
CLANG_DISABLED_AVAILABILITY_DOMAIN(DisabledDomain);
7+
CLANG_DYNAMIC_AVAILABILITY_DOMAIN(DynamicDomain, dynamic_domain_pred);
168

179
#define AVAIL 0
1810
#define UNAVAIL 1

0 commit comments

Comments
 (0)