Skip to content

fix: check function's instance class is a subclass of virtual method #1985

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
MaxGraey merged 6 commits into from
Jul 23, 2021
Merged

fix: check function's instance class is a subclass of virtual method #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
410b219
fix: check function's instance class is a subclass of virtual method
Jul 15, 2021
5184fce
chore: fix test format
Jul 15, 2021
d01dca8
chore: clean up tests and add asserts
Jul 15, 2021
d5015eb
Update tests/compiler/class-overloading-cast.ts
Jul 15, 2021
8c1248a
chore: move cast out of loop
Jul 15, 2021
625958d
fix: include interfaces in initial assert
Jul 15, 2021
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
4 changes: 4 additions & 0 deletions src/compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6947,6 +6947,8 @@ export class Compiler extends DiagnosticEmitter {
// Wouldn't be here if there wasn't at least one overload
var overloadPrototypes = assert(instance.prototype.overloads);

assert(instance.parent.kind == ElementKind.CLASS || instance.parent.kind == ElementKind.INTERFACE);
var parentClassInstance = <Class>instance.parent;
var module = this.module;
var usizeType = this.options.usizeType;
var sizeTypeRef = usizeType.toRef();
Expand Down Expand Up @@ -6992,6 +6994,8 @@ export class Compiler extends DiagnosticEmitter {
if (classInstances) {
for (let _values = Map_values(classInstances), j = 0, l = _values.length; j < l; ++j) {
let classInstance = _values[j];
// Chcek if the parent class is a subtype of instance's class
if (!classInstance.isAssignableTo(parentClassInstance)) continue;
let overloadInstance: Function | null;
if (isProperty) {
let boundProperty = assert(classInstance.members!.get(unboundOverloadParent.name));
Expand Down
5 changes: 5 additions & 0 deletions tests/compiler/class-overloading-cast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"asc_flags": [
"--explicitStart"
]
}
Loading