The 36-year-old Serb, champion in Paris in 2016 and 2021, will face 11th seed Karen Khachanov for a place in the semi-finals.