Return nullptr in mergeModularFormatAttr

mysterymath · mysterymath · commit f951d6d08a98 · 2025-12-02T16:09:52.000-08:00
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -6992,9 +6992,7 @@ Sema::mergeModularFormatAttr(Decl *D, const AttributeCommonInfo &CI,
       Diag(Existing->getLocation(), diag::err_duplicate_attribute) << *Existing;
       Diag(CI.getLoc(), diag::note_conflicting_attribute);
     }
-    // Drop the existing attribute on the declaration in favor of the newly
-    // inherited one.
-    D->dropAttr<ModularFormatAttr>();
+    return nullptr;
   }
   return ::new (Context) ModularFormatAttr(Context, CI, ModularImplFn, ImplName,
                                            Aspects.data(), Aspects.size());

Original file line number	Diff line number	Diff line change
`@@ -6992,9 +6992,7 @@ Sema::mergeModularFormatAttr(Decl *D, const AttributeCommonInfo &CI,`
`6992`	`6992`	`Diag(Existing->getLocation(), diag::err_duplicate_attribute) << *Existing;`
`6993`	`6993`	`Diag(CI.getLoc(), diag::note_conflicting_attribute);`
`6994`	`6994`	`}`
`6995`		`- // Drop the existing attribute on the declaration in favor of the newly`
`6996`		`- // inherited one.`
`6997`		`- D->dropAttr<ModularFormatAttr>();`
	`6995`	`+ return nullptr;`
`6998`	`6996`	`}`
`6999`	`6997`	`return ::new (Context) ModularFormatAttr(Context, CI, ModularImplFn, ImplName,`
`7000`	`6998`	`Aspects.data(), Aspects.size());`