added test

Author: ASDAlexander77

tsc/lib/TypeScript/LowerToLLVM.cpp

@@ -4648,6 +4648,27 @@ static void populateTypeScriptConversionPatterns(LLVMTypeConverter &converter, m
         return llvmPtrType;
     });
 
+    converter.addConversion([&](mlir_ts::ConstructFunctionType type) {
+        SmallVector<mlir::Type> convertedInputs;
+        for (auto subType : type.getInputs())
+        {
+            convertedInputs.push_back(converter.convertType(subType));
+        }
+
+        SmallVector<mlir::Type> convertedResults;
+        for (auto subType : type.getResults())
+        {
+            convertedResults.push_back(converter.convertType(subType));
+        }
+
+        auto funcType = mlir::FunctionType::get(type.getContext(), convertedInputs, convertedResults);
+
+        LLVMTypeConverter::SignatureConversion result(convertedInputs.size());
+        auto llvmFuncType = converter.convertFunctionSignature(funcType, false, result);
+        auto llvmPtrType = LLVM::LLVMPointerType::get(llvmFuncType);
+        return llvmPtrType;
+    });
+
     converter.addConversion([&](mlir_ts::BoundFunctionType type) {
         SmallVector<mlir::Type> convertedInputs;
         for (auto subType : type.getInputs())

tsc/test/tester/CMakeLists.txt

@@ -334,6 +334,7 @@ add_test(NAME test-compile-callWithSpread COMMAND test-runner "${PROJECT_SOURCE_
 add_test(NAME test-compile-newWithSpread COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/newWithSpread.ts")
 add_test(NAME test-compile-typeGuardOfFormThisMember COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/typeGuardOfFormThisMember.ts")
 add_test(NAME test-compile-typeGuardOfFormTypeOfBoolean COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/typeGuardOfFormTypeOfBoolean.ts")
+add_test(NAME test-compile-thisTypeInClasses COMMAND test-runner "${PROJECT_SOURCE_DIR}/test/tester/tests/thisTypeInClasses.ts")
 
 add_test(NAME test-jit-00-print COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00print.ts")
 add_test(NAME test-jit-00-assert COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/00assert.ts")
@@ -588,3 +589,4 @@ add_test(NAME test-jit-callWithSpread COMMAND test-runner -jit "${PROJECT_SOURCE
 add_test(NAME test-jit-newWithSpread COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/newWithSpread.ts")
 add_test(NAME test-jit-typeGuardOfFormThisMember COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/typeGuardOfFormThisMember.ts")
 add_test(NAME test-jit-typeGuardOfFormTypeOfBoolean COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/typeGuardOfFormTypeOfBoolean.ts")
+add_test(NAME test-jit-thisTypeInClasses COMMAND test-runner -jit "${PROJECT_SOURCE_DIR}/test/tester/tests/thisTypeInClasses.ts")

tsc/test/tester/tests/thisTypeInClasses.ts

@@ -0,0 +1,56 @@
+class C1 {
+    x: this;
+    f(x: this): this { return undefined; }
+}
+
+class C2 {
+    [x: string]: this;
+}
+
+interface Foo<T> {
+    x: T;
+    y: this;
+}
+
+class Date {}
+
+class C3 {
+    a: this[];
+    b: [this, this];
+    c: this | Date;
+    // TODO: intersection
+    //d: this & Date;
+    e: (((this)));
+    f: (x: this) => this;
+    g: new (x: this) => this;
+    h: Foo<this>;
+    i: Foo<this | (() => this)>;
+    j: (x: any) => x is this;
+}
+
+declare class C4 {
+    x: this;
+    f(x: this): this;
+}
+
+class C5 {
+    foo() {
+        let f1 = (x: this): this => this;
+        let f2 = (x: this) => this;
+        let f3 = (x: this) => (y: this) => this;
+        let f4 = (x: this) => {
+            let g = (y: this) => {
+                return () => this;
+            }
+            return g(this);
+        }
+    }
+    bar() {
+        let x1 = <this>undefined;
+        let x2 = undefined as this;
+    }
+}
+
+function main() {
+    print("done.");
+}