Work around an unfortunate macro in the Windows SDK

[zahen]

Summary

Rename LLVM's single use of CALLBACK as a template parameter to work around the Windows SDK #define CALLBACK __stdcall

I'm sympathetic to the Michael Bolton argument but these are the only 2 lines affected in all of LLVM.

Once accepted I'll need someone to commit the change on my behalf.

[aaron.ballman]

Once accepted I'll need someone to commit the change on my behalf.

Thanks for mentioning this up front! What email address and name would you like to have used for attribution on the commit?

clang/include/clang/Analysis/CFG.h

1392–1393

Good catch on fixing this! I think a better fix would be to change the name CALLBACK to Callback to more closely match our usual naming conventions (https://llvm.org/docs/CodingStandards.html#name-types-functions-variables-and-enumerators-properly). Keeping it in all caps makes the identifier look like a macro when it isn't one. You might as well address the clang-format issue while you're touching the code, as well.

[zahen]

Updated the macro based on Aaron's suggestion. clang-formatted the function.

[zahen]

In D101776#2736003, @aaron.ballman wrote:

Once accepted I'll need someone to commit the change on my behalf.

Thanks for mentioning this up front! What email address and name would you like to have used for attribution on the commit?

Zachary Henkel, [e-mail] (GitHub username ZacharyHenkel)

[aaron.ballman]

LGTM!

[aaron.ballman]

Thank you for the fix! I've committed on your behalf in 54bff1522fc863329894d875d54c2fe4cd1b4f3f

clang/include/clang/Analysis/CFG.h

public:
   synthetic_stmt_range synthetic_stmts() const {
     return synthetic_stmt_range(synthetic_stmt_begin(), synthetic_stmt_end());
   }
 
   //===--------------------------------------------------------------------===//
   // Member templates useful for various batch operations over CFGs.
   //===--------------------------------------------------------------------===//
 
-  template <typename CALLBACK>
-  void VisitBlockStmts(CALLBACK& O) const {
+  template <typename CALLBACKFN>
+  void VisitBlockStmts(CALLBACKFN& O) const {
     for (const_iterator I = begin(), E = end(); I != E; ++I)
       for (CFGBlock::const_iterator BI = (*I)->begin(), BE = (*I)->end();
            BI != BE; ++BI) {
         if (Optional<CFGStmt> stmt = BI->getAs<CFGStmt>())
           O(const_cast<Stmt*>(stmt->getStmt()));
       }
   }