Skip to content

fix: Short-circuit on empty locations for locals #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
varungandhi-src merged 1 commit into from
Jun 28, 2023
Merged

fix: Short-circuit on empty locations for locals #200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion scip_indexer/SCIPIndexer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,16 @@ class CFGTraversal final {
// The type should be provided if we have an lvalue.
bool emitLocalOccurrence(const cfg::CFG &cfg, const cfg::BasicBlock *bb, cfg::LocalOccurrence local,
ValueCategory category, core::TypePtr type) {
auto loc = local.loc;
if (!loc.exists() || loc.empty()) {
// Safeguard against incorrect merges from upstream Sorbet, where
// some changes cause empty source locations to propagate down here.
//
// FIXME: Investigate which code patterns trigger this; normally
// locals should carry non-empty locations, but this was
// triggered on some private code.
return false;
}
auto localRef = local.variable;
auto localVar = localRef.data(cfg);
auto symRef = this->aliasMap.try_consume(localRef);
Expand Down Expand Up @@ -848,7 +858,6 @@ class CFGTraversal final {
}
ENFORCE(this->functionLocals.contains(localRef), "should've added local earlier if it was missing");
absl::Status status;
auto loc = local.loc;
auto &gs = this->ctx.state;
auto file = this->ctx.file;
if (symRef.has_value()) {
Expand Down