diff --git a/lib/Target/Hexagon/HexagonOperands.td b/lib/Target/Hexagon/HexagonOperands.td
index c68f6c1cc3b..e40520d1548 100644
--- a/lib/Target/Hexagon/HexagonOperands.td
+++ b/lib/Target/Hexagon/HexagonOperands.td
@@ -497,10 +497,7 @@ def s16ExtPred  : PatLeaf<(i32 imm), [{
 
     // Return true if extending this immediate is profitable and the value
     // can fit in a 32-bit signed field.
-    if (isConstExtProfitable(Node) && isInt<32>(v))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node) && isInt<32>(v);
   }
 }]>;
 
@@ -515,10 +512,7 @@ def s10ExtPred  : PatLeaf<(i32 imm), [{
 
     // Return true if extending this immediate is profitable and the value
     // can fit in a 32-bit signed field.
-    if (isConstExtProfitable(Node) && isInt<32>(v))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node) && isInt<32>(v);
   }
 }]>;
 
@@ -533,10 +527,7 @@ def s9ExtPred  : PatLeaf<(i32 imm), [{
 
     // Return true if extending this immediate is profitable and the value
     // can fit in a 32-bit unsigned field.
-    if (isConstExtProfitable(Node) && isInt<32>(v))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node) && isInt<32>(v);
   }
 }]>;
 
@@ -551,10 +542,7 @@ def s8ExtPred  : PatLeaf<(i32 imm), [{
 
     // Return true if extending this immediate is profitable and the value
     // can fit in a 32-bit signed field.
-    if (isConstExtProfitable(Node) && isInt<32>(v))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node) && isInt<32>(v);
   }
 }]>;
 
@@ -570,10 +558,7 @@ def s8_16ExtPred  : PatLeaf<(i32 imm), [{
     // Return true if extending this immediate is profitable and the value
     // can't fit in a 16-bit signed field. This is required to avoid
     // unnecessary constant extenders.
-    if (isConstExtProfitable(Node) && !isInt<16>(v))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node) && !isInt<16>(v);
   }
 }]>;
 
@@ -588,10 +573,7 @@ def s6ExtPred  : PatLeaf<(i32 imm), [{
 
     // Return true if extending this immediate is profitable and the value
     // can fit in a 32-bit unsigned field.
-    if (isConstExtProfitable(Node) && isInt<32>(v))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node) && isInt<32>(v);
   }
 }]>;
 
@@ -607,10 +589,7 @@ def s6_16ExtPred  : PatLeaf<(i32 imm), [{
     // Return true if extending this immediate is profitable and the value
     // can't fit in a 16-bit signed field. This is required to avoid
     // unnecessary constant extenders.
-    if (isConstExtProfitable(Node) && !isInt<16>(v))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node) && !isInt<16>(v);
   }
 }]>;
 
@@ -626,10 +605,7 @@ def s6_10ExtPred  : PatLeaf<(i32 imm), [{
     // Return true if extending this immediate is profitable and the value
     // can't fit in a 10-bit signed field. This is required to avoid
     // unnecessary constant extenders.
-    if (isConstExtProfitable(Node) && !isInt<10>(v))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node) && !isInt<10>(v);
   }
 }]>;
 
@@ -644,10 +620,7 @@ def s11_0ExtPred  : PatLeaf<(i32 imm), [{
 
     // Return true if extending this immediate is profitable and the value
     // can fit in a 32-bit signed field.
-    if (isConstExtProfitable(Node) && isInt<32>(v))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node) && isInt<32>(v);
   }
 }]>;
 
@@ -663,10 +636,7 @@ def s11_1ExtPred  : PatLeaf<(i32 imm), [{
 
     // Return true if extending this immediate is profitable and the low 1 bit
     // is zero (2-byte aligned).
-    if (isConstExtProfitable(Node) && isInt<32>(v) && ((v % 2) == 0))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node) && isInt<32>(v) && ((v % 2) == 0);
   }
 }]>;
 
@@ -682,10 +652,7 @@ def s11_2ExtPred  : PatLeaf<(i32 imm), [{
 
     // Return true if extending this immediate is profitable and the low 2-bits
     // are zero (4-byte aligned).
-    if (isConstExtProfitable(Node)  && isInt<32>(v) && ((v % 4) == 0))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node)  && isInt<32>(v) && ((v % 4) == 0);
   }
 }]>;
 
@@ -701,9 +668,6 @@ def s11_3ExtPred  : PatLeaf<(i32 imm), [{
 
     // Return true if extending this immediate is profitable and the low 3-bits
     // are zero (8-byte aligned).
-    if (isConstExtProfitable(Node)  && isInt<32>(v) && ((v % 8) == 0))
-      return true;
-    else
-      return false;
+    return isConstExtProfitable(Node)  && isInt<32>(v) && ((v % 8) == 0);
   }
 }]>;