[NVPTX] NFC: remove make pair and early return

gonzalobg · gonzalobg · commit c702fb1a8772 · 2024-09-13T13:47:49.000-07:00
diff --git a/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp b/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp
@@ -955,10 +955,7 @@ NVPTX::Scope NVPTXDAGToDAGISel::getOperationScope(MemSDNode *N,
       Subtarget->failIfClustersUnsupported("cluster scope");
 
     // If operation is volatile, then its scope is system.
-    if (N->isVolatile())
-      S = NVPTX::Scope::System;
-
-    return S;
+    return N->isVolatile() ? NVPTX::Scope::System : S;
   }
 }
 
@@ -1083,7 +1080,7 @@ NVPTXDAGToDAGISel::insertMemoryInstructionFence(SDLoc DL, SDValue &Chain,
         formatv("Unexpected fence ordering: \"{}\".",
                 OrderingToString(NVPTX::Ordering(FenceOrdering))));
   }
-  return std::make_pair(InstructionOrdering, Scope);
+  return {InstructionOrdering, Scope};
 }
 
 bool NVPTXDAGToDAGISel::tryIntrinsicNoChain(SDNode *N) {

Original file line number	Diff line number	Diff line change
`@@ -955,10 +955,7 @@ NVPTX::Scope NVPTXDAGToDAGISel::getOperationScope(MemSDNode *N,`
`955`	`955`	`Subtarget->failIfClustersUnsupported("cluster scope");`
`956`	`956`
`957`	`957`	`// If operation is volatile, then its scope is system.`
`958`		`- if (N->isVolatile())`
`959`		`- S = NVPTX::Scope::System;`
`960`		`-`
`961`		`- return S;`
	`958`	`+ return N->isVolatile() ? NVPTX::Scope::System : S;`
`962`	`959`	`}`
`963`	`960`	`}`
`964`	`961`
`@@ -1083,7 +1080,7 @@ NVPTXDAGToDAGISel::insertMemoryInstructionFence(SDLoc DL, SDValue &Chain,`
`1083`	`1080`	`formatv("Unexpected fence ordering: \"{}\".",`
`1084`	`1081`	`OrderingToString(NVPTX::Ordering(FenceOrdering))));`
`1085`	`1082`	`}`
`1086`		`- return std::make_pair(InstructionOrdering, Scope);`
	`1083`	`+ return {InstructionOrdering, Scope};`
`1087`	`1084`	`}`
`1088`	`1085`
`1089`	`1086`	`bool NVPTXDAGToDAGISel::tryIntrinsicNoChain(SDNode *N) {`