diff --git a/.clang-format b/.clang-format
index 39a366ebbe9d..41548c63bca0 100644
--- a/.clang-format
+++ b/.clang-format
@@ -24,6 +24,31 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END_INHERITED|\
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED|\
 NS_QUERYFRAME_TAIL.*$"
 
+# Attribute macros used in classes. Workaround for behavior noted at
+# https://github.com/llvm/llvm-project/issues/94184.
+AttributeMacros: [
+    MOZ_STATIC_CLASS,
+    MOZ_STATIC_LOCAL_CLASS,
+    MOZ_STACK_CLASS,
+    MOZ_NONHEAP_CLASS,
+    MOZ_HEAP_CLASS,
+    MOZ_NON_TEMPORARY_CLASS,
+    MOZ_TEMPORARY_CLASS,
+    MOZ_RAII,
+    MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS,
+    MOZ_TRIVIAL_CTOR_DTOR,
+    MOZ_IS_REFPTR,
+    MOZ_IS_SMARTPTR_TO_REFCOUNTED,
+    MOZ_NEEDS_NO_VTABLE_TYPE,
+    MOZ_NON_MEMMOVABLE,
+    MOZ_NEEDS_MEMMOVABLE_TYPE,
+    MOZ_NEEDS_MEMMOVABLE_MEMBERS,
+    MOZ_INHERIT_TYPE_ANNOTATIONS_FROM_TEMPLATE_ARGS,
+    MOZ_NON_PARAM,
+    MOZ_NON_AUTOABLE
+]
+
+
 SortIncludes: false
 IndentPPDirectives: AfterHash
 StatementMacros: [MARKUPMAP, ASSERT_TRUE, ASSERT_FALSE, TEST, CHECK]