fixes

Author: ASDAlexander77

docs/how/cmake_winapp/typescript.cmake

@@ -25,11 +25,9 @@ macro(add_tsc_files subpath)
 	file(GLOB TSC_SRC "${fileSelectPath}/*.${TSExt}")
 
 	if (CMAKE_BUILD_TYPE STREQUAL "Release")
-		set (TS_FLAGS "-opt")
-		set (LLC_FLAGS "")
+		set (TS_FLAGS "--opt")
 	else()
-		set (TS_FLAGS "")
-		set (LLC_FLAGS "--experimental-debug-variable-locations")
+		set (TS_FLAGS "--opt_level=0 --di")
 	endif()
 
 	set (TS_FILES)
@@ -49,8 +47,7 @@ macro(add_tsc_files subpath)
 
 	    add_custom_command(
 		OUTPUT "${obj_file}"
-		#COMMAND ${CMAKE_COMMAND} -E echo "Compiling ${source_file} to ${obj_file}"
-		COMMAND "${TSC_APP}" --emit=obj -o="${obj_file}" ${TS_FLAGS} ${LLC_FLAGS} "${source_file}"
+		COMMAND "${TSC_APP}" --emit=obj -o="${obj_file}" ${TS_FLAGS} "${source_file}"
 		DEPENDS "${source_file}"
 		BYPRODUCTS "${obj_file}"
   		COMMENT "Compiling ${source_file} to ${obj_file}"

tsc/lib/TypeScript/MLIRGen.cpp

@@ -198,8 +198,8 @@ class MLIRGenImpl
 
             filesToProcess.pop_back();
 
-            std::string ignored;
-            auto id = sourceMgr.AddIncludeFile(std::string(fullPath), SMLoc(), ignored);
+            std::string actualFilePath;
+            auto id = sourceMgr.AddIncludeFile(std::string(fullPath), SMLoc(), actualFilePath);
             if (!id)
             {
                 emitError(location, "can't open file: ") << fullPath;
@@ -210,7 +210,7 @@ class MLIRGenImpl
 
             Parser parser;
             auto includeFile =
-                parser.parseSourceFile(includeFileName, stows(sourceBuf->getBuffer().str()), ScriptTarget::Latest);
+                parser.parseSourceFile(ConvertUTF8toWide(actualFilePath), stows(sourceBuf->getBuffer().str()), ScriptTarget::Latest);
             for (auto refFile : includeFile->referencedFiles)
             {
                 filesToProcess.push_back(refFile.fileName);
@@ -404,6 +404,10 @@ class MLIRGenImpl
 
         for (auto includeFile : includeFiles)
         {
+            MLIRValueGuard<llvm::StringRef> vgFileName(fileName); 
+            auto fileNameUtf8 = convertWideToUTF8(includeFile->fileName);
+            fileName = fileNameUtf8;
+
             if (failed(mlirGen(includeFile->statements, genContextPartial)))
             {
                 outputDiagnostics(postponedMessages, 1);
@@ -453,8 +457,13 @@ class MLIRGenImpl
 
         for (auto includeFile : includeFiles)
         {
+            MLIRValueGuard<llvm::StringRef> vgFileName(fileName); 
+            auto fileNameUtf8 = convertWideToUTF8(includeFile->fileName);
+            fileName = fileNameUtf8;
+
             if (failed(mlirGen(includeFile->statements, genContext)))
             {
+                outputDiagnostics(postponedMessages, 1);
                 return mlir::failure();
             }
         }