From 185b38af77ccaac44e2e11cc3706e5526c9d6c8b Mon Sep 17 00:00:00 2001
From: hufeng <hufeng20@huawei.com>
Date: Sat, 11 Sep 2021 13:02:45 +0800
Subject: [PATCH 1/2] fix function illegel name for assembler

Signed-off-by: hufeng <hufeng20@huawei.com>
---
 ts2panda/src/compilerDriver.ts | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/ts2panda/src/compilerDriver.ts b/ts2panda/src/compilerDriver.ts
index ccdcafeb2d..bcb99efba2 100755
--- a/ts2panda/src/compilerDriver.ts
+++ b/ts2panda/src/compilerDriver.ts
@@ -313,14 +313,15 @@ export class CompilerDriver {
      * Runtime uses this name to bind code and a Function object
      */
     getFuncInternalName(node: ts.SourceFile | ts.FunctionLikeDeclaration, recorder: Recorder): string {
+        let name: string;
         if (ts.isSourceFile(node)) {
-            return "func_main_0";
+            name = "func_main_0";
         } else if (ts.isConstructorDeclaration(node)) {
             let classNode = node.parent;
-            return this.getInternalNameForCtor(classNode);
+            name = this.getInternalNameForCtor(classNode);
         } else {
             let funcNode = <ts.FunctionLikeDeclaration>node;
-            let name: string = (<FunctionScope>recorder.getScopeOfNode(funcNode)).getFuncName();
+            name = (<FunctionScope>recorder.getScopeOfNode(funcNode)).getFuncName();
             if (name == '') {
                 return `#${this.getFuncId(funcNode)}#`;
             }
@@ -339,13 +340,20 @@ export class CompilerDriver {
                 throw new Error("the function name is missing from the name map");
             }
 
-            return name;
+            if (name.lastIndexOf(".") != -1) {
+                name = `#${this.getFuncId(funcNode)}#`
+            }
         }
+        return name;
     }
 
     getInternalNameForCtor(node: ts.ClassLikeDeclaration) {
         let name = getClassNameForConstructor(node);
-        return `#${this.getFuncId(node)}#${name}`;
+        name = `#${this.getFuncId(node)}#${name}`
+        if (name.lastIndexOf(".") != -1) {
+            name = `#${this.getFuncId(node)}#`
+        }
+        return name;
     }
 
     writeBinaryFile(pandaGen: PandaGen) {
-- 
Gitee


From 6d66122d905c5fad6b14fba3ad22e35aa0775030 Mon Sep 17 00:00:00 2001
From: hufeng <hufeng20@huawei.com>
Date: Fri, 10 Sep 2021 14:28:54 +0800
Subject: [PATCH 2/2] remove windows-version toolchains' built from full-build

Signed-off-by: hufeng <hufeng20@huawei.com>
---
 ts2panda/BUILD.gn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ts2panda/BUILD.gn b/ts2panda/BUILD.gn
index 9b3a5ec493..e897cadf59 100755
--- a/ts2panda/BUILD.gn
+++ b/ts2panda/BUILD.gn
@@ -303,8 +303,6 @@ group("ark_ts2abc_build") {
     deps += [
       "${ts2abc_root}:ts2abc_build(${buildtool_linux})",
       "${ts2abc_root}:ts2abc_build_ets(${buildtool_linux})",
-      "${ts2abc_root}:ts2abc_build_win(${buildtool_win})",
-      "${ts2abc_root}:ts2abc_build_win_ets(${buildtool_win})",
     ]
   }
 }
-- 
Gitee