Skip to content

Commit 2ed16aa

Browse files
committed
[X86] Use TargetConstant instead of Constant for operands to X86vaarg64.
1 parent f2c25c7 commit 2ed16aa

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

llvm/lib/Target/X86/X86ISelLowering.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24294,9 +24294,10 @@ SDValue X86TargetLowering::LowerVAARG(SDValue Op, SelectionDAG &DAG) const {
2429424294

2429524295
// Insert VAARG_64 node into the DAG
2429624296
// VAARG_64 returns two values: Variable Argument Address, Chain
24297-
SDValue InstOps[] = {Chain, SrcPtr, DAG.getConstant(ArgSize, dl, MVT::i32),
24298-
DAG.getConstant(ArgMode, dl, MVT::i8),
24299-
DAG.getConstant(Align, dl, MVT::i32)};
24297+
SDValue InstOps[] = {Chain, SrcPtr,
24298+
DAG.getTargetConstant(ArgSize, dl, MVT::i32),
24299+
DAG.getTargetConstant(ArgMode, dl, MVT::i8),
24300+
DAG.getTargetConstant(Align, dl, MVT::i32)};
2430024301
SDVTList VTs = DAG.getVTList(getPointerTy(DAG.getDataLayout()), MVT::Other);
2430124302
SDValue VAARG = DAG.getMemIntrinsicNode(
2430224303
X86ISD::VAARG_64, dl, VTs, InstOps, MVT::i64, MachinePointerInfo(SV),

llvm/lib/Target/X86/X86InstrCompiler.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def VAARG_64 : I<0, Pseudo,
8989
(ins i8mem:$ap, i32imm:$size, i8imm:$mode, i32imm:$align),
9090
"#VAARG_64 $dst, $ap, $size, $mode, $align",
9191
[(set GR64:$dst,
92-
(X86vaarg64 addr:$ap, imm:$size, imm:$mode, imm:$align)),
92+
(X86vaarg64 addr:$ap, timm:$size, timm:$mode, timm:$align)),
9393
(implicit EFLAGS)]>;
9494

9595

0 commit comments

Comments
 (0)