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

resistor · resistor · commit 789449515e00 · 2025-08-05T02:08:25.000+08:00
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -7400,7 +7400,9 @@ SDValue SelectionDAG::FoldConstantBuildVector(BuildVectorSDNode *BV,
 }
 
 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
`@@ -7400,7 +7400,9 @@ SDValue SelectionDAG::FoldConstantBuildVector(BuildVectorSDNode *BV,`
`7400`	`7400`	`}`
`7401`	`7401`
`7402`	`7402`	`SDValue SelectionDAG::getAssertAlign(const SDLoc &DL, SDValue Val, Align A) {`
`7403`		`- assert(Val.getValueType().isInteger() && "Invalid AssertAlign!");`
	`7403`	`+ assert(`
	`7404`	`+ (Val.getValueType().isInteger() \|\| Val.getValueType().isCapability()) &&`
	`7405`	`+ "Invalid AssertAlign!");`
`7404`	`7406`
`7405`	`7407`	`// There's no need to assert on a byte-aligned pointer. All pointers are at`
`7406`	`7408`	`// least byte aligned.`