compiler: fix incorrect unsafe.Alignof on some 32-bit architectures
This should fix https://github.com/tinygo-org/tinygo/issues/2643
Этот коммит содержится в:
родитель
ecb7eebcff
коммит
29c1d7c68d
3 изменённых файлов: 21 добавлений и 1 удалений
|
@ -234,10 +234,15 @@ func Sizes(machine llvm.TargetMachine) types.Sizes {
|
|||
panic("unknown pointer size")
|
||||
}
|
||||
|
||||
// Construct a complex128 type because that's likely the type with the
|
||||
// biggest alignment on most/all ABIs.
|
||||
ctx := llvm.NewContext()
|
||||
defer ctx.Dispose()
|
||||
complex128Type := ctx.StructType([]llvm.Type{ctx.DoubleType(), ctx.DoubleType()}, false)
|
||||
return &stdSizes{
|
||||
IntSize: int64(intWidth / 8),
|
||||
PtrSize: int64(targetData.PointerSize()),
|
||||
MaxAlign: int64(targetData.PrefTypeAlignment(targetData.IntPtrType())),
|
||||
MaxAlign: int64(targetData.ABITypeAlignment(complex128Type)),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
13
testdata/reflect.go
предоставленный
13
testdata/reflect.go
предоставленный
|
@ -170,6 +170,19 @@ func main() {
|
|||
assertSize(reflect.TypeOf(new(int)).Size() == unsafe.Sizeof(new(int)), "*int")
|
||||
assertSize(reflect.TypeOf(zeroFunc).Size() == unsafe.Sizeof(zeroFunc), "func()")
|
||||
|
||||
// Test that offset is correctly calculated.
|
||||
// This doesn't just test reflect but also (indirectly) that unsafe.Alignof
|
||||
// works correctly.
|
||||
s := struct {
|
||||
small1 byte
|
||||
big1 int64
|
||||
small2 byte
|
||||
big2 int64
|
||||
}{}
|
||||
st := reflect.TypeOf(s)
|
||||
println("offset for int64 matches:", st.Field(1).Offset-st.Field(0).Offset == uintptr(unsafe.Pointer(&s.big1))-uintptr(unsafe.Pointer(&s.small1)))
|
||||
println("offset for complex128 matches:", st.Field(3).Offset-st.Field(2).Offset == uintptr(unsafe.Pointer(&s.big2))-uintptr(unsafe.Pointer(&s.small2)))
|
||||
|
||||
// SetBool
|
||||
rv := reflect.ValueOf(new(bool)).Elem()
|
||||
rv.SetBool(true)
|
||||
|
|
2
testdata/reflect.txt
предоставленный
2
testdata/reflect.txt
предоставленный
|
@ -401,6 +401,8 @@ float32 4 32
|
|||
float64 8 64
|
||||
complex64 8 64
|
||||
complex128 16 128
|
||||
offset for int64 matches: true
|
||||
offset for complex128 matches: true
|
||||
type assertion succeeded for unreferenced type
|
||||
|
||||
struct tags
|
||||
|
|
Загрузка…
Создание таблицы
Сослаться в новой задаче