Fix #2062 FN variable scope can be reduced (class instance) (#7885)

Fix #2062 FN variable scope can be reduced (class instance) (#7885) #20634