!1050 merge fix-1030 into master

fix: 修复 switch 的 default 不在最后时，case 跳到错误的子句(#1030)

Created-by: GuoLan_Fruket
Commit-by: GuoLan
Merged-by: openharmony_ci
Description: ### 一、内容说明（相关的Issue）

把默认default在最后的写法换成了通过defaultBlock找到defaultIndex，兼容了default不在最后的情况。



See merge request: openharmony-sig/arkanalyzer!1050

Author: openharmony_ci

src/core/graph/builder/SwitchBuilder.ts

@@ -123,7 +123,17 @@ export class SwitchBuilder {
         const expectedSuccessorsOfCaseIfBlock: BasicBlock[] = [];
         const defaultStmtBuilder = switchStmtBuilder.default;
         if (defaultStmtBuilder && defaultStmtBuilder.block) {
-            expectedSuccessorsOfCaseIfBlock.push(...successorsOfBlockContainSwitch.splice(-1, 1));
+            // default may appear before later cases; identify by block identity, not list position
+            if (!blockBuilderToCfgBlock.has(defaultStmtBuilder.block)) {
+                logger.error(`can't find basicBlock corresponding to the default blockBuilder.`);
+                return false;
+            }
+            const defaultBasicBlock = blockBuilderToCfgBlock.get(defaultStmtBuilder.block)!;
+            const defaultIndex = successorsOfBlockContainSwitch.indexOf(defaultBasicBlock);
+            if (defaultIndex !== -1) {
+                successorsOfBlockContainSwitch.splice(defaultIndex, 1);
+            }
+            expectedSuccessorsOfCaseIfBlock.push(defaultBasicBlock);
         } else {
             const afterSwitchStmtBuilder = switchStmtBuilder.afterSwitch;
             const afterSwitchBlockBuilder = afterSwitchStmtBuilder?.block;

src/frontend/cppFrontend/graph/builder/SwitchBuilder.ts

@@ -123,7 +123,17 @@ export class CxxSwitchBuilder {
         const expectedSuccessorsOfCaseIfBlock: BasicBlock[] = [];
         const defaultStmtBuilder = switchStmtBuilder.default;
         if (defaultStmtBuilder && defaultStmtBuilder.block) {
-            expectedSuccessorsOfCaseIfBlock.push(...successorsOfBlockContainSwitch.splice(-1, 1));
+            // default may appear before later cases; identify by block identity, not list position
+            if (!blockBuilderToCfgBlock.has(defaultStmtBuilder.block)) {
+                logger.error(`can't find basicBlock corresponding to the default blockBuilder.`);
+                return false;
+            }
+            const defaultBasicBlock = blockBuilderToCfgBlock.get(defaultStmtBuilder.block)!;
+            const defaultIndex = successorsOfBlockContainSwitch.indexOf(defaultBasicBlock);
+            if (defaultIndex !== -1) {
+                successorsOfBlockContainSwitch.splice(defaultIndex, 1);
+            }
+            expectedSuccessorsOfCaseIfBlock.push(defaultBasicBlock);
         } else {
             const afterSwitchStmtBuilder = switchStmtBuilder.afterSwitch;
             const afterSwitchBlockBuilder = afterSwitchStmtBuilder?.block;

tests/resources/cfg/switch/SwitchExpect.ts

@@ -930,4 +930,116 @@ export const SWITCH_EXPECT_CASE17 = {
             succes: [3],
         },
     ],
+};
+
+export const SWITCH_EXPECT_CASE18 = {
+    blocks: [
+        {
+            id: 0,
+            stmts: [
+                'this = this: @switch/SwitchSample.ts: %dflt',
+                'a = 0',
+                'b = 1',
+                'if a == 1',
+            ],
+            preds: [],
+            succes: [1, 5],
+        },
+        {
+            id: 1,
+            stmts: [
+                'b = 11',
+            ],
+            preds: [0],
+            succes: [4],
+        },
+        {
+            id: 2,
+            stmts: [
+                'b = 99',
+            ],
+            preds: [5],
+            succes: [4],
+        },
+        {
+            id: 3,
+            stmts: [
+                'b = 22',
+            ],
+            preds: [5],
+            succes: [4],
+        },
+        {
+            id: 4,
+            stmts: [
+                'return',
+            ],
+            preds: [1, 2, 3],
+            succes: [],
+        },
+        {
+            id: 5,
+            stmts: [
+                'if a == 2',
+            ],
+            preds: [0],
+            succes: [3, 2],
+        },
+    ],
+};
+
+export const SWITCH_EXPECT_CASE19 = {
+    blocks: [
+        {
+            id: 0,
+            stmts: [
+                'this = this: @switch/SwitchSample.ts: %dflt',
+                'a = 0',
+                'b = 1',
+                'if a == 1',
+            ],
+            preds: [],
+            succes: [1, 5],
+        },
+        {
+            id: 1,
+            stmts: [
+                'b = 11',
+            ],
+            preds: [0],
+            succes: [2],
+        },
+        {
+            id: 2,
+            stmts: [
+                'b = 99',
+            ],
+            preds: [1, 5],
+            succes: [4],
+        },
+        {
+            id: 3,
+            stmts: [
+                'b = 22',
+            ],
+            preds: [5],
+            succes: [4],
+        },
+        {
+            id: 4,
+            stmts: [
+                'return',
+            ],
+            preds: [2, 3],
+            succes: [],
+        },
+        {
+            id: 5,
+            stmts: [
+                'if a == 2',
+            ],
+            preds: [0],
+            succes: [3, 2],
+        },
+    ],
 };

tests/resources/cfg/switch/SwitchSample.ts

@@ -233,4 +233,35 @@ function case17(): void {
             b = 3;
             break;
     }
+}
+
+function case18(): void {
+    let a = 0;
+    let b = 1;
+    switch (a) {
+        case 1:
+            b = 11;
+            break;
+        default:
+            b = 99;
+            break;
+        case 2:
+            b = 22;
+            break;
+    }
+}
+
+function case19(): void {
+    let a = 0;
+    let b = 1;
+    switch (a) {
+        case 1:
+            b = 11;
+        default:
+            b = 99;
+            break;
+        case 2:
+            b = 22;
+            break;
+    }
 }

tests/unit/core/graph/Cfg.test.ts

@@ -49,6 +49,8 @@ import {
     SWITCH_EXPECT_CASE15,
     SWITCH_EXPECT_CASE16,
     SWITCH_EXPECT_CASE17,
+    SWITCH_EXPECT_CASE18,
+    SWITCH_EXPECT_CASE19,
     SWITCH_EXPECT_CASE2,
     SWITCH_EXPECT_CASE3,
     SWITCH_EXPECT_CASE4,
@@ -221,6 +223,8 @@ describe('CfgTest', () => {
         testBlocks(scene, 'SwitchSample.ts', 'case15', SWITCH_EXPECT_CASE15.blocks);
         testBlocks(scene, 'SwitchSample.ts', 'case16', SWITCH_EXPECT_CASE16.blocks);
         testBlocks(scene, 'SwitchSample.ts', 'case17', SWITCH_EXPECT_CASE17.blocks);
+        testBlocks(scene, 'SwitchSample.ts', 'case18', SWITCH_EXPECT_CASE18.blocks);
+        testBlocks(scene, 'SwitchSample.ts', 'case19', SWITCH_EXPECT_CASE19.blocks);
     });
 
     it('case4: loop statement', () => {