diff --git a/flang/lib/Lower/ConvertExpr.cpp b/flang/lib/Lower/ConvertExpr.cpp index 45ac890fd7b93..809dd07716121 100644 --- a/flang/lib/Lower/ConvertExpr.cpp +++ b/flang/lib/Lower/ConvertExpr.cpp @@ -3020,10 +3020,13 @@ class ScalarExprLowering { }; } // namespace +#define CONCAT(x, y) CONCAT2(x, y) +#define CONCAT2(x, y) x##y + // Helper for changing the semantics in a given context. Preserves the current // semantics which is resumed when the "push" goes out of scope. #define PushSemantics(PushVal) \ - [[maybe_unused]] auto pushSemanticsLocalVariable##__LINE__ = \ + [[maybe_unused]] auto CONCAT(pushSemanticsLocalVariable, __LINE__) = \ Fortran::common::ScopedSet(semant, PushVal); static bool isAdjustedArrayElementType(mlir::Type t) {