Skip to content

Remove gratuitous const_cast<GenContext&> casts; legalize stop() (A6 phases 0–1) #209

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
ASDAlexander77 merged 1 commit into from
Jul 12, 2026
+22 −16
Merged

Remove gratuitous const_cast<GenContext&> casts; legalize stop() (A6 phases 0–1) #209

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions docs/MLIRGen-refactoring-review.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,3 +193,5 @@ Proposed phases, each independently shippable:
4. **Parameterize `MLIRCodeLogic.h`.** The two casts there poke values into the context that could be plain function parameters.

Order: 1 (trivial) → 3 (bounded signature ripple) → 2 (site-by-site, one PR per field group) → 4.

*Status update:* phase 1 is done, plus a discovered **phase 0**: nine of the 31 casts were gratuitous — non-const method calls on the copyable `funcOp` op handle (`getSymName`/`getCallableResults`/`getCallableRegion`/`setPersonalityAttr`), a deref of the `inferTypes` pointer member (pointee was never const), and a cast on a local non-const context in `getConditionalType`. Remaining casts are all genuine mutations for phases 2–4: `thisType` ×2, `typeAliasMap` ×2, loop flags ×3 sites, `generatedStatements` ×4, `typeParamsWithArgs` ×3 (`zipTypeParameterWithArgument` at ~16587, `processConditionalForType`, mapped-type erase), plus `MLIRCodeLogic.h`.
7 changes: 4 additions & 3 deletions tslang/include/TypeScript/MLIRLogic/MLIRGenContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ struct GenContext
}
}

void stop()
void stop() const
{
if (stopProcess) return;
stopProcess = true;
if (rootContext) const_cast<GenContext *>(rootContext)->stop();
if (rootContext) rootContext->stop();
}

bool isStopped() const
Expand Down Expand Up @@ -169,7 +169,8 @@ struct GenContext
const GenContext* rootContext = nullptr;
bool isLoop = false;
std::string loopLabel;
bool stopProcess = false;
// out-of-band cancellation signal; mutable so stop() stays callable through the const& threading
mutable bool stopProcess = false;
mlir::SmallVector<std::unique_ptr<mlir::Diagnostic>> *postponedMessages = nullptr;
bool specialization = false;
// TODO: special hack to detect initializing specialized class and see that generic methods are not initialized at the same time
Expand Down
29 changes: 16 additions & 13 deletions tslang/lib/TypeScript/MLIRGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5227,8 +5227,8 @@ class MLIRGenImpl
}
else if (genContext.funcOp)
{
auto funcName = const_cast<GenContext &>(genContext).funcOp.getSymName().str();
objectOwnerName = funcName;
mlir_ts::FuncOp funcOp = genContext.funcOp;
objectOwnerName = funcOp.getSymName().str();
}

if (signatureDeclarationBaseAST == SyntaxKind::MethodDeclaration)
Expand Down Expand Up @@ -6320,7 +6320,8 @@ class MLIRGenImpl

mlir::LogicalResult mlirGenFunctionExit(mlir::Location location, const GenContext &genContext)
{
auto callableResult = const_cast<GenContext &>(genContext).funcOp.getCallableResults();
mlir_ts::FuncOp contextFuncOp = genContext.funcOp;
auto callableResult = contextFuncOp.getCallableResults();
auto retType = callableResult.size() > 0 ? callableResult.front() : mlir::Type();
auto hasReturn = retType && !isa<mlir_ts::VoidType>(retType);
if (hasReturn)
Expand Down Expand Up @@ -7185,7 +7186,7 @@ class MLIRGenImpl

mlir::Type getExplicitReturnTypeOfCurrentFunction(const GenContext &genContext)
{
auto funcOp = const_cast<GenContext &>(genContext).funcOp;
mlir_ts::FuncOp funcOp = genContext.funcOp;
if (funcOp)
{
auto countResults = funcOp.getCallableResults().size();
Expand Down Expand Up @@ -8829,7 +8830,10 @@ class MLIRGenImpl
}

if (genContext.funcOp)
const_cast<GenContext &>(genContext).funcOp.setPersonalityAttr(builder.getBoolAttr(true));
{
mlir_ts::FuncOp funcOp = genContext.funcOp;
funcOp.setPersonalityAttr(builder.getBoolAttr(true));
}

auto tryOp = builder.create<mlir_ts::TryOp>(location);

Expand Down Expand Up @@ -11214,7 +11218,7 @@ class MLIRGenImpl

if (mlir::failed(result) && !accessFailed)
{
const_cast<GenContext &>(genContext).stop();
genContext.stop();
return mlir::Value();
}

Expand Down Expand Up @@ -11257,7 +11261,7 @@ class MLIRGenImpl

if (mlir::failed(result) && !accessFailed)
{
const_cast<GenContext &>(genContext).stop();
genContext.stop();
return mlir::Value();
}

Expand Down Expand Up @@ -15781,8 +15785,8 @@ class MLIRGenImpl
if (genContext.funcOp && genContext.funcOp != tempFuncOp && valueRegion &&
valueRegion->getParentOp() /* && valueRegion->getParentOp()->getParentOp()*/)
{
// auto funcRegion = const_cast<GenContext &>(genContext).funcOp.getCallableRegion();
auto funcRegion = const_cast<GenContext &>(genContext).funcOp.getCallableRegion();
mlir_ts::FuncOp contextFuncOp = genContext.funcOp;
auto funcRegion = contextFuncOp.getCallableRegion();

isOuterVar = !funcRegion->isAncestor(valueRegion);
// TODO: HACK
Expand All @@ -15794,7 +15798,7 @@ class MLIRGenImpl

LLVM_DEBUG(if (isOuterVar) dbgs() << "\n!! outer var: [" << value.second->getName()
<< "] \n\n\tvalue region: " << *valueRegion->getParentOp()
<< " \n\n\tFuncOp: " << const_cast<GenContext &>(genContext).funcOp << "";);
<< " \n\n\tFuncOp: " << contextFuncOp << "";);
}

if (isOuterVar && genContext.passResult && !isGenericFunctionReference(value.first))
Expand All @@ -15807,7 +15811,6 @@ class MLIRGenImpl
assert(!isa<mlir_ts::RefType>(value.second->getType()));

// valueRegion->viewGraph();
// const_cast<GenContext &>(genContext).funcOpVarScope.getCallableRegion()->viewGraph();

// special case, to prevent capturing ".a" because of reference to outer VaribleOp, which is hack (review
// solution for it)
Expand Down Expand Up @@ -22509,7 +22512,7 @@ genContext);
return mlir::Type();
}

auto &typeParamsWithArgs = *(const_cast<GenContext &>(genContext).inferTypes);
auto &typeParamsWithArgs = *genContext.inferTypes;
mth.appendInferTypeToContext(location, type, inferType, typeParamsWithArgs);

return inferType;
Expand Down Expand Up @@ -24004,7 +24007,7 @@ genContext);
mlir::Type getConditionalType(ConditionalTypeNode conditionalTypeNode, const GenContext &genContext)
{
GenContext condTypeGenContext(genContext);
condTypeGenContext.inferTypes = &const_cast<GenContext &>(condTypeGenContext).typeParamsWithArgs;
condTypeGenContext.inferTypes = &condTypeGenContext.typeParamsWithArgs;

auto checkType = getType(conditionalTypeNode->checkType, condTypeGenContext);
auto extendsType = getType(conditionalTypeNode->extendsType, condTypeGenContext);
Expand Down
Loading