Add warnings for a compartment call returning void to a DiagGroup

CHERIoT-Platform · Dec 12, 2024 · 66b2672 · 66b2672
1 parent f007235
commit 66b2672
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td
@@ -158,10 +158,11 @@ def CHERIPrototypesStrict: DiagGroup<"cheri-prototypes-strict">;
 // Remarks about setting/not setting subobject bounds
 def CheriSubobjectBoundsSuspicous : DiagGroup<"cheri-subobject-bounds-suspicious">;
 def CheriSubobjectBoundsRemarks : DiagGroup<"cheri-subobject-bounds">;
+def CHERICompartmentReturnVoid : DiagGroup<"cheri-compartment-return-void">;
 
 def CheriAll : DiagGroup<"cheri",
      [CHERICaps, CHERIBitwiseOps, CHERIMisaligned, CHERIImplicitConversion, CheriSubobjectBoundsSuspicous,
-      CHERIProvenance, CHERIImplicitConversionSign, CHERIPrototypes]>;
+      CHERIProvenance, CHERIImplicitConversionSign, CHERIPrototypes, CHERICompartmentReturnVoid]>;
 // CHERI warnings that are too noisy to turn on by default
 def CHERICapabilityToIntegerCast : DiagGroup<"capability-to-integer-cast">;
 def CheriPedantic : DiagGroup<"cheri-pedantic", [CHERICapabilityToIntegerCast, CHERIPrototypesStrict, CHERIProvenancePedantic]>;

diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2337,10 +2337,12 @@ def note_in_reference_temporary_list_initializer : Note<
 def note_var_fixit_add_initialization : Note<
   "initialize the variable %0 to silence this warning">;
 def warn_cheri_compartment_void_return_type : Warning <
-  "void return on a cross-compartment call make it impossible for callers to detect failure">;
+  "void return on a cross-compartment call make it impossible for callers to detect failure">,
+  InGroup<CHERICompartmentReturnVoid>;
 def note_cheri_compartment_void_return_type : Note<"replace void return type with int">;
 def warn_cheri_compartment_return_void_or_falloff : Warning <
-  "Cross-compartement calls that always succeed should return 0 instead">;
+  "Cross-compartement calls that always succeed should return 0 instead">,
+  InGroup<CHERICompartmentReturnVoid>;
 def note_uninit_fixit_remove_cond : Note<
   "remove the %select{'%1' if its condition|condition if it}0 "
   "is always %select{false|true}2">;