compiler: properly implement div and rem operations
The division and remainder operations were lowered directly to LLVM IR. This is wrong however because the Go specification defines exactly what happens on a divide by zero or signed integer overflow and LLVM IR itself treats those cases as undefined behavior. Therefore, this commit implements divide by zero and signed integer overflow according to the Go specification. This does have an impact on the generated code, but it is surprisingly small. I've used the drivers repo to test the code before and after, and to my surprise most driver smoke tests are not changed at all. Those that are, have only a small increase in code size. At the same time, this change makes TinyGo more compliant to the Go specification.
Этот коммит содержится в:
родитель
f99c600ad8
коммит
86f1e6aec4
7 изменённых файлов: 169 добавлений и 10 удалений
|
@ -253,6 +253,19 @@ func (b *builder) createNegativeShiftCheck(shift llvm.Value) {
|
|||
b.createRuntimeAssert(isNegative, "shift", "negativeShiftPanic")
|
||||
}
|
||||
|
||||
// createDivideByZeroCheck asserts that y is not zero. If it is, a runtime panic
|
||||
// will be emitted. This follows the Go specification which says that a divide
|
||||
// by zero must cause a run time panic.
|
||||
func (b *builder) createDivideByZeroCheck(y llvm.Value) {
|
||||
if b.info.nobounds {
|
||||
return
|
||||
}
|
||||
|
||||
// isZero = y == 0
|
||||
isZero := b.CreateICmp(llvm.IntEQ, y, llvm.ConstInt(y.Type(), 0, false), "")
|
||||
b.createRuntimeAssert(isZero, "divbyzero", "divideByZeroPanic")
|
||||
}
|
||||
|
||||
// createRuntimeAssert is a common function to create a new branch on an assert
|
||||
// bool, calling an assert func if the assert value is true (1).
|
||||
func (b *builder) createRuntimeAssert(assert llvm.Value, blockPrefix, assertFunc string) {
|
||||
|
|
|
@ -23,7 +23,7 @@ import (
|
|||
// Version of the compiler pacakge. Must be incremented each time the compiler
|
||||
// package changes in a way that affects the generated LLVM module.
|
||||
// This version is independent of the TinyGo version number.
|
||||
const Version = 21 // last change: add nounwind attribute
|
||||
const Version = 22 // last change: check for divide by zero
|
||||
|
||||
func init() {
|
||||
llvm.InitializeAllTargets()
|
||||
|
@ -2005,17 +2005,58 @@ func (b *builder) createBinOp(op token.Token, typ, ytyp types.Type, x, y llvm.Va
|
|||
return b.CreateSub(x, y, ""), nil
|
||||
case token.MUL: // *
|
||||
return b.CreateMul(x, y, ""), nil
|
||||
case token.QUO: // /
|
||||
case token.QUO, token.REM: // /, %
|
||||
// Check for a divide by zero. If y is zero, the Go
|
||||
// specification says that a runtime error must be triggered.
|
||||
b.createDivideByZeroCheck(y)
|
||||
|
||||
if signed {
|
||||
return b.CreateSDiv(x, y, ""), nil
|
||||
// Deal with signed division overflow.
|
||||
// The LLVM LangRef says:
|
||||
//
|
||||
// Overflow also leads to undefined behavior; this is a
|
||||
// rare case, but can occur, for example, by doing a
|
||||
// 32-bit division of -2147483648 by -1.
|
||||
//
|
||||
// The Go specification however says this about division:
|
||||
//
|
||||
// The one exception to this rule is that if the dividend
|
||||
// x is the most negative value for the int type of x, the
|
||||
// quotient q = x / -1 is equal to x (and r = 0) due to
|
||||
// two's-complement integer overflow.
|
||||
//
|
||||
// In other words, in the special case that the lowest
|
||||
// possible signed integer is divided by -1, the result of
|
||||
// the division is the same as x (the dividend).
|
||||
// This is implemented by checking for this condition and
|
||||
// changing y to 1 if it occurs, for example for 32-bit
|
||||
// ints:
|
||||
//
|
||||
// if x == -2147483648 && y == -1 {
|
||||
// y = 1
|
||||
// }
|
||||
//
|
||||
// Dividing x by 1 obviously returns x, therefore satisfying
|
||||
// the Go specification without a branch.
|
||||
llvmType := x.Type()
|
||||
minusOne := llvm.ConstSub(llvm.ConstInt(llvmType, 0, false), llvm.ConstInt(llvmType, 1, false))
|
||||
lowestInteger := llvm.ConstInt(x.Type(), 1<<(llvmType.IntTypeWidth()-1), false)
|
||||
yIsMinusOne := b.CreateICmp(llvm.IntEQ, y, minusOne, "")
|
||||
xIsLowestInteger := b.CreateICmp(llvm.IntEQ, x, lowestInteger, "")
|
||||
hasOverflow := b.CreateAnd(yIsMinusOne, xIsLowestInteger, "")
|
||||
y = b.CreateSelect(hasOverflow, llvm.ConstInt(llvmType, 1, true), y, "")
|
||||
|
||||
if op == token.QUO {
|
||||
return b.CreateSDiv(x, y, ""), nil
|
||||
} else {
|
||||
return b.CreateSRem(x, y, ""), nil
|
||||
}
|
||||
} else {
|
||||
return b.CreateUDiv(x, y, ""), nil
|
||||
}
|
||||
case token.REM: // %
|
||||
if signed {
|
||||
return b.CreateSRem(x, y, ""), nil
|
||||
} else {
|
||||
return b.CreateURem(x, y, ""), nil
|
||||
if op == token.QUO {
|
||||
return b.CreateUDiv(x, y, ""), nil
|
||||
} else {
|
||||
return b.CreateURem(x, y, ""), nil
|
||||
}
|
||||
}
|
||||
case token.AND: // &
|
||||
return b.CreateAnd(x, y, ""), nil
|
||||
|
|
16
compiler/testdata/basic.go
предоставленный
16
compiler/testdata/basic.go
предоставленный
|
@ -10,6 +10,22 @@ func equalInt(x, y int) bool {
|
|||
return x == y
|
||||
}
|
||||
|
||||
func divInt(x, y int) int {
|
||||
return x / y
|
||||
}
|
||||
|
||||
func divUint(x, y uint) uint {
|
||||
return x / y
|
||||
}
|
||||
|
||||
func remInt(x, y int) int {
|
||||
return x % y
|
||||
}
|
||||
|
||||
func remUint(x, y uint) uint {
|
||||
return x % y
|
||||
}
|
||||
|
||||
func floatEQ(x, y float32) bool {
|
||||
return x == y
|
||||
}
|
||||
|
|
70
compiler/testdata/basic.ll
предоставленный
70
compiler/testdata/basic.ll
предоставленный
|
@ -28,6 +28,76 @@ entry:
|
|||
ret i1 %0
|
||||
}
|
||||
|
||||
; Function Attrs: nounwind
|
||||
define hidden i32 @main.divInt(i32 %x, i32 %y, i8* %context, i8* %parentHandle) unnamed_addr #0 {
|
||||
entry:
|
||||
%0 = icmp eq i32 %y, 0
|
||||
br i1 %0, label %divbyzero.throw, label %divbyzero.next
|
||||
|
||||
divbyzero.throw: ; preds = %entry
|
||||
call void @runtime.divideByZeroPanic(i8* undef, i8* null) #0
|
||||
unreachable
|
||||
|
||||
divbyzero.next: ; preds = %entry
|
||||
%1 = icmp eq i32 %y, -1
|
||||
%2 = icmp eq i32 %x, -2147483648
|
||||
%3 = and i1 %1, %2
|
||||
%4 = select i1 %3, i32 1, i32 %y
|
||||
%5 = sdiv i32 %x, %4
|
||||
ret i32 %5
|
||||
}
|
||||
|
||||
declare void @runtime.divideByZeroPanic(i8*, i8*)
|
||||
|
||||
; Function Attrs: nounwind
|
||||
define hidden i32 @main.divUint(i32 %x, i32 %y, i8* %context, i8* %parentHandle) unnamed_addr #0 {
|
||||
entry:
|
||||
%0 = icmp eq i32 %y, 0
|
||||
br i1 %0, label %divbyzero.throw, label %divbyzero.next
|
||||
|
||||
divbyzero.throw: ; preds = %entry
|
||||
call void @runtime.divideByZeroPanic(i8* undef, i8* null) #0
|
||||
unreachable
|
||||
|
||||
divbyzero.next: ; preds = %entry
|
||||
%1 = udiv i32 %x, %y
|
||||
ret i32 %1
|
||||
}
|
||||
|
||||
; Function Attrs: nounwind
|
||||
define hidden i32 @main.remInt(i32 %x, i32 %y, i8* %context, i8* %parentHandle) unnamed_addr #0 {
|
||||
entry:
|
||||
%0 = icmp eq i32 %y, 0
|
||||
br i1 %0, label %divbyzero.throw, label %divbyzero.next
|
||||
|
||||
divbyzero.throw: ; preds = %entry
|
||||
call void @runtime.divideByZeroPanic(i8* undef, i8* null) #0
|
||||
unreachable
|
||||
|
||||
divbyzero.next: ; preds = %entry
|
||||
%1 = icmp eq i32 %y, -1
|
||||
%2 = icmp eq i32 %x, -2147483648
|
||||
%3 = and i1 %1, %2
|
||||
%4 = select i1 %3, i32 1, i32 %y
|
||||
%5 = srem i32 %x, %4
|
||||
ret i32 %5
|
||||
}
|
||||
|
||||
; Function Attrs: nounwind
|
||||
define hidden i32 @main.remUint(i32 %x, i32 %y, i8* %context, i8* %parentHandle) unnamed_addr #0 {
|
||||
entry:
|
||||
%0 = icmp eq i32 %y, 0
|
||||
br i1 %0, label %divbyzero.throw, label %divbyzero.next
|
||||
|
||||
divbyzero.throw: ; preds = %entry
|
||||
call void @runtime.divideByZeroPanic(i8* undef, i8* null) #0
|
||||
unreachable
|
||||
|
||||
divbyzero.next: ; preds = %entry
|
||||
%1 = urem i32 %x, %y
|
||||
ret i32 %1
|
||||
}
|
||||
|
||||
; Function Attrs: nounwind
|
||||
define hidden i1 @main.floatEQ(float %x, float %y, i8* %context, i8* %parentHandle) unnamed_addr #0 {
|
||||
entry:
|
||||
|
|
|
@ -64,6 +64,11 @@ func negativeShiftPanic() {
|
|||
runtimePanic("negative shift")
|
||||
}
|
||||
|
||||
// Panic when there is a divide by zero.
|
||||
func divideByZeroPanic() {
|
||||
runtimePanic("divide by zero")
|
||||
}
|
||||
|
||||
func blockingPanic() {
|
||||
runtimePanic("trying to do blocking operation in exported function")
|
||||
}
|
||||
|
|
12
testdata/binop.go
предоставленный
12
testdata/binop.go
предоставленный
|
@ -75,6 +75,10 @@ func main() {
|
|||
println("constant number")
|
||||
x := uint32(5)
|
||||
println(uint32(x) / (20e0 / 1))
|
||||
|
||||
// check for signed integer overflow
|
||||
println("-2147483648 / -1:", sdiv32(-2147483648, -1))
|
||||
println("-2147483648 % -1:", srem32(-2147483648, -1))
|
||||
}
|
||||
|
||||
var x = true
|
||||
|
@ -114,6 +118,14 @@ func ashr(x int, y uint) int {
|
|||
return x >> y
|
||||
}
|
||||
|
||||
func sdiv32(x, y int32) int32 {
|
||||
return x / y
|
||||
}
|
||||
|
||||
func srem32(x, y int32) int32 {
|
||||
return x % y
|
||||
}
|
||||
|
||||
var shlSimple = shl(2, 1)
|
||||
var shlOverflow = shl(2, 1000)
|
||||
var shrSimple = shr(2, 1)
|
||||
|
|
2
testdata/binop.txt
предоставленный
2
testdata/binop.txt
предоставленный
|
@ -64,3 +64,5 @@ true
|
|||
true
|
||||
constant number
|
||||
0
|
||||
-2147483648 / -1: -2147483648
|
||||
-2147483648 % -1: 0
|
||||
|
|
Загрузка…
Создание таблицы
Сослаться в новой задаче