================
@@ -18699,6 +18699,15 @@ bool 
Sema::CheckOverridingFunctionAttributes(CXXMethodDecl *New,
           QualType ModQT = Context.getFunctionType(NewFT->getReturnType(),
                                                    NewFT->getParamTypes(), 
EPI);
           New->setType(ModQT);
+          if (Errs.empty()) {
+            // A warning here is somewhat pedantic, in a different warning
+            // group. Skip this if there was already a merge conflict, which is
+            // more serious.
----------------
Sirraide wrote:

```suggestion
            // A warning here is somewhat pedantic. Skip this if there was 
already 
            // a merge conflict, which is more serious.
```
The code here doesn’t really care about warning groups.

https://github.com/llvm/llvm-project/pull/148690
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to