Author: Alexandros Lamprineas Date: 2024-08-01T09:02:41+02:00 New Revision: 196fb42d2ef10cc6b3c9732c2612d2cd2973d340
URL: https://github.com/llvm/llvm-project/commit/196fb42d2ef10cc6b3c9732c2612d2cd2973d340 DIFF: https://github.com/llvm/llvm-project/commit/196fb42d2ef10cc6b3c9732c2612d2cd2973d340.diff LOG: Changes fro last revision: Combined two separate SME_PState bitmask checks into one as suggested. Added: Modified: clang/lib/Sema/SemaDecl.cpp Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 4dc72063e54c0..01231f8e385ef 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -11160,11 +11160,10 @@ bool Sema::areMultiversionVariantFunctionsCompatible( if (OldFPT && NewFPT) { unsigned Diff = OldFPT->getAArch64SMEAttributes() ^ NewFPT->getAArch64SMEAttributes(); - // Streaming versions cannot be mixed with non-streaming versions. - if (Diff & FunctionType::SME_PStateSMEnabledMask) - ArmStreamingCCMismatched = true; - // Streaming-compatible versions cannot be mixed with anything else. - if (Diff & FunctionType::SME_PStateSMCompatibleMask) + // Arm-streaming, arm-streaming-compatible and non-streaming versions + // cannot be mixed. + if (Diff & (FunctionType::SME_PStateSMEnabledMask | + FunctionType::SME_PStateSMCompatibleMask)) ArmStreamingCCMismatched = true; } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits