Skip to content

Check expression operand equivalence in isMatchingReference before computing property key equivalence #61608

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Check expression operand equivalence in isMatchingReference before computing property key equivalence #61608

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
8 changes: 5 additions & 3 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27184,9 +27184,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
case SyntaxKind.ElementAccessExpression:
const sourcePropertyName = getAccessedPropertyName(source as AccessExpression);
if (sourcePropertyName !== undefined) {
const targetPropertyName = isAccessExpression(target) ? getAccessedPropertyName(target) : undefined;
if (targetPropertyName !== undefined) {
return targetPropertyName === sourcePropertyName && isMatchingReference((source as AccessExpression).expression, (target as AccessExpression).expression);
if (isAccessExpression(target) && isMatchingReference((source as AccessExpression).expression, target.expression)) {
const targetPropertyName = isAccessExpression(target) ? getAccessedPropertyName(target) : undefined;
if (targetPropertyName !== undefined) {
return targetPropertyName === sourcePropertyName;
}
Comment on lines +27187 to +27191
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (isAccessExpression(target) && isMatchingReference((source as AccessExpression).expression, target.expression)) {
const targetPropertyName = isAccessExpression(target) ? getAccessedPropertyName(target) : undefined;
if (targetPropertyName !== undefined) {
return targetPropertyName === sourcePropertyName;
}
const targetIsAccess = isAccessExpression(target);
if (targetIsAccess && isMatchingReference((source as AccessExpression).expression, target.expression)) {
const targetPropertyName = getAccessedPropertyName(target);
if (targetPropertyName !== undefined) {
return targetPropertyName === sourcePropertyName;
}
}

This way isAccessExpression is only called once.

}
}
if (isElementAccessExpression(source) && isElementAccessExpression(target) && isIdentifier(source.argumentExpression) && isIdentifier(target.argumentExpression)) {
Expand Down
40 changes: 40 additions & 0 deletions tests/baselines/reference/circularRefFromClassMember.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
//// [tests/cases/compiler/circularRefFromClassMember.ts] ////

//// [circularRefFromClassMember.ts]
// Test for #61606

const result: boolean[] = [];
class Test {
n: 42 | "" = 42 as any;
foo(): void {
if (this.n === "") {
return;
}
for (let i = 0; i < 1; i++) {
const localN = this.n;
const localN_alias = localN;
result[localN_alias] = true;
}
}
}


//// [circularRefFromClassMember.js]
// Test for #61606
var result = [];
var Test = /** @class */ (function () {
function Test() {
this.n = 42;
}
Test.prototype.foo = function () {
if (this.n === "") {
return;
}
for (var i = 0; i < 1; i++) {
var localN = this.n;
var localN_alias = localN;
result[localN_alias] = true;
}
};
return Test;
}());
46 changes: 46 additions & 0 deletions tests/baselines/reference/circularRefFromClassMember.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
//// [tests/cases/compiler/circularRefFromClassMember.ts] ////

=== circularRefFromClassMember.ts ===
// Test for #61606

const result: boolean[] = [];
>result : Symbol(result, Decl(circularRefFromClassMember.ts, 2, 5))

class Test {
>Test : Symbol(Test, Decl(circularRefFromClassMember.ts, 2, 29))

n: 42 | "" = 42 as any;
>n : Symbol(Test.n, Decl(circularRefFromClassMember.ts, 3, 12))

foo(): void {
>foo : Symbol(Test.foo, Decl(circularRefFromClassMember.ts, 4, 27))

if (this.n === "") {
>this.n : Symbol(Test.n, Decl(circularRefFromClassMember.ts, 3, 12))
>this : Symbol(Test, Decl(circularRefFromClassMember.ts, 2, 29))
>n : Symbol(Test.n, Decl(circularRefFromClassMember.ts, 3, 12))

return;
}
for (let i = 0; i < 1; i++) {
>i : Symbol(i, Decl(circularRefFromClassMember.ts, 9, 16))
>i : Symbol(i, Decl(circularRefFromClassMember.ts, 9, 16))
>i : Symbol(i, Decl(circularRefFromClassMember.ts, 9, 16))

const localN = this.n;
>localN : Symbol(localN, Decl(circularRefFromClassMember.ts, 10, 17))
>this.n : Symbol(Test.n, Decl(circularRefFromClassMember.ts, 3, 12))
>this : Symbol(Test, Decl(circularRefFromClassMember.ts, 2, 29))
>n : Symbol(Test.n, Decl(circularRefFromClassMember.ts, 3, 12))

const localN_alias = localN;
>localN_alias : Symbol(localN_alias, Decl(circularRefFromClassMember.ts, 11, 17))
>localN : Symbol(localN, Decl(circularRefFromClassMember.ts, 10, 17))

result[localN_alias] = true;
>result : Symbol(result, Decl(circularRefFromClassMember.ts, 2, 5))
>localN_alias : Symbol(localN_alias, Decl(circularRefFromClassMember.ts, 11, 17))
}
}
}

87 changes: 87 additions & 0 deletions tests/baselines/reference/circularRefFromClassMember.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
//// [tests/cases/compiler/circularRefFromClassMember.ts] ////

=== circularRefFromClassMember.ts ===
// Test for #61606

const result: boolean[] = [];
>result : boolean[]
> : ^^^^^^^^^
>[] : undefined[]
> : ^^^^^^^^^^^

class Test {
>Test : Test
> : ^^^^

n: 42 | "" = 42 as any;
>n : "" | 42
> : ^^^^^^^
>42 as any : any
>42 : 42
> : ^^

foo(): void {
>foo : () => void
> : ^^^^^^

if (this.n === "") {
>this.n === "" : boolean
> : ^^^^^^^
>this.n : "" | 42
> : ^^^^^^^
>this : this
> : ^^^^
>n : "" | 42
> : ^^^^^^^
>"" : ""
> : ^^

return;
}
for (let i = 0; i < 1; i++) {
>i : number
> : ^^^^^^
>0 : 0
> : ^
>i < 1 : boolean
> : ^^^^^^^
>i : number
> : ^^^^^^
>1 : 1
> : ^
>i++ : number
> : ^^^^^^
>i : number
> : ^^^^^^

const localN = this.n;
>localN : 42
> : ^^
>this.n : 42
> : ^^
>this : this
> : ^^^^
>n : 42
> : ^^

const localN_alias = localN;
>localN_alias : 42
> : ^^
>localN : 42
> : ^^

result[localN_alias] = true;
>result[localN_alias] = true : true
> : ^^^^
>result[localN_alias] : boolean
> : ^^^^^^^
>result : boolean[]
> : ^^^^^^^^^
>localN_alias : 42
> : ^^
>true : true
> : ^^^^
}
}
}

16 changes: 16 additions & 0 deletions tests/cases/compiler/circularRefFromClassMember.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Test for #61606

const result: boolean[] = [];
class Test {
n: 42 | "" = 42 as any;
foo(): void {
if (this.n === "") {
return;
}
for (let i = 0; i < 1; i++) {
const localN = this.n;
const localN_alias = localN;
result[localN_alias] = true;
}
}
}