Use BBF_IMPORTER for new blocks in helperexpansion.cpp

Author: EgorBo

src/coreclr/jit/helperexpansion.cpp

@@ -242,7 +242,6 @@ bool Compiler::fgExpandRuntimeLookupsForCall(BasicBlock** pBlock, Statement* stm
     }
 
     GenTree* ctxTree = call->gtArgs.GetArgByIndex(0)->GetNode();
-    GenTree* sigNode = call->gtArgs.GetArgByIndex(1)->GetNode();
 
     // Prepare slotPtr tree (TODO: consider sharing this part with impRuntimeLookup)
     GenTree* slotPtrTree   = gtCloneExpr(ctxTree);
@@ -442,6 +441,23 @@ bool Compiler::fgExpandRuntimeLookupsForCall(BasicBlock** pBlock, Statement* stm
         fallbackBb->inheritWeightPercentage(nullcheckBb, 20);
     }
 
+    if (prevBb->HasFlag(BBF_IMPORTED))
+    {
+        nullcheckBb->RemoveFlags(BBF_INTERNAL);
+        nullcheckBb->SetFlags(BBF_IMPORTED);
+
+        fastPathBb->RemoveFlags(BBF_INTERNAL);
+        fastPathBb->SetFlags(BBF_IMPORTED);
+
+        if (needsSizeCheck)
+        {
+            sizeCheckBb->RemoveFlags(BBF_INTERNAL);
+            sizeCheckBb->SetFlags(BBF_IMPORTED);
+        }
+
+        assert(block->HasFlag(BBF_IMPORTED));
+    }
+
     // All blocks are expected to be in the same EH region
     assert(BasicBlock::sameEHRegion(prevBb, block));
     assert(BasicBlock::sameEHRegion(prevBb, nullcheckBb));
@@ -1546,6 +1562,14 @@ bool Compiler::fgExpandStaticInitForCall(BasicBlock** pBlock, Statement* stmt, G
     isInitedBb->inheritWeight(prevBb);
     helperCallBb->inheritWeightPercentage(isInitedBb, 0);
 
+    if (prevBb->HasFlag(BBF_IMPORTED))
+    {
+        isInitedBb->RemoveFlags(BBF_INTERNAL);
+        isInitedBb->SetFlags(BBF_IMPORTED);
+
+        assert(block->HasFlag(BBF_IMPORTED));
+    }
+
     // All blocks are expected to be in the same EH region
     assert(BasicBlock::sameEHRegion(prevBb, block));
     assert(BasicBlock::sameEHRegion(prevBb, isInitedBb));