Some fixes to logic and debug info generation (#156)

* some fixes to debug info

* update vs template

* added test for uint cmp bug

* fixed issue with uint cmp

* more fixes to process class with default generic params

* progress of fixing element offset

* fixes to debug info

* fix

* implementing any type ops

* some update

* added any compare op

* added any type tests

* more fixes

* fixed reference issue

* update build scripts

Author: ASDAlexander77

tag.bat

@@ -1,2 +1,2 @@
-git tag -a v0.0-pre-alpha67 -m "pre alpha v0.0-67"
+git tag -a v0.0-pre-alpha68 -m "pre alpha v0.0-68"
 git push origin --tags

tag_del.bat

@@ -1,2 +1,2 @@
-git push --delete origin v0.0-pre-alpha67
-git tag -d v0.0-pre-alpha67
+git push --delete origin v0.0-pre-alpha68
+git tag -d v0.0-pre-alpha68

tsc/include/TypeScript/Defines.h

@@ -89,6 +89,10 @@
 #define UNION_TAG_INDEX 0
 #define UNION_VALUE_INDEX 1
 
+#define ANY_SIZE 0
+#define ANY_TYPE 1
+#define ANY_DATA 2
+
 #define DEFAULT_LIB_DIR "defaultlib"
 #define DEFAULT_LIB_NAME "TypeScriptDefaultLib"
 

tsc/include/TypeScript/LowerToLLVM/AnyLogic.h

@@ -33,20 +33,20 @@ class AnyLogic
   protected:
     mlir::Type indexType;
     mlir::Type llvmIndexType;
-    mlir::Type valuePtrType;
+    mlir::Type ptrTy;
 
   public:
     AnyLogic(Operation *op, PatternRewriter &rewriter, TypeConverterHelper &tch, Location loc, CompileOptions &compileOptions)
         : op(op), rewriter(rewriter), tch(tch), th(rewriter), ch(op, rewriter, tch.typeConverter, compileOptions), clh(op, rewriter), loc(loc)
     {
         indexType = th.getIndexType();
         llvmIndexType = tch.convertType(indexType);
-        valuePtrType = th.getPtrType();
+        ptrTy = th.getPtrType();
     }
 
     LLVM::LLVMStructType getStorageAnyType(mlir::Type llvmStorageType)
     {
-        return LLVM::LLVMStructType::getLiteral(rewriter.getContext(), {llvmIndexType, valuePtrType, llvmStorageType}, false);
+        return LLVM::LLVMStructType::getLiteral(rewriter.getContext(), {llvmIndexType, ptrTy, llvmStorageType}, false);
     }
 
     mlir::Value castToAny(mlir::Value in, mlir::Type inType, mlir::Type inLLVMType)
@@ -61,7 +61,6 @@ class AnyLogic
     mlir::Value castToAny(mlir::Value in, mlir::Value typeOfValue, mlir::Type inLLVMType)
     {
         // TODO: add type id to track data type
-        auto ptrTy = th.getPtrType();
         auto llvmStorageType = inLLVMType;
         auto dataWithSizeType = getStorageAnyType(llvmStorageType);
 
@@ -71,9 +70,9 @@ class AnyLogic
         auto sizeMLIR = rewriter.create<mlir_ts::SizeOfOp>(loc, indexType, llvmStorageType);
         auto size = rewriter.create<mlir_ts::DialectCastOp>(loc, llvmIndexType, sizeMLIR);
 
-        auto zero = clh.createI32ConstantOf(0);
-        auto one = clh.createI32ConstantOf(1);
-        auto two = clh.createI32ConstantOf(2);
+        auto zero = clh.createI32ConstantOf(ANY_SIZE);
+        auto one = clh.createI32ConstantOf(ANY_TYPE);
+        auto two = clh.createI32ConstantOf(ANY_DATA);
 
         auto ptrSize = rewriter.create<LLVM::GEPOp>(loc, ptrTy, dataWithSizeType, memValue, ValueRange{zero, zero});
         rewriter.create<LLVM::StoreOp>(loc, size, ptrSize);
@@ -92,15 +91,14 @@ class AnyLogic
     {
         // TODO: add type id to track data type
         // TODO: add data size check
-        auto ptrTy = th.getPtrType();
         auto llvmStorageType = resLLVMType;
         auto dataWithSizeType = getStorageAnyType(llvmStorageType);
 
         auto inDataWithSizeTypedValue = rewriter.create<LLVM::BitcastOp>(loc, ptrTy, in);
 
-        auto zero = clh.createI32ConstantOf(0);
-        // auto one = clh.createI32ConstantOf(1);
-        auto two = clh.createI32ConstantOf(2);
+        auto zero = clh.createI32ConstantOf(ANY_SIZE);
+        //auto one = clh.createI32ConstantOf(ANY_TYPE);
+        auto two = clh.createI32ConstantOf(ANY_DATA);
 
         // set actual value
         auto ptrValue =
@@ -113,21 +111,60 @@ class AnyLogic
         // TODO: add type id to track data type
         // TODO: add data size check
         // any random type
-        auto ptrTy = th.getPtrType();
         auto llvmStorageType = th.getI8Type();
         auto dataWithSizeType = getStorageAnyType(llvmStorageType);
 
         auto inDataWithSizeTypedValue = rewriter.create<LLVM::BitcastOp>(loc, ptrTy, in);
 
-        auto zero = clh.createI32ConstantOf(0);
-        auto one = clh.createI32ConstantOf(1);
-        // auto two = clh.createI32ConstantOf(2);
+        auto zero = clh.createI32ConstantOf(ANY_SIZE);
+        auto one = clh.createI32ConstantOf(ANY_TYPE);
+        //auto two = clh.createI32ConstantOf(ANY_DATA);
 
         // set actual value
         auto ptrValue = rewriter.create<LLVM::GEPOp>(loc, ptrTy, dataWithSizeType, inDataWithSizeTypedValue,
                                                      ValueRange{zero, one});
-        return rewriter.create<LLVM::LoadOp>(loc, valuePtrType, ptrValue);
+        return rewriter.create<LLVM::LoadOp>(loc, ptrTy, ptrValue);
     }
+
+    mlir::Value getDataSizeOfAny(mlir::Value in)
+    {
+        // TODO: add type id to track data type
+        // TODO: add data size check
+        // any random type
+        auto llvmStorageType = th.getI8Type();
+        auto dataWithSizeType = getStorageAnyType(llvmStorageType);
+
+        auto inDataWithSizeTypedValue = rewriter.create<LLVM::BitcastOp>(loc, ptrTy, in);
+
+        auto zero = clh.createI32ConstantOf(ANY_SIZE);
+        //auto one = clh.createI32ConstantOf(ANY_TYPE);
+        //auto two = clh.createI32ConstantOf(ANY_DATA);
+
+        // set actual value
+        auto ptrValue = rewriter.create<LLVM::GEPOp>(loc, ptrTy, dataWithSizeType, inDataWithSizeTypedValue,
+                                                     ValueRange{zero, zero});
+        return rewriter.create<LLVM::LoadOp>(loc, llvmIndexType, ptrValue);
+    }    
+
+    mlir::Value getDataPtrOfAny(mlir::Value in)
+    {
+        // TODO: add type id to track data type
+        // TODO: add data size check
+        // any random type
+        auto llvmStorageType = th.getI8Type();
+        auto dataWithSizeType = getStorageAnyType(llvmStorageType);
+
+        auto inDataWithSizeTypedValue = rewriter.create<LLVM::BitcastOp>(loc, ptrTy, in);
+
+        auto zero = clh.createI32ConstantOf(ANY_SIZE);
+        //auto one = clh.createI32ConstantOf(ANY_TYPE);
+        auto two = clh.createI32ConstantOf(ANY_DATA);
+
+        // set actual value
+        auto ptrValue = rewriter.create<LLVM::GEPOp>(loc, ptrTy, dataWithSizeType, inDataWithSizeTypedValue,
+                                                     ValueRange{zero, two});
+        return ptrValue;
+    }    
 };
 } // namespace typescript