[CHERI] Adjust assertion when building alignment assertions in SelectionDAG to work properly for CHERI.

resistor · resistor · commit 5576cb4e828b · 2025-08-01T22:45:33.000+08:00
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -7216,7 +7216,9 @@ SDValue SelectionDAG::foldConstantFPMath(unsigned Opcode, const SDLoc &DL,
 }
 
 SDValue SelectionDAG::getAssertAlign(const SDLoc &DL, SDValue Val, Align A) {
-  assert(Val.getValueType().isInteger() && "Invalid AssertAlign!");
+  assert(
+      (Val.getValueType().isInteger() || Val.getValueType().isCapability()) &&
+      "Invalid AssertAlign!");
 
   // There's no need to assert on a byte-aligned pointer. All pointers are at
   // least byte aligned.

Original file line number	Diff line number	Diff line change
`@@ -7216,7 +7216,9 @@ SDValue SelectionDAG::foldConstantFPMath(unsigned Opcode, const SDLoc &DL,`
`7216`	`7216`	`}`
`7217`	`7217`
`7218`	`7218`	`SDValue SelectionDAG::getAssertAlign(const SDLoc &DL, SDValue Val, Align A) {`
`7219`		`- assert(Val.getValueType().isInteger() && "Invalid AssertAlign!");`
	`7219`	`+ assert(`
	`7220`	`+ (Val.getValueType().isInteger() \|\| Val.getValueType().isCapability()) &&`
	`7221`	`+ "Invalid AssertAlign!");`
`7220`	`7222`
`7221`	`7223`	`// There's no need to assert on a byte-aligned pointer. All pointers are at`
`7222`	`7224`	`// least byte aligned.`