SILOptimizer: rename ANALYSIS macro to SIL_ANALYSIS

Avoids a conflict with clang's `ANALYSIS` macro.

Fixes a macro redefinition warning.

Author: eeckstein

include/swift/SILOptimizer/Analysis/Analysis.def

@@ -17,36 +17,36 @@
 //
 //===----------------------------------------------------------------------===//
 
-/// ANALYSIS(NAME) This represents the name of an analysis. It is assumed that
-///                the actual analysis is called `NAME ## ANALYSIS'.
-#ifndef ANALYSIS
-#define ANALYSIS(NAME)
+/// SIL_ANALYSIS(NAME) This represents the name of an analysis. It is assumed that
+///                    the actual analysis is called `NAME ## Analysis'.
+#ifndef SIL_ANALYSIS
+#error "SIL_ANALYSIS macro must be defined"
 #endif
 
-ANALYSIS(AccessSummary)
-ANALYSIS(AccessStorage)
-ANALYSIS(Alias)
-ANALYSIS(BasicCallee)
-ANALYSIS(Caller)
-ANALYSIS(ClassHierarchy)
-ANALYSIS(ClosureScope)
-ANALYSIS(Destructor)
-ANALYSIS(DifferentiableActivity)
-ANALYSIS(Dominance)
-ANALYSIS(EpilogueARC)
-ANALYSIS(Escape)
-ANALYSIS(InductionVariable)
-ANALYSIS(Loop)
-ANALYSIS(LoopRegion)
-ANALYSIS(NonLocalAccessBlock)
-ANALYSIS(OptimizerStats)
-ANALYSIS(PostDominance)
-ANALYSIS(PostOrder)
-ANALYSIS(ProtocolConformance)
-ANALYSIS(RCIdentity)
-ANALYSIS(SideEffect)
-ANALYSIS(TypeExpansion)
-ANALYSIS(PassManagerVerifier)
-ANALYSIS(DeadEndBlocks)
+SIL_ANALYSIS(AccessSummary)
+SIL_ANALYSIS(AccessStorage)
+SIL_ANALYSIS(Alias)
+SIL_ANALYSIS(BasicCallee)
+SIL_ANALYSIS(Caller)
+SIL_ANALYSIS(ClassHierarchy)
+SIL_ANALYSIS(ClosureScope)
+SIL_ANALYSIS(Destructor)
+SIL_ANALYSIS(DifferentiableActivity)
+SIL_ANALYSIS(Dominance)
+SIL_ANALYSIS(EpilogueARC)
+SIL_ANALYSIS(Escape)
+SIL_ANALYSIS(InductionVariable)
+SIL_ANALYSIS(Loop)
+SIL_ANALYSIS(LoopRegion)
+SIL_ANALYSIS(NonLocalAccessBlock)
+SIL_ANALYSIS(OptimizerStats)
+SIL_ANALYSIS(PostDominance)
+SIL_ANALYSIS(PostOrder)
+SIL_ANALYSIS(ProtocolConformance)
+SIL_ANALYSIS(RCIdentity)
+SIL_ANALYSIS(SideEffect)
+SIL_ANALYSIS(TypeExpansion)
+SIL_ANALYSIS(PassManagerVerifier)
+SIL_ANALYSIS(DeadEndBlocks)
 
-#undef ANALYSIS
+#undef SIL_ANALYSIS

include/swift/SILOptimizer/Analysis/Analysis.h

@@ -27,7 +27,7 @@ class SILPassManager;
 /// A list of the known analysis.
 struct SILAnalysisKind {
   enum InnerTy {
-#define ANALYSIS(NAME) NAME,
+#define SIL_ANALYSIS(NAME) NAME,
 #include "Analysis.def"
   } value;
 
@@ -334,7 +334,7 @@ class LazyFunctionInfo {
   FunctionInfoTy *operator->() { return *this; }
 };
 
-#define ANALYSIS(NAME) SILAnalysis *create##NAME##Analysis(SILModule *);
+#define SIL_ANALYSIS(NAME) SILAnalysis *create##NAME##Analysis(SILModule *);
 #include "Analysis.def"
 
 } // end namespace swift

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -327,7 +327,7 @@ SILPassManager::SILPassManager(SILModule *M, bool isMandatory,
     : Mod(M), IRMod(IRMod),
       swiftPassInvocation(this),
       isMandatory(isMandatory), deserializationNotificationHandler(nullptr) {
-#define ANALYSIS(NAME) \
+#define SIL_ANALYSIS(NAME) \
   Analyses.push_back(create##NAME##Analysis(Mod));
 #include "swift/SILOptimizer/Analysis/Analysis.def"