carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 10:51:06 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Start handling stack depth issues in explorer (#2799)

Browse Source 
Adds stack space handling similar to Clang's approach, but with more support for forwarding return values. Refactors ParseAndExecute for better sharing, and for centralization of the InitStackSpace handling.

Fixes #2795
This commit is contained in:
Jon Ross-Perkins
2023-05-22 16:22:51 -07:00
committed by GitHub
parent 60e3d7282d
commit 38538ff97f
9 changed files with 267 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/parse_and_execute/parse_and_execute.cpp
+31 -28
View File
@@ -9,6 +9,7 @@
#include "common/check.h"
#include "common/error.h"
#include "explorer/interpreter/exec_program.h"
#include "explorer/interpreter/stack_space.h"
#include "explorer/syntax/parse.h"
#include "explorer/syntax/prelude.h"
#include "llvm/ADT/ScopeExit.h"
@@ -39,38 +40,40 @@ static auto ParseAndExecuteHelper(std::function<ErrorOr<AST>(Arena*)> parse,
Nonnull<TraceStream*> trace_stream,
Nonnull<llvm::raw_ostream*> print_stream)
-> ErrorOr<int> {
Arena arena;
auto cursor = std::chrono::steady_clock::now();
return RunWithExtraStack<ErrorOr<int>>([&]() -> ErrorOr<int> {
Arena arena;
auto cursor = std::chrono::steady_clock::now();
ErrorOr<AST> parse_result = parse(&arena);
auto print_parse_time = PrintTimingOnExit(trace_stream, "Parse", &cursor);
if (!parse_result.ok()) {
return ErrorBuilder() << "SYNTAX ERROR: " << parse_result.error();
}
ErrorOr<AST> parse_result = parse(&arena);
auto print_parse_time = PrintTimingOnExit(trace_stream, "Parse", &cursor);
if (!parse_result.ok()) {
return ErrorBuilder() << "SYNTAX ERROR: " << parse_result.error();
}
AddPrelude(prelude_path, &arena, &parse_result->declarations,
&parse_result->num_prelude_declarations);
auto print_prelude_time =
PrintTimingOnExit(trace_stream, "AddPrelude", &cursor);
AddPrelude(prelude_path, &arena, &parse_result->declarations,
&parse_result->num_prelude_declarations);
auto print_prelude_time =
PrintTimingOnExit(trace_stream, "AddPrelude", &cursor);
// Semantically analyze the parsed program.
ErrorOr<AST> analyze_result =
AnalyzeProgram(&arena, *parse_result, trace_stream, print_stream);
auto print_analyze_time =
PrintTimingOnExit(trace_stream, "AnalyzeProgram", &cursor);
if (!analyze_result.ok()) {
return ErrorBuilder() << "COMPILATION ERROR: " << analyze_result.error();
}
// Semantically analyze the parsed program.
ErrorOr<AST> analyze_result =
AnalyzeProgram(&arena, *parse_result, trace_stream, print_stream);
auto print_analyze_time =
PrintTimingOnExit(trace_stream, "AnalyzeProgram", &cursor);
if (!analyze_result.ok()) {
return ErrorBuilder() << "COMPILATION ERROR: " << analyze_result.error();
}
// Run the program.
ErrorOr<int> exec_result =
ExecProgram(&arena, *analyze_result, trace_stream, print_stream);
auto print_exec_time =
PrintTimingOnExit(trace_stream, "ExecProgram", &cursor);
if (!exec_result.ok()) {
return ErrorBuilder() << "RUNTIME ERROR: " << exec_result.error();
}
return exec_result;
// Run the program.
ErrorOr<int> exec_result =
ExecProgram(&arena, *analyze_result, trace_stream, print_stream);
auto print_exec_time =
PrintTimingOnExit(trace_stream, "ExecProgram", &cursor);
if (!exec_result.ok()) {
return ErrorBuilder() << "RUNTIME ERROR: " << exec_result.error();
}
return exec_result;
});
}
auto ParseAndExecuteFile(const std::string& prelude_path,