mirror of
https://github.com/c3lang/c3c.git
synced 2026-02-27 12:01:16 +00:00
Fix issue with accessing arrays in access-overloaded types, e.g. list[1][2] #1665.
This commit is contained in:
@@ -35,6 +35,8 @@
|
||||
- Do not produce expression locations for windows.
|
||||
- Issue where multiple methods were accepted for the same type.
|
||||
- Issue where a method was linked to a type alias instead of the underlying type.
|
||||
- Fix Fnv1a encoding.
|
||||
- Fix issue with accessing arrays in access-overloaded types, e.g. `list[1][2]` #1665.
|
||||
|
||||
### Stdlib changes
|
||||
- Add `io::MultiReader`, `io::MultiWriter`, and `io::TeeReader` structs.
|
||||
|
||||
@@ -2883,7 +2883,7 @@ static inline bool sema_expr_analyse_subscript(SemaContext *context, Expr *expr,
|
||||
|
||||
// Evaluate the expression to index.
|
||||
Expr *subscripted = exprptr(expr->subscript_expr.expr);
|
||||
if (!sema_analyse_expr_check(context, subscripted, check)) return false;
|
||||
if (!sema_analyse_expr_check(context, subscripted, CHECK_VALUE)) return false;
|
||||
|
||||
// If it is an lvalue then check that it is assignable.
|
||||
if (check == CHECK_LVALUE && !sema_expr_check_assign(context, expr)) return false;
|
||||
|
||||
61
test/test_suite/overloading/set_not_set_overload.c3t
Normal file
61
test/test_suite/overloading/set_not_set_overload.c3t
Normal file
@@ -0,0 +1,61 @@
|
||||
// #target: macos-x64
|
||||
module test;
|
||||
import std::io;
|
||||
import std::collections::list;
|
||||
|
||||
List(<int[3]>) x;
|
||||
|
||||
struct Map
|
||||
{
|
||||
char[20][] data;
|
||||
int width;
|
||||
}
|
||||
fn int Map.len(self) @inline @operator(len) => self.width;
|
||||
fn char[] Map.get(self, int i) @inline @operator([]) => self.data[i][:self.width];
|
||||
|
||||
fn void main ()
|
||||
{
|
||||
x.temp_init();
|
||||
int[3] y = { 1, 2, 3 };
|
||||
x.push(y);
|
||||
x[0][0] = 4;
|
||||
char[20][20] z;
|
||||
Map foo = { z[:10], 10 };
|
||||
foo[3][4] = 123;
|
||||
}
|
||||
|
||||
/* #expect: test.ll
|
||||
|
||||
define void @test.main() #0 {
|
||||
entry:
|
||||
%y = alloca [3 x i32], align 4
|
||||
%coerce = alloca [3 x i32], align 8
|
||||
%z = alloca [20 x [20 x i8]], align 16
|
||||
%foo = alloca %Map, align 8
|
||||
%result = alloca %"char[]", align 8
|
||||
%0 = call ptr @"std_collections_list$a3$int$.List.temp_init"(ptr @test.x, i64 16)
|
||||
call void @llvm.memcpy.p0.p0.i32(ptr align 4 %y, ptr align 4 @.__const, i32 12, i1 false)
|
||||
call void @llvm.memcpy.p0.p0.i32(ptr align 8 %coerce, ptr align 4 %y, i32 12, i1 false)
|
||||
%lo = load i64, ptr %coerce, align 8
|
||||
%ptradd = getelementptr inbounds i8, ptr %coerce, i64 8
|
||||
%hi = load i32, ptr %ptradd, align 8
|
||||
call void @"std_collections_list$a3$int$.List.push"(ptr @test.x, i64 %lo, i32 %hi) #4
|
||||
%1 = load i64, ptr @test.x, align 8
|
||||
%lt = icmp ult i64 0, %1
|
||||
call void @llvm.assume(i1 %lt)
|
||||
%2 = load ptr, ptr getelementptr inbounds (i8, ptr @test.x, i64 32), align 8
|
||||
store i32 4, ptr %2, align 4
|
||||
call void @llvm.memset.p0.i64(ptr align 16 %z, i8 0, i64 400, i1 false)
|
||||
%3 = insertvalue %"char[20][]" undef, ptr %z, 0
|
||||
%4 = insertvalue %"char[20][]" %3, i64 10, 1
|
||||
store %"char[20][]" %4, ptr %foo, align 8
|
||||
%ptradd1 = getelementptr inbounds i8, ptr %foo, i64 16
|
||||
store i32 10, ptr %ptradd1, align 8
|
||||
%5 = call { ptr, i64 } @test.Map.get(ptr byval(%Map) align 8 %foo, i32 3) #4
|
||||
store { ptr, i64 } %5, ptr %result, align 8
|
||||
%6 = load ptr, ptr %result, align 8
|
||||
%ptradd2 = getelementptr inbounds i8, ptr %6, i64 4
|
||||
store i8 123, ptr %ptradd2, align 1
|
||||
ret void
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user