Address comments

Author: justinfargnoli

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

@@ -15874,17 +15874,17 @@ SDValue DAGCombiner::visitTRUNCATE(SDNode *N) {
     break;
   }
 
-  if (TLI.isNarrowingProfitable(N0.getNode(), SrcVT, VT)) {
+  if (!LegalOperations || TLI.isOperationLegal(N0.getOpcode(), VT)) {
     switch (N0.getOpcode()) {
     case ISD::ADD:
     case ISD::SUB:
     case ISD::MUL:
     case ISD::AND:
     case ISD::OR:
     case ISD::XOR:
-      if (!(N0.hasOneUse() && VT.isScalarInteger()))
+      if (!N0.hasOneUse() || !VT.isScalarInteger())
         break;
-      if (LegalOperations && !TLI.isOperationLegal(N0.getOpcode(), VT))
+      if (!TLI.isNarrowingProfitable(N0.getNode(), SrcVT, VT))
         break;
       SDValue NarrowL = DAG.getNode(ISD::TRUNCATE, DL, VT, N0.getOperand(0));
       SDValue NarrowR = DAG.getNode(ISD::TRUNCATE, DL, VT, N0.getOperand(1));

llvm/lib/Target/NVPTX/NVPTXISelLowering.h

@@ -156,15 +156,15 @@ class NVPTXTargetLowering : public TargetLowering {
 
   bool isTruncateFree(Type *SrcTy, Type *DstTy) const override {
     // Truncating 64-bit to 32-bit is free in SASS.
-    if (!(SrcTy->isIntegerTy() && DstTy->isIntegerTy()))
+    if (!SrcTy->isIntegerTy() || !DstTy->isIntegerTy())
       return false;
     return SrcTy->getPrimitiveSizeInBits() == 64 &&
            DstTy->getPrimitiveSizeInBits() == 32;
   }
 
   bool isNarrowingProfitable(SDNode *N, EVT SrcVT, EVT DestVT) const override {
     // Truncating 64-bit to 32-bit is free in SASS.
-    if (!(SrcVT.isScalarInteger() && DestVT.isScalarInteger()))
+    if (!SrcVT.isScalarInteger() || !DestVT.isScalarInteger())
       return false;
     return SrcVT.getFixedSizeInBits() == 64 &&
            DestVT.getFixedSizeInBits() == 32;