Skip to content

Commit 7e58d0d

Browse files
committed
Revert "[arm][darwin] Don't generate libcalls for wide shifts on Darwin"
This reverts commit 2ba016c. This is causing a failure on the clang-cmake-armv7-full bot, and there are outstanding review comments.
1 parent 69c5ff4 commit 7e58d0d

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

llvm/lib/Target/ARM/ARMISelLowering.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17956,8 +17956,7 @@ bool ARMTargetLowering::isCheapToSpeculateCtlz() const {
1795617956
}
1795717957

1795817958
bool ARMTargetLowering::shouldExpandShift(SelectionDAG &DAG, SDNode *N) const {
17959-
return !Subtarget->hasMinSize() || Subtarget->isTargetWindows() ||
17960-
Subtarget->isTargetDarwin();
17959+
return !Subtarget->hasMinSize() || Subtarget->isTargetWindows();
1796117960
}
1796217961

1796317962
Value *ARMTargetLowering::emitLoadLinked(IRBuilder<> &Builder, Value *Addr,

llvm/test/CodeGen/ARM/shift_minsize.ll

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
; RUN: llc -mtriple=arm-eabi %s -o - | FileCheck %s
22
; RUN: llc -mtriple=thumbv7-windows %s -o - | FileCheck %s -check-prefix=CHECK-WIN
3-
; RUN: llc < %s -mtriple=aarch64-apple-darwin | FileCheck %s -check-prefix=CHECK-DARWIN
43

54
; The Windows runtime doesn't have these.
65
; CHECK-WIN-NOT: __ashldi3
76
; CHECK-WIN-NOT: __ashrdi3
87
; CHECK-WIN-NOT: __lshrdi3
98

10-
; Darwin compiler-rt excludes these.
11-
; CHECK-DARWIN-NOT: __ashlti3
12-
; CHECK-DARWIN-NOT: __ashrti3
13-
149
define i64 @f0(i64 %val, i64 %amt) minsize optsize {
1510
; CHECK-LABEL: f0:
1611
; CHECK: bl __aeabi_llsl

0 commit comments

Comments
 (0)