mirrors/codon
1
0
Fork 0
mirror of https://github.com/exaloop/codon.git synced 2025-06-03 15:03:52 +08:00
Code Issues Projects Releases Wiki Activity

Fix globals in JIT

Browse Source
This commit is contained in:
Ibrahim Numanagić 2022-09-29 20:40:00 -07:00
parent 7655e09e83
commit d5741a27e0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
codon/parser/visitors/simplify/assign.cpp
View File

@ -144,19 +144,19 @@ StmtPtr SimplifyVisitor::transformAssignment(ExprPtr lhs, ExprPtr rhs, ExprPtr t
// Generate new canonical variable name for this assignment and add it to the context // Generate new canonical variable name for this assignment and add it to the context
auto canonical = ctx->generateCanonicalName(e->value); auto canonical = ctx->generateCanonicalName(e->value);
auto assign = N<AssignStmt>(N<IdExpr>(canonical), rhs, type); auto assign = N<AssignStmt>(N<IdExpr>(canonical), rhs, type);
val = nullptr;
if (rhs && rhs->isType()) { if (rhs && rhs->isType()) {
ctx->addType(e->value, canonical, lhs->getSrcInfo()); val = ctx->addType(e->value, canonical, lhs->getSrcInfo());
} else { } else {
auto val = ctx->addVar(e->value, canonical, lhs->getSrcInfo()); val = ctx->addVar(e->value, canonical, lhs->getSrcInfo());
if (auto st = getStaticGeneric(type.get())) if (auto st = getStaticGeneric(type.get()))
val->staticType = st; val->staticType = st;
} }
// Register all toplevel variables as global in JIT mode // Register all toplevel variables as global in JIT mode
bool isGlobal = bool isGlobal = (ctx->cache->isJit && val->isGlobal() && !val->isGeneric() == 0) ||
(ctx->cache->isJit && ctx->isGlobal() && getStaticGeneric(type.get()) == 0) || (canonical == VAR_ARGV);
(canonical == VAR_ARGV); if (isGlobal && !val->isGeneric())
if (isGlobal && !getStaticGeneric(type.get()))
ctx->cache->addGlobal(canonical); ctx->cache->addGlobal(canonical);
return assign; return assign;

3
codon/parser/visitors/simplify/loops.cpp
View File

@ -56,8 +56,9 @@ void SimplifyVisitor::visit(WhileStmt *stmt) {
transformConditionalScope(stmt->suite); transformConditionalScope(stmt->suite);
ctx->leaveConditionalBlock(); ctx->leaveConditionalBlock();
// Dominate loop variables // Dominate loop variables
for (auto &var : ctx->getBase()->getLoop()->seenVars) for (auto &var : ctx->getBase()->getLoop()->seenVars) {
ctx->findDominatingBinding(var); ctx->findDominatingBinding(var);
}
ctx->getBase()->loops.pop_back(); ctx->getBase()->loops.pop_back();
// Complete while-else clause // Complete while-else clause