Skip to content

Commit 61a864e

Browse files
Merge branch 'main' into codex/runtime-stress-tests
Signed-off-by: Serhii Mariiekha <heartwilltell@gmail.com>
2 parents ded4d10 + d262708 commit 61a864e

24 files changed

Lines changed: 9030 additions & 3895 deletions

File tree

.serena/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/cache
2+
/project.local.yml

.serena/project.yml

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
# the name by which the project can be referenced within Serena
2+
project_name: "runlang"
3+
4+
5+
# list of languages for which language servers are started; choose from:
6+
# al bash clojure cpp csharp
7+
# csharp_omnisharp dart elixir elm erlang
8+
# fortran fsharp go groovy haskell
9+
# haxe java julia kotlin lua
10+
# markdown
11+
# matlab nix pascal perl php
12+
# php_phpactor powershell python python_jedi r
13+
# rego ruby ruby_solargraph rust scala
14+
# swift terraform toml typescript typescript_vts
15+
# vue yaml zig
16+
# (This list may be outdated. For the current list, see values of Language enum here:
17+
# https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py
18+
# For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
19+
# Note:
20+
# - For C, use cpp
21+
# - For JavaScript, use typescript
22+
# - For Free Pascal/Lazarus, use pascal
23+
# Special requirements:
24+
# Some languages require additional setup/installations.
25+
# See here for details: https://oraios.github.io/serena/01-about/020_programming-languages.html#language-servers
26+
# When using multiple languages, the first language server that supports a given file will be used for that file.
27+
# The first language is the default language and the respective language server will be used as a fallback.
28+
# Note that when using the JetBrains backend, language servers are not used and this list is correspondingly ignored.
29+
languages:
30+
- zig
31+
32+
# the encoding used by text files in the project
33+
# For a list of possible encodings, see https://docs.python.org/3.11/library/codecs.html#standard-encodings
34+
encoding: "utf-8"
35+
36+
# line ending convention to use when writing source files.
37+
# Possible values: unset (use global setting), "lf", "crlf", or "native" (platform default)
38+
# This does not affect Serena's own files (e.g. memories and configuration files), which always use native line endings.
39+
line_ending:
40+
41+
# The language backend to use for this project.
42+
# If not set, the global setting from serena_config.yml is used.
43+
# Valid values: LSP, JetBrains
44+
# Note: the backend is fixed at startup. If a project with a different backend
45+
# is activated post-init, an error will be returned.
46+
language_backend:
47+
48+
# whether to use project's .gitignore files to ignore files
49+
ignore_all_files_in_gitignore: true
50+
51+
# advanced configuration option allowing to configure language server-specific options.
52+
# Maps the language key to the options.
53+
# Have a look at the docstring of the constructors of the LS implementations within solidlsp (e.g., for C# or PHP) to see which options are available.
54+
# No documentation on options means no options are available.
55+
ls_specific_settings: {}
56+
57+
# list of additional paths to ignore in this project.
58+
# Same syntax as gitignore, so you can use * and **.
59+
# Note: global ignored_paths from serena_config.yml are also applied additively.
60+
ignored_paths: []
61+
62+
# whether the project is in read-only mode
63+
# If set to true, all editing tools will be disabled and attempts to use them will result in an error
64+
# Added on 2025-04-18
65+
read_only: false
66+
67+
# list of tool names to exclude.
68+
# This extends the existing exclusions (e.g. from the global configuration)
69+
#
70+
# Below is the complete list of tools for convenience.
71+
# To make sure you have the latest list of tools, and to view their descriptions,
72+
# execute `uv run scripts/print_tool_overview.py`.
73+
#
74+
# * `activate_project`: Activates a project based on the project name or path.
75+
# * `check_onboarding_performed`: Checks whether project onboarding was already performed.
76+
# * `create_text_file`: Creates/overwrites a file in the project directory.
77+
# * `delete_memory`: Delete a memory file. Should only happen if a user asks for it explicitly,
78+
# for example by saying that the information retrieved from a memory file is no longer correct
79+
# or no longer relevant for the project.
80+
# * `edit_memory`: Replaces content matching a regular expression in a memory.
81+
# * `execute_shell_command`: Executes a shell command.
82+
# * `find_file`: Finds files in the given relative paths
83+
# * `find_referencing_symbols`: Finds symbols that reference the given symbol using the language server backend
84+
# * `find_symbol`: Performs a global (or local) search using the language server backend.
85+
# * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
86+
# * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
87+
# * `initial_instructions`: Provides instructions Serena usage (i.e. the 'Serena Instructions Manual')
88+
# for clients that do not read the initial instructions when the MCP server is connected.
89+
# * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
90+
# * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
91+
# * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
92+
# * `list_memories`: List available memories. Any memory can be read using the `read_memory` tool.
93+
# * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
94+
# * `read_file`: Reads a file within the project directory.
95+
# * `read_memory`: Read the content of a memory file. This tool should only be used if the information
96+
# is relevant to the current task. You can infer whether the information
97+
# is relevant from the memory file name.
98+
# You should not read the same memory file multiple times in the same conversation.
99+
# * `rename_memory`: Renames or moves a memory. Moving between project and global scope is supported
100+
# (e.g., renaming "global/foo" to "bar" moves it from global to project scope).
101+
# * `rename_symbol`: Renames a symbol throughout the codebase using language server refactoring capabilities.
102+
# For JB, we use a separate tool.
103+
# * `replace_content`: Replaces content in a file (optionally using regular expressions).
104+
# * `replace_symbol_body`: Replaces the full definition of a symbol using the language server backend.
105+
# * `safe_delete_symbol`:
106+
# * `search_for_pattern`: Performs a search for a pattern in the project.
107+
# * `write_memory`: Write some information (utf-8-encoded) about this project that can be useful for future tasks to a memory in md format.
108+
# The memory name should be meaningful.
109+
excluded_tools: []
110+
111+
# list of tools to include that would otherwise be disabled (particularly optional tools that are disabled by default).
112+
# This extends the existing inclusions (e.g. from the global configuration).
113+
included_optional_tools: []
114+
115+
# fixed set of tools to use as the base tool set (if non-empty), replacing Serena's default set of tools.
116+
# This cannot be combined with non-empty excluded_tools or included_optional_tools.
117+
fixed_tools: []
118+
119+
# list of mode names to that are always to be included in the set of active modes
120+
# The full set of modes to be activated is base_modes + default_modes.
121+
# If the setting is undefined, the base_modes from the global configuration (serena_config.yml) apply.
122+
# Otherwise, this setting overrides the global configuration.
123+
# Set this to [] to disable base modes for this project.
124+
# Set this to a list of mode names to always include the respective modes for this project.
125+
base_modes:
126+
127+
# list of mode names that are to be activated by default.
128+
# The full set of modes to be activated is base_modes + default_modes.
129+
# If the setting is undefined, the default_modes from the global configuration (serena_config.yml) apply.
130+
# Otherwise, this overrides the setting from the global configuration (serena_config.yml).
131+
# This setting can, in turn, be overridden by CLI parameters (--mode).
132+
default_modes:
133+
134+
# initial prompt for the project. It will always be given to the LLM upon activating the project
135+
# (contrary to the memories, which are loaded on demand).
136+
initial_prompt: ""
137+
138+
# time budget (seconds) per tool call for the retrieval of additional symbol information
139+
# such as docstrings or parameter information.
140+
# This overrides the corresponding setting in the global configuration; see the documentation there.
141+
# If null or missing, use the setting from the global configuration.
142+
symbol_info_budget:
143+
144+
# list of regex patterns which, when matched, mark a memory entry as read‑only.
145+
# Extends the list from the global configuration, merging the two lists.
146+
read_only_memory_patterns: []
147+
148+
# list of regex patterns for memories to completely ignore.
149+
# Matching memories will not appear in list_memories or activate_project output
150+
# and cannot be accessed via read_memory or write_memory.
151+
# To access ignored memory files, use the read_file tool on the raw file path.
152+
# Extends the list from the global configuration, merging the two lists.
153+
# Example: ["_archive/.*", "_episodes/.*"]
154+
ignored_memory_patterns: []

build.zig

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,17 @@ pub fn build(b: *std.Build) void {
9696
// Enable GNU extensions (sched_getcpu, CPU_ZERO, pthread_setaffinity_np, etc.)
9797
sanitizer_flag_buf[sanitizer_flag_count] = "-D_GNU_SOURCE";
9898
sanitizer_flag_count += 1;
99+
sanitizer_flag_buf[sanitizer_flag_count] = "-g";
100+
sanitizer_flag_count += 1;
99101
if (sanitize) {
100102
sanitizer_flag_buf[sanitizer_flag_count] = "-fsanitize=address,undefined";
101103
sanitizer_flag_count += 1;
102104
sanitizer_flag_buf[sanitizer_flag_count] = "-fno-omit-frame-pointer";
103105
sanitizer_flag_count += 1;
104-
sanitizer_flag_buf[sanitizer_flag_count] = "-g";
105-
sanitizer_flag_count += 1;
106106
}
107107
if (tsan) {
108108
sanitizer_flag_buf[sanitizer_flag_count] = "-fsanitize=thread";
109109
sanitizer_flag_count += 1;
110-
sanitizer_flag_buf[sanitizer_flag_count] = "-g";
111-
sanitizer_flag_count += 1;
112110
}
113111
if (no_gen_checks) {
114112
sanitizer_flag_buf[sanitizer_flag_count] = "-DRUN_NO_GEN_CHECKS";
@@ -312,6 +310,11 @@ pub fn build(b: *std.Build) void {
312310

313311
const run_runtime_tests = b.addRunArtifact(runtime_test_exe);
314312
run_runtime_tests.step.dependOn(&runtime_test_exe.step);
313+
if (target_info.os.tag == .macos) {
314+
const runtime_tests_dsym = b.addSystemCommand(&.{"dsymutil"});
315+
runtime_tests_dsym.addArtifactArg(runtime_test_exe);
316+
run_runtime_tests.step.dependOn(&runtime_tests_dsym.step);
317+
}
315318
const runtime_test_step = b.step("test-runtime", "Run runtime C tests");
316319
runtime_test_step.dependOn(&run_runtime_tests.step);
317320

src/codegen_c.zig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ pub const CCodegen = struct {
133133

134134
// Declare all temporaries used in the function
135135
try self.emitTempDeclarations(func);
136+
try self.emitStackCheck();
136137

137138
// Emit basic blocks
138139
for (func.blocks.items, 0..) |*block, i| {
@@ -196,6 +197,11 @@ pub const CCodegen = struct {
196197
}
197198
}
198199

200+
fn emitStackCheck(self: *CCodegen) !void {
201+
try self.emitIndent();
202+
try self.writer().print("{{ char _run_stack_probe; run_stack_check(&_run_stack_probe); }}\n", .{});
203+
}
204+
199205
fn inferCType(self: *const CCodegen, inst: ir.Inst) []const u8 {
200206
if (inst.op == .local_get) {
201207
if (inst.arg1 < self.module.local_infos.items.len) {
@@ -820,6 +826,8 @@ test "CCodegen: hello world" {
820826
try std.testing.expect(std.mem.indexOf(u8, result, "void run_main__main(void)") != null);
821827
// Should contain the string constant creation
822828
try std.testing.expect(std.mem.indexOf(u8, result, "run_string_from_cstr(\"Hello, World!\")") != null);
829+
// Should contain the stack growth probe
830+
try std.testing.expect(std.mem.indexOf(u8, result, "run_stack_check(&_run_stack_probe)") != null);
823831
// Should contain return
824832
try std.testing.expect(std.mem.indexOf(u8, result, "return;") != null);
825833
}

src/runtime/run_async_preempt_amd64.S

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
_run_async_preempt:
66
#endif
77
run_async_preempt:
8-
/* Save all caller-saved registers (the signal interrupted arbitrary code) */
8+
/* Save all general-purpose registers that normal function calls may touch
9+
or that run_context_switch would otherwise capture from run_yield. */
910
pushq %rax
1011
pushq %rcx
1112
pushq %rdx
@@ -15,13 +16,27 @@ run_async_preempt:
1516
pushq %r9
1617
pushq %r10
1718
pushq %r11
19+
pushq %rbx
20+
pushq %rbp
21+
pushq %r12
22+
pushq %r13
23+
pushq %r14
24+
pushq %r15
1825
/* Call run_yield() */
1926
#if defined(__APPLE__)
2027
callq _run_yield
28+
callq _run_async_preempt_done
2129
#else
2230
callq run_yield
31+
callq run_async_preempt_done
2332
#endif
24-
/* Restore caller-saved registers */
33+
/* Restore registers */
34+
popq %r15
35+
popq %r14
36+
popq %r13
37+
popq %r12
38+
popq %rbp
39+
popq %rbx
2540
popq %r11
2641
popq %r10
2742
popq %r9

src/runtime/run_async_preempt_arm64.S

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
_run_async_preempt:
66
#endif
77
run_async_preempt:
8-
/* Save caller-saved registers */
8+
/* Save all general-purpose registers that normal function calls may touch
9+
or that run_context_switch would otherwise capture from run_yield. */
10+
str x30, [sp, #-16]!
11+
str x29, [sp, #-16]!
12+
stp x27, x28, [sp, #-16]!
13+
stp x25, x26, [sp, #-16]!
14+
stp x23, x24, [sp, #-16]!
15+
stp x21, x22, [sp, #-16]!
16+
stp x19, x20, [sp, #-16]!
917
stp x0, x1, [sp, #-16]!
1018
stp x2, x3, [sp, #-16]!
1119
stp x4, x5, [sp, #-16]!
@@ -19,8 +27,10 @@ run_async_preempt:
1927
/* Call run_yield() */
2028
#if defined(__APPLE__)
2129
bl _run_yield
30+
bl _run_async_preempt_done
2231
#else
2332
bl run_yield
33+
bl run_async_preempt_done
2434
#endif
2535
/* Restore */
2636
ldr x18, [sp], #16
@@ -33,7 +43,19 @@ run_async_preempt:
3343
ldp x4, x5, [sp], #16
3444
ldp x2, x3, [sp], #16
3545
ldp x0, x1, [sp], #16
36-
ret
46+
ldp x19, x20, [sp], #16
47+
ldp x21, x22, [sp], #16
48+
ldp x23, x24, [sp], #16
49+
ldp x25, x26, [sp], #16
50+
ldp x27, x28, [sp], #16
51+
ldr x29, [sp], #16
52+
ldr x30, [sp], #16
53+
/* The signal handler pushed the interrupted LR and put the resume PC in
54+
x30, making this frame look like an injected call. Restore the original
55+
LR for the interrupted function, then branch back through x16 (IP0). */
56+
mov x16, x30
57+
ldr x30, [sp], #16
58+
br x16
3759

3860
#if defined(__linux__)
3961
.section .note.GNU-stack,"",@progbits

0 commit comments

Comments
 (0)