6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-29 10:25:12 +00:00
Code Issues Projects Releases Wiki Activity

[SimplifyLibCalls] Fix negative shifts being produced by the memchr -> bitfield transform.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232903 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer
2015-03-21 22:04:26 +00:00
parent fd48a80e14
commit 42a84b54bf
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Transforms/Utils/SimplifyLibCalls.cpp
View File

@@ -782,7 +782,9 @@ Value *LibCallSimplifier::optimizeMemChr(CallInst *CI, IRBuilder<> &B) {
// memchr("\r\n", C, 2) != nullptr -> (C & ((1 << '\r') | (1 << '\n'))) != 0 // memchr("\r\n", C, 2) != nullptr -> (C & ((1 << '\r') | (1 << '\n'))) != 0
// after bounds check. // after bounds check.
if (!CharC && !Str.empty() && isOnlyUsedInZeroEqualityComparison(CI)) { if (!CharC && !Str.empty() && isOnlyUsedInZeroEqualityComparison(CI)) {
unsigned char Max = *std::max_element(Str.begin(), Str.end()); unsigned char Max =
*std::max_element(reinterpret_cast<const unsigned char *>(Str.begin()),
reinterpret_cast<const unsigned char *>(Str.end()));
// Make sure the bit field we're about to create fits in a register on the // Make sure the bit field we're about to create fits in a register on the
// target. // target.

12
test/Transforms/InstCombine/memchr.ll
View File

@@ -9,6 +9,7 @@ target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f3
@newlines = constant [3 x i8] c"\0D\0A\00" @newlines = constant [3 x i8] c"\0D\0A\00"
@single = constant [2 x i8] c"\1F\00" @single = constant [2 x i8] c"\1F\00"
@spaces = constant [4 x i8] c" \0D\0A\00" @spaces = constant [4 x i8] c" \0D\0A\00"
@negative = constant [3 x i8] c"\FF\FE\00"
@chp = global i8* zeroinitializer @chp = global i8* zeroinitializer
declare i8* @memchr(i8*, i32, i32) declare i8* @memchr(i8*, i32, i32)
@@ -186,3 +187,14 @@ define i1 @test14(i32 %C) {
%cmp = icmp ne i8* %dst, null %cmp = icmp ne i8* %dst, null
ret i1 %cmp ret i1 %cmp
} }
define i1 @test15(i32 %C) {
; CHECK-LABEL: @test15
; CHECK-NEXT: %dst = call i8* @memchr(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @negative, i32 0, i32 0), i32 %C, i32 3)
; CHECK-NEXT: %cmp = icmp ne i8* %dst, null
; CHECK-NEXT: ret i1 %cmp
%dst = call i8* @memchr(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @negative, i64 0, i64 0), i32 %C, i32 3)
%cmp = icmp ne i8* %dst, null
ret i1 %cmp
}