From 3fb0fa032a801d644c6bdca98449f93d30407f4b Mon Sep 17 00:00:00 2001
From: qiuyu <qiuyu22@huawei.com>
Date: Tue, 12 Jul 2022 22:28:23 +0800
Subject: [PATCH] Remove the option enable-typeinfo

Remove the option enable-typeinfo as the runtime adaption has been ready

Signed-off-by: qiuyu <qiuyu22@huawei.com>
Change-Id: Ic0ff22a1467608ae050809f13b91d8b6e883040b
---
 ts2panda/src/cmdOptions.ts |  8 --------
 ts2panda/src/ts2panda.ts   |  1 -
 ts2panda/ts2abc/ts2abc.cpp | 15 ++-------------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/ts2panda/src/cmdOptions.ts b/ts2panda/src/cmdOptions.ts
index 4e108670db..3cce689f48 100644
--- a/ts2panda/src/cmdOptions.ts
+++ b/ts2panda/src/cmdOptions.ts
@@ -45,7 +45,6 @@ const ts2pandaOptions = [
     { name: 'dts-type-record', alias: 'q', type: Boolean, defaultValue: false, description: "Record type info for .d.ts files. Default: false" },
     { name: 'debug-type', alias: 'g', type: Boolean, defaultValue: false, description: "Print type-related log. Default: false" },
     { name: 'output-type', type: Boolean, defaultValue: false, description: "set output type."},
-    { name: 'enable-typeinfo', type: Boolean, defaultValue: false, description: "Enable typeinfo of pairs of instruction orders and types" },
     { name: 'display-typeinfo', type: Boolean, defaultValue: false, description: "Display typeinfo of pairs of instruction orders and types when enable-typeinfo is true" }
 ]
 
@@ -55,13 +54,6 @@ export class CmdOptions {
     private static parsedResult: ts.ParsedCommandLine;
     private static options: commandLineArgs.CommandLineOptions;
 
-    static getEnableTypeinfo(): boolean {
-        if (!this.options) {
-            return false;
-        }
-        return this.options["enable-typeinfo"];
-    }
-
     static getDisplayTypeinfo(): boolean {
         if (!this.options) {
             return false;
diff --git a/ts2panda/src/ts2panda.ts b/ts2panda/src/ts2panda.ts
index 52c1823865..39c62abb7a 100644
--- a/ts2panda/src/ts2panda.ts
+++ b/ts2panda/src/ts2panda.ts
@@ -195,7 +195,6 @@ export class Ts2Panda {
             "log_enabled": CmdOptions.isEnableDebugLog(),
             "opt_level": CmdOptions.getOptLevel(),
             "opt_log_level": CmdOptions.getOptLogLevel(),
-            "enable_typeinfo": CmdOptions.getEnableTypeinfo(),
             "display_typeinfo": CmdOptions.getDisplayTypeinfo()
         };
         let jsonOpt = JSON.stringify(options, null, 2);
diff --git a/ts2panda/ts2abc/ts2abc.cpp b/ts2panda/ts2abc/ts2abc.cpp
index f66e50ce9f..a457c79bbf 100644
--- a/ts2panda/ts2abc/ts2abc.cpp
+++ b/ts2panda/ts2abc/ts2abc.cpp
@@ -900,14 +900,6 @@ static void ParseOptLevel(const Json::Value &rootValue)
     }
 }
 
-static void ParseEnableTypeinfo(const Json::Value &rootValue)
-{
-    Logd("-----------------parse enable_typeinfo-----------------");
-    if (rootValue.isMember("enable_typeinfo") && rootValue["enable_typeinfo"].isBool()) {
-        g_enableTypeinfo = rootValue["enable_typeinfo"].asBool();
-    }
-}
-
 static void ParseDisplayTypeinfo(const Json::Value &rootValue)
 {
     Logd("-----------------parse enable_typeinfo-----------------");
@@ -944,7 +936,6 @@ static void ParseOptions(const Json::Value &rootValue, panda::pandasm::Program &
     ParseLogEnable(rootValue);
     ParseDebugMode(rootValue);
     ParseOptLevel(rootValue);
-    ParseEnableTypeinfo(rootValue);
     ParseDisplayTypeinfo(rootValue);
     ParseOptLogLevel(rootValue);
 }
@@ -1318,10 +1309,8 @@ bool GenerateProgram([[maybe_unused]] const std::string &data, const std::string
 
     Logd("parsing done, calling pandasm\n");
 
-    if (g_enableTypeinfo) {
-        TypeAdapter ada(g_displayTypeinfo);
-        ada.AdaptTypeForProgram(&prog);
-    }
+    TypeAdapter ada(g_displayTypeinfo);
+    ada.AdaptTypeForProgram(&prog);
 
 #ifdef ENABLE_BYTECODE_OPT
     if (g_optLevel != static_cast<int>(OptLevel::O_LEVEL0) || optLevel != static_cast<int>(OptLevel::O_LEVEL0)) {
-- 
Gitee