[Alignment][NFC] TargetCallingConv::setByValAlign

gchatelet · gchatelet · commit 0e61c30e7d91 · 2019-10-21T12:05:33.000Z
Summary: This is patch is part of a series to introduce an Alignment type. See this thread for context: http://lists.llvm.org/pipermail/llvm-dev/2019-July/133851.html See this patch for the introduction of the type: https://reviews.llvm.org/D64790 Reviewers: courbet Subscribers: hiraditya, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D69248 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@375410 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/CodeGen/TargetCallingConv.h b/include/llvm/CodeGen/TargetCallingConv.h
@@ -125,9 +125,9 @@ namespace ISD {
       MaybeAlign A = decodeMaybeAlign(ByValAlign);
       return A ? A->value() : 0;
     }
-    void setByValAlign(unsigned A) {
-      ByValAlign = encode(Align(A));
-      assert(getByValAlign() == A && "bitfield overflow");
+    void setByValAlign(Align A) {
+      ByValAlign = encode(A);
+      assert(getByValAlign() == A.value() && "bitfield overflow");
     }
 
     unsigned getOrigAlign() const {
diff --git a/lib/CodeGen/GlobalISel/CallLowering.cpp b/lib/CodeGen/GlobalISel/CallLowering.cpp
@@ -106,7 +106,7 @@ void CallLowering::setArgFlags(CallLowering::ArgInfo &Arg, unsigned OpIdx,
       FrameAlign = FuncInfo.getParamAlignment(OpIdx - 2);
     else
       FrameAlign = getTLI()->getByValTypeAlignment(ElementTy, DL);
-    Flags.setByValAlign(FrameAlign);
+    Flags.setByValAlign(Align(FrameAlign));
   }
   if (Attrs.hasAttribute(OpIdx, Attribute::Nest))
     Flags.setNest();
diff --git a/lib/CodeGen/SelectionDAG/FastISel.cpp b/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -1213,7 +1213,7 @@ bool FastISel::lowerCallTo(CallLoweringInfo &CLI) {
       if (!FrameAlign)
         FrameAlign = TLI.getByValTypeAlignment(ElementTy, DL);
       Flags.setByValSize(FrameSize);
-      Flags.setByValAlign(FrameAlign);
+      Flags.setByValAlign(Align(FrameAlign));
     }
     if (Arg.IsNest)
       Flags.setNest();
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -9164,7 +9164,7 @@ TargetLowering::LowerCallTo(TargetLowering::CallLoweringInfo &CLI) const {
           FrameAlign = Args[i].Alignment;
         else
           FrameAlign = getByValTypeAlignment(ElementTy, DL);
-        Flags.setByValAlign(FrameAlign);
+        Flags.setByValAlign(Align(FrameAlign));
       }
       if (Args[i].IsNest)
         Flags.setNest();
@@ -9668,7 +9668,7 @@ void SelectionDAGISel::LowerArguments(const Function &F) {
           FrameAlign = Arg.getParamAlignment();
         else
           FrameAlign = TLI->getByValTypeAlignment(ElementTy, DL);
-        Flags.setByValAlign(FrameAlign);
+        Flags.setByValAlign(Align(FrameAlign));
       }
       if (Arg.hasAttribute(Attribute::Nest))
         Flags.setNest();

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,9 @@ namespace ISD {`
`125`	`125`	`MaybeAlign A = decodeMaybeAlign(ByValAlign);`
`126`	`126`	`return A ? A->value() : 0;`
`127`	`127`	`}`
`128`		`- void setByValAlign(unsigned A) {`
`129`		`- ByValAlign = encode(Align(A));`
`130`		`- assert(getByValAlign() == A && "bitfield overflow");`
	`128`	`+ void setByValAlign(Align A) {`
	`129`	`+ ByValAlign = encode(A);`
	`130`	`+ assert(getByValAlign() == A.value() && "bitfield overflow");`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`unsigned getOrigAlign() const {`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ void CallLowering::setArgFlags(CallLowering::ArgInfo &Arg, unsigned OpIdx,`
`106`	`106`	`FrameAlign = FuncInfo.getParamAlignment(OpIdx - 2);`
`107`	`107`	`else`
`108`	`108`	`FrameAlign = getTLI()->getByValTypeAlignment(ElementTy, DL);`
`109`		`- Flags.setByValAlign(FrameAlign);`
	`109`	`+ Flags.setByValAlign(Align(FrameAlign));`
`110`	`110`	`}`
`111`	`111`	`if (Attrs.hasAttribute(OpIdx, Attribute::Nest))`
`112`	`112`	`Flags.setNest();`
Original file line number	Diff line number	Diff line change
`@@ -1213,7 +1213,7 @@ bool FastISel::lowerCallTo(CallLoweringInfo &CLI) {`
`1213`	`1213`	`if (!FrameAlign)`
`1214`	`1214`	`FrameAlign = TLI.getByValTypeAlignment(ElementTy, DL);`
`1215`	`1215`	`Flags.setByValSize(FrameSize);`
`1216`		`- Flags.setByValAlign(FrameAlign);`
	`1216`	`+ Flags.setByValAlign(Align(FrameAlign));`
`1217`	`1217`	`}`
`1218`	`1218`	`if (Arg.IsNest)`
`1219`	`1219`	`Flags.setNest();`