Skip to content

Fix lost contextual types in instanceof #1107

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
merged 1 commit into from
Feb 11, 2020
Merged

Fix lost contextual types in instanceof #1107

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
13 changes: 8 additions & 5 deletions src/compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2652,7 +2652,7 @@ export class Compiler extends DiagnosticEmitter {
type = resolver.resolveType( // reports
declaration.type,
flow.actualFunction,
flow.contextualTypeArguments
makeMap(flow.contextualTypeArguments)
);
if (!type) continue;
if (declaration.initializer) {
Expand Down Expand Up @@ -3444,7 +3444,7 @@ export class Compiler extends DiagnosticEmitter {
let toType = this.resolver.resolveType( // reports
assert(expression.toType),
flow.actualFunction,
flow.contextualTypeArguments
makeMap(flow.contextualTypeArguments)
);
if (!toType) return this.module.unreachable();
return this.compileExpression(expression.expression, toType, inheritedConstraints | Constraints.CONV_EXPLICIT);
Expand Down Expand Up @@ -7644,9 +7644,14 @@ export class Compiler extends DiagnosticEmitter {
// time of implementation, this seemed more useful because dynamic rhs expressions are not
// possible in AS anyway. also note that the code generated below must preserve side-effects of
// the LHS expression even when the result is a constant, i.e. return a block dropping `expr`.
var flow = this.currentFlow;
var expr = this.compileExpression(expression.expression, this.options.usizeType);
var actualType = this.currentType;
var expectedType = this.resolver.resolveType(expression.isType, this.currentFlow.actualFunction);
var expectedType = this.resolver.resolveType(
expression.isType,
flow.actualFunction,
makeMap(flow.contextualTypeArguments)
);
this.currentType = Type.bool;
if (!expectedType) return module.unreachable();

Expand Down Expand Up @@ -7687,7 +7692,6 @@ export class Compiler extends DiagnosticEmitter {
if (expectedType.isAssignableTo(actualType)) {
let program = this.program;
if (!(actualType.isUnmanaged || expectedType.isUnmanaged)) {
let flow = this.currentFlow;
let temp = flow.getTempLocal(actualType);
let instanceofInstance = assert(program.instanceofInstance);
this.compileFunction(instanceofInstance);
Expand Down Expand Up @@ -7737,7 +7741,6 @@ export class Compiler extends DiagnosticEmitter {
// FIXME: the temp local and the if can be removed here once flows
// perform null checking, which would error earlier when checking
// uninitialized (thus zero) `var a: A` to be an instance of something.
let flow = this.currentFlow;
let temp = flow.getTempLocal(actualType);
let instanceofInstance = assert(program.instanceofInstance);
this.compileFunction(instanceofInstance);
Expand Down