Skip to content

Commit c73c323

Browse files
authored
Merge pull request #20636 from JamesKingdon/trampolineResetFix_0.49
Reset trampoline pointers to top of space (0.49)
2 parents f7ddf02 + bee4454 commit c73c323

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

runtime/compiler/runtime/J9CodeCache.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -749,8 +749,10 @@ J9::CodeCache::resetTrampolines()
749749
}
750750

751751
//reset the trampoline marks back to their starting positions
752-
_trampolineAllocationMark = _trampolineBase;
753-
_trampolineReservationMark = _trampolineBase;
752+
// Note that permanent trampolines are allocated from _tempTrampolineBase downwards
753+
// see initialize in OMRCodeCache.cpp
754+
_trampolineAllocationMark = _tempTrampolineBase;
755+
_trampolineReservationMark = _tempTrampolineBase;
754756

755757
OMR::CodeCacheTempTrampolineSyncBlock *syncBlock;
756758
if (!_tempTrampolinesMax)

0 commit comments

Comments
 (0)