[5.0 -> main] avoid using a stack variable after return

[5.0 -> main] avoid using a stack variable after return #6327