Skip to content

Commit

Permalink
[WebAssembly] Don't assume that zext/sext result is i32/i64 in fast i…
Browse files Browse the repository at this point in the history
…sel (PR41841)

Usually this will abort fast-isel at the instruction using the
non-legal result, but if the only use is in a different basic block,
we'll incorrectly assume that the zext/sext is to i32 (rather than
i128 in this case).

Differential Revision: https://reviews.llvm.org/D61823

llvm-svn: 360616
  • Loading branch information
nikic authored and alexcrichton committed May 14, 2019
1 parent 84abffd commit eb38a18
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 2 deletions.
10 changes: 8 additions & 2 deletions llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,10 @@ unsigned WebAssemblyFastISel::zeroExtend(unsigned Reg, const Value *V,
return Result;
}

return zeroExtendToI32(Reg, V, From);
if (To == MVT::i32)
return zeroExtendToI32(Reg, V, From);

return 0;
}

unsigned WebAssemblyFastISel::signExtend(unsigned Reg, const Value *V,
Expand All @@ -543,7 +546,10 @@ unsigned WebAssemblyFastISel::signExtend(unsigned Reg, const Value *V,
return Result;
}

return signExtendToI32(Reg, V, From);
if (To == MVT::i32)
return signExtendToI32(Reg, V, From);

return 0;
}

unsigned WebAssemblyFastISel::getRegForUnsignedValue(const Value *V) {
Expand Down
42 changes: 42 additions & 0 deletions llvm/test/CodeGen/WebAssembly/PR41841.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
; RUN: llc < %s -O0 -wasm-disable-explicit-locals -wasm-keep-registers -asm-verbose=false | FileCheck %s

target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
target triple = "wasm32-unknown-unknown"

declare void @foo(i128)

; CHECK-LABEL: test_zext:
; CHECK-NEXT: .functype test_zext (i32) -> (){{$}}
; CHECK-NEXT: i64.extend_i32_u $[[TMP3:[0-9]+]]=, $0{{$}}
; CHECK-NEXT: i64.const $[[TMP4:[0-9]+]]=, 1{{$}}
; CHECK-NEXT: i64.and $[[TMP1:[0-9]+]]=, $[[TMP3]], $[[TMP4]]{{$}}
; CHECK-NEXT: i64.const $[[TMP2:[0-9]+]]=, 0{{$}}
; CHECK-NEXT: call foo, $[[TMP1]], $[[TMP2]]{{$}}
; CHECK-NEXT: return{{$}}
define void @test_zext(i1 %b) nounwind {
%res = zext i1 %b to i128
br label %next

next: ; preds = %start
call void @foo(i128 %res)
ret void
}

; CHECK-LABEL: test_sext:
; CHECK-NEXT:.functype test_sext (i32) -> (){{$}}
; CHECK-NEXT: i64.extend_i32_u $[[TMP3:[0-9]+]]=, $0{{$}}
; CHECK-NEXT: i64.const $[[TMP4:[0-9]+]]=, 1{{$}}
; CHECK-NEXT: i64.and $[[TMP5:[0-9]+]]=, $[[TMP3]], $[[TMP4]]{{$}}
; CHECK-NEXT: i64.const $[[TMP6:[0-9]+]]=, 0{{$}}
; CHECK-NEXT: i64.sub $[[TMP1:[0-9]+]]=, $[[TMP6]], $[[TMP5]]{{$}}
; CHECK-NEXT: local.copy $[[TMP2:[0-9]+]]=, $[[TMP1]]{{$}}
; CHECK-NEXT: call foo, $[[TMP1]], $[[TMP2]]{{$}}
; CHECK-NEXT: return{{$}}
define void @test_sext(i1 %b) nounwind {
%res = sext i1 %b to i128
br label %next

next: ; preds = %start
call void @foo(i128 %res)
ret void
}

0 comments on commit eb38a18

Please sign in to comment.