This repository was archived by the owner on Jan 23, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -372,10 +372,10 @@ struct BasicBlock
372
372
373
373
// TODO: Should BBF_RUN_RARELY be added to BBF_SPLIT_GAINED ?
374
374
375
- #define BBF_SPLIT_GAINED (BBF_DONT_REMOVE | BBF_HAS_LABEL | \
375
+ #define BBF_SPLIT_GAINED (BBF_DONT_REMOVE | BBF_HAS_LABEL | \
376
376
BBF_HAS_JMP | BBF_BACKWARD_JUMP | \
377
- BBF_HAS_INDX | BBF_HAS_NEWARRAY | \
378
- BBF_PROF_WEIGHT | \
377
+ BBF_HAS_INDX | BBF_HAS_NEWARRAY | \
378
+ BBF_PROF_WEIGHT | BBF_HAS_NEWOBJ | \
379
379
BBF_KEEP_BBJ_ALWAYS)
380
380
381
381
#ifndef __GNUC__ // GCC doesn't like C_ASSERT at global scope
Original file line number Diff line number Diff line change @@ -22022,6 +22022,12 @@ void Compiler::fgInsertInlineeBlocks(InlineInfo* pInlineInfo)
22022
22022
stmtAfter = fgInsertStmtListAfter(iciBlock,
22023
22023
stmtAfter,
22024
22024
InlineeCompiler->fgFirstBB->bbTreeList);
22025
+
22026
+ // Copy inlinee bbFlags to caller bbFlags.
22027
+ const unsigned int inlineeBlockFlags = InlineeCompiler->fgFirstBB->bbFlags;
22028
+ noway_assert((inlineeBlockFlags & BBF_HAS_JMP) == 0);
22029
+ noway_assert((inlineeBlockFlags & BBF_KEEP_BBJ_ALWAYS) == 0);
22030
+ iciBlock->bbFlags |= inlineeBlockFlags;
22025
22031
}
22026
22032
#ifdef DEBUG
22027
22033
if (verbose)
You can’t perform that action at this time.
0 commit comments