aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2024-07-14 12:19:47 +0100
committergingerBill <bill@gingerbill.org>2024-07-14 12:19:47 +0100
commit8642d719f0ece3625d535d47b41ff4d35072f47f (patch)
treeaec3708e44e3fe7085dea40b112aa4db08497f31 /src
parent891cf54b5c56bd31bcfdac14f0b72d489999bffc (diff)
Imply `#no_capture` to all variadic parameters
Diffstat (limited to 'src')
-rw-r--r--src/check_type.cpp10
-rw-r--r--src/llvm_backend.hpp1
-rw-r--r--src/parser.hpp5
3 files changed, 12 insertions, 4 deletions
diff --git a/src/check_type.cpp b/src/check_type.cpp
index d1c9bb381..466b9b3cd 100644
--- a/src/check_type.cpp
+++ b/src/check_type.cpp
@@ -2065,9 +2065,10 @@ gb_internal Type *check_get_params(CheckerContext *ctx, Scope *scope, Ast *_para
} else if (p->flags & FieldFlag_c_vararg) {
error(name, "'#no_capture' cannot be applied to a #c_vararg parameter");
p->flags &= ~FieldFlag_no_capture;
+ } else {
+ error(name, "'#no_capture' is already implied on all variadic parameter");
}
}
-
if (is_poly_name) {
if (p->flags&FieldFlag_no_alias) {
error(name, "'#no_alias' can only be applied to non constant values");
@@ -2085,6 +2086,11 @@ gb_internal Type *check_get_params(CheckerContext *ctx, Scope *scope, Ast *_para
error(name, "'#by_ptr' can only be applied to variable fields");
p->flags &= ~FieldFlag_by_ptr;
}
+ if (p->flags&FieldFlag_no_capture) {
+ error(name, "'#no_capture' can only be applied to variable fields");
+ p->flags &= ~FieldFlag_no_capture;
+ }
+
if (!is_type_polymorphic(type) && check_constant_parameter_value(type, params[i])) {
// failed
@@ -2104,6 +2110,8 @@ gb_internal Type *check_get_params(CheckerContext *ctx, Scope *scope, Ast *_para
param->flags |= EntityFlag_Ellipsis;
if (is_c_vararg) {
param->flags |= EntityFlag_CVarArg;
+ } else {
+ param->flags |= EntityFlag_NoCapture;
}
}
diff --git a/src/llvm_backend.hpp b/src/llvm_backend.hpp
index dd1041702..71fa1dbd0 100644
--- a/src/llvm_backend.hpp
+++ b/src/llvm_backend.hpp
@@ -344,7 +344,6 @@ struct lbProcedure {
Array<lbNoCaptureData> no_captures;
LLVMValueRef temp_callee_return_struct_memory;
-
Ast *curr_stmt;
Array<Scope *> scope_stack;
diff --git a/src/parser.hpp b/src/parser.hpp
index 15176f789..451cdf53d 100644
--- a/src/parser.hpp
+++ b/src/parser.hpp
@@ -330,10 +330,11 @@ enum FieldFlag : u32 {
FieldFlag_subtype = 1<<7,
FieldFlag_by_ptr = 1<<8,
FieldFlag_no_broadcast = 1<<9, // disallow array programming
- FieldFlag_no_capture = 1<<10,
+
+ FieldFlag_no_capture = 1<<11,
// Internal use by the parser only
- FieldFlag_Tags = 1<<11,
+ FieldFlag_Tags = 1<<15,
FieldFlag_Results = 1<<16,