diff --git a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
--- a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+++ b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
@@ -5806,6 +5806,22 @@
   llvm_unreachable("Unexpected platform trying to use TLS");
 }
 
+// Looks through \param Val to determine the bit that can be used to
+// check the sign of the value. It returns the unextended value and
+// the sign bit position.
+std::pair<SDValue, uint64_t> lookThroughSignExtension(SDValue Val) {
+  if (Val.getOpcode() == ISD::SIGN_EXTEND_INREG)
+    return {Val.getOperand(0),
+            cast<VTSDNode>(Val.getOperand(1))->getVT().getFixedSizeInBits() -
+                1};
+
+  if (Val.getOpcode() == ISD::SIGN_EXTEND)
+    return {Val.getOperand(0),
+            Val.getOperand(0)->getValueType(0).getFixedSizeInBits() - 1};
+
+  return {Val, Val.getValueSizeInBits() - 1};
+}
+
 SDValue AArch64TargetLowering::LowerBR_CC(SDValue Op, SelectionDAG &DAG) const {
   SDValue Chain = Op.getOperand(0);
   ISD::CondCode CC = cast<CondCodeSDNode>(Op.getOperand(1))->get();
@@ -5900,9 +5916,10 @@
         // Don't combine AND since emitComparison converts the AND to an ANDS
         // (a.k.a. TST) and the test in the test bit and branch instruction
         // becomes redundant.  This would also increase register pressure.
-        uint64_t Mask = LHS.getValueSizeInBits() - 1;
+        uint64_t SignBitPos;
+        std::tie(LHS, SignBitPos) = lookThroughSignExtension(LHS);
         return DAG.getNode(AArch64ISD::TBNZ, dl, MVT::Other, Chain, LHS,
-                           DAG.getConstant(Mask, dl, MVT::i64), Dest);
+                           DAG.getConstant(SignBitPos, dl, MVT::i64), Dest);
       }
     }
     if (RHSC && RHSC->getSExtValue() == -1 && CC == ISD::SETGT &&
@@ -5910,9 +5927,10 @@
       // Don't combine AND since emitComparison converts the AND to an ANDS
       // (a.k.a. TST) and the test in the test bit and branch instruction
       // becomes redundant.  This would also increase register pressure.
-      uint64_t Mask = LHS.getValueSizeInBits() - 1;
+      uint64_t SignBitPos;
+      std::tie(LHS, SignBitPos) = lookThroughSignExtension(LHS);
       return DAG.getNode(AArch64ISD::TBZ, dl, MVT::Other, Chain, LHS,
-                         DAG.getConstant(Mask, dl, MVT::i64), Dest);
+                         DAG.getConstant(SignBitPos, dl, MVT::i64), Dest);
     }
 
     SDValue CCVal;
diff --git a/llvm/test/CodeGen/AArch64/check-sign-bit-before-extension.ll b/llvm/test/CodeGen/AArch64/check-sign-bit-before-extension.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/check-sign-bit-before-extension.ll
@@ -0,0 +1,148 @@
+; RUN: llc -mtriple aarch64-gnu-linux -o -  -asm-verbose=0 %s | FileCheck %s
+
+; These tests make sure that the `cmp` instruction is rendered with an
+; instruction that checks the sign bit of the original unextended data
+; (%in) instead of the sign bit of the sign extended one that is
+; created by the type legalization process.
+;
+; The tests are subdivided in tests that determine the sign bit
+; looking through a `sign_extend_inreg` and tests that determine the
+; sign bit looking through a `sign_extend`.
+
+; CHECK-LABEL: f_i8_sign_extend_inreg:
+; CHECK: tbnz w0, #7, .LBB
+define i32 @f_i8_sign_extend_inreg(i8 %in, i32 %a, i32 %b) nounwind {
+entry:
+  %cmp = icmp sgt i8 %in, -1
+  %ext = zext i8 %in to i32
+  br i1 %cmp, label %A, label %B
+
+A:
+  %retA = add i32 %ext, %a
+  ret i32 %retA
+
+B:
+  %retB = add i32 %ext, %b
+  ret i32 %retB
+}
+
+; CHECK-LABEL: f_i16_sign_extend_inreg:
+; CHECK: tbnz w0, #15, .LBB
+define i32 @f_i16_sign_extend_inreg(i16 %in, i32 %a, i32 %b) nounwind {
+entry:
+  %cmp = icmp sgt i16 %in, -1
+  %ext = zext i16 %in to i32
+  br i1 %cmp, label %A, label %B
+
+A:
+  %retA = add i32 %ext, %a
+  ret i32 %retA
+
+B:
+  %retB = add i32 %ext, %b
+  ret i32 %retB
+}
+
+; CHECK-LABEL: f_i32_sign_extend_inreg:
+; CHECK: tbnz w0, #31, .LBB
+define i64 @f_i32_sign_extend_inreg(i32 %in, i64 %a, i64 %b) nounwind {
+entry:
+  %cmp = icmp sgt i32 %in, -1
+  %ext = zext i32 %in to i64
+  br i1 %cmp, label %A, label %B
+
+A:
+  %retA = add i64 %ext, %a
+  ret i64 %retA
+
+B:
+  %retB = add i64 %ext, %b
+  ret i64 %retB
+}
+
+; CHECK-LABEL: g_i8_sign_extend_inreg:
+; CHECK: tbnz w0, #7, .LBB
+define i32 @g_i8_sign_extend_inreg(i8 %in, i32 %a, i32 %b) nounwind {
+entry:
+  %cmp = icmp slt i8 %in, 0
+  %ext = zext i8 %in to i32
+  br i1 %cmp, label %A, label %B
+
+A:
+  %retA = add i32 %ext, %a
+  ret i32 %retA
+
+B:
+  %retB = add i32 %ext, %b
+  ret i32 %retB
+}
+
+; CHECK-LABEL: g_i16_sign_extend_inreg:
+; CHECK: tbnz w0, #15, .LBB
+define i32 @g_i16_sign_extend_inreg(i16 %in, i32 %a, i32 %b) nounwind {
+entry:
+  %cmp = icmp slt i16 %in, 0
+  %ext = zext i16 %in to i32
+  br i1 %cmp, label %A, label %B
+
+A:
+  %retA = add i32 %ext, %a
+  ret i32 %retA
+
+B:
+  %retB = add i32 %ext, %b
+  ret i32 %retB
+}
+
+; CHECK-LABEL: g_i32_sign_extend_inreg:
+; CHECK: tbnz w0, #31, .LBB
+define i64 @g_i32_sign_extend_inreg(i32 %in, i64 %a, i64 %b) nounwind {
+entry:
+  %cmp = icmp slt i32 %in, 0
+  %ext = zext i32 %in to i64
+  br i1 %cmp, label %A, label %B
+
+A:
+  %retA = add i64 %ext, %a
+  ret i64 %retA
+
+B:
+  %retB = add i64 %ext, %b
+  ret i64 %retB
+}
+
+; CHECK-LABEL: f_i32_sign_extend_i64:
+; CHECK: tbnz w0, #31, .LBB
+define i64 @f_i32_sign_extend_i64(i32 %in, i64 %a, i64 %b) nounwind {
+entry:
+  %inext = sext i32 %in to i64
+  %cmp = icmp sgt i64 %inext, -1
+  %ext = zext i32 %in to i64
+  br i1 %cmp, label %A, label %B
+
+A:
+  %retA = add i64 %ext, %a
+  ret i64 %retA
+
+B:
+  %retB = add i64 %ext, %b
+  ret i64 %retB
+}
+
+; CHECK-LABEL: g_i32_sign_extend_i64:
+; CHECK: tbnz w0, #31, .LBB
+define i64 @g_i32_sign_extend_i64(i32 %in, i64 %a, i64 %b) nounwind {
+entry:
+  %inext = sext i32 %in to i64
+  %cmp = icmp slt i64 %inext, 0
+  %ext = zext i32 %in to i64
+  br i1 %cmp, label %A, label %B
+
+A:
+  %retA = add i64 %ext, %a
+  ret i64 %retA
+
+B:
+  %retB = add i64 %ext, %b
+  ret i64 %retB
+}