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

Track the file kind on SourceLocation rather than computing it from the file name. (#2999)

Browse Source 
This will be more correct if a user file is named prelude.carbon, and
reduces the explorer runtime by about 10% by removing a string
comparison from the check for whether trace output is enabled.

---------

Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
This commit is contained in:
Richard Smith
2023-07-19 23:07:53 +00:00
committed by GitHub
co-authored by Jon Ross-Perkins
parent 41e357492b
commit ea60e4f491
29 changed files with 168 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/interpreter/interpreter.cpp
+13 -6
View File
@@ -2620,7 +2620,7 @@ auto Interpreter::StepDestroy() -> ErrorOr<Success> {
const Address object = destroy_act.location()->address();
const Address var_addr =
object.ElementAddress(arena_->New<NamedElement>(var));
const auto v = heap_.Read(var_addr, SourceLocation("destructor", 1));
const auto v = heap_.Read(var_addr, var->source_loc());
CARBON_CHECK(v.ok())
<< "Failed to read member `" << var->binding().name()
<< "` from class `" << class_decl.name() << "`";
@@ -2706,21 +2706,28 @@ auto Interpreter::StepCleanUp() -> ErrorOr<Success> {
// State transition.
auto Interpreter::Step() -> ErrorOr<Success> {
Action& act = todo_.CurrentAction();
auto error_builder = [&] {
if (auto loc = act.source_loc()) {
return ProgramError(*loc);
}
return ErrorBuilder();
};
// Check for various overflow conditions before stepping.
if (todo_.size() > MaxTodoSize) {
return ProgramError(SourceLocation("overflow", 1))
return error_builder()
<< "stack overflow: too many interpreter actions on stack";
}
if (++steps_taken_ > MaxStepsTaken) {
return ProgramError(SourceLocation("overflow", 1))
return error_builder()
<< "possible infinite loop: too many interpreter steps executed";
}
if (arena_->allocated() > MaxArenaAllocated) {
return ProgramError(SourceLocation("overflow", 1))
<< "out of memory: exceeded arena allocation limit";
return error_builder() << "out of memory: exceeded arena allocation limit";
}
Action& act = todo_.CurrentAction();
switch (act.kind()) {
case Action::Kind::LocationAction:
CARBON_RETURN_IF_ERROR(StepLocation());