mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-28 17:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #130; allow conversion from any pointer to uintptr and vice versa

Browse Source
This commit is contained in:
gingerBill
2017-11-02 22:34:09 +00:00
parent 529d1c78c7
commit fcc8b89e6b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/_preload.odin
View File

@@ -438,10 +438,10 @@ __get_map_header :: proc "contextless" (m: ^$T/map[$K]$V) -> __Map_Header {
_, is_string := type_info_base(type_info_of(K)).variant.(Type_Info_String);
header.is_key_string = is_string;
header.entry_size = size_of(Entry);
header.entry_align = align_of(Entry);
header.value_offset = offset_of(Entry, value);
header.value_size = size_of(V);
header.entry_size = int(size_of(Entry));
header.entry_align = int(align_of(Entry));
header.value_offset = int(offset_of(Entry, value));
header.value_size = int(size_of(V));
return header;
}
@@ -461,7 +461,7 @@ __get_map_key :: proc "contextless" (key: $K) -> __Map_Key {
case Type_Info_Rune:
map_key.hash = u128((cast(^rune)&key)^);
case Type_Info_Pointer:
map_key.hash = u128(uint((^rawptr)(&key)^));
map_key.hash = u128(uintptr((^rawptr)(&key)^));
case Type_Info_Float:
switch 8*size_of(key) {
case 32: map_key.hash = u128((^u32)(&key)^);

6
src/check_expr.cpp
View File

@@ -1759,11 +1759,11 @@ bool check_is_castable_to(Checker *c, Operand *operand, Type *y) {
return true;
}
// (u)int <-> rawptr
if (is_type_uintptr(src) && is_type_rawptr(dst)) {
// (u)int <-> pointer
if (is_type_uintptr(src) && is_type_pointer(dst)) {
return true;
}
if (is_type_rawptr(src) && is_type_uintptr(dst)) {
if (is_type_pointer(src) && is_type_uintptr(dst)) {
return true;
}