Roger Federer set up a French Open semi-final against defending champion Rafael Nadal by overcoming fellow Swiss Stan Wawrinka in four sets.
Shortly before Federer won, Nadal completed a 6-1 6-1 6-3 win over Kei Nishikori in the quarter-finals.
But 20-time Grand Slam champion Federer endured an energy-sapping three hours and 17 minutes on Court Suzanne Lenglen to win 7-6 (7-4) 4-6 7-6 (7-5) 6-4.
“The complete dream would be to win the tournament,” said Federer, 37.
“But I’m very happy, number one, to be back in another semi-final of a Grand Slam. It hasn’t happened in the last year or so. I had some tough losses in fourth rounds or quarters.
“So from that standpoint, I exceeded my expectations here.”
Federer is playing at Roland Garros for the first time in four years, having missed the 2016 event with a back injury and skipped the past two clay-court swings to preserve his body.
He faced the toughest test of his clay comeback so far against Wawrinka, the 2015 champion, who had progressed beyond the second round of a Grand Slam for the first time since losing in the 2017 French Open final.
Federer, the third seed, dropped his first set of the tournament and only converted two of his 18 break points, although the second of those – in the ninth game of the fourth set – proved decisive.
“Stan has had some tough years with injuries,” added Federer, who is into the last four of the competition for the first time since 2012.
“I had to break his rhythm because he’s so powerful. I took some risks and they came off but I was pretty lucky at the end.”
Nadal, 33, is into his 12th semi-final at Roland Garros and has won the tournament on all of the 11 previous occasions he has reached this stage.
He cruised through in one hour and 51 minutes against Japanese seventh seed Nishikori, who had been taken to five sets in his previous two matches.
“The way that I have been playing is, being honest, very positive,” said Nadal. “I have been playing well, very solid.
“Having Roger in front in the semi-finals is an extra thing. We shared the most important moments of our careers together on court facing each other.
“So it is another episode of this, and I’m happy for that and excited. It will be a special moment.”
He will now meet Federer, who won his only title at Roland Garros a decade ago, for the 39th time on Friday, having won all of their previous five meetings at the tournament, including the 2006, 2007, 2008 and 2011 finals.
Nadal also boasts a 23-15 head-to-head record against the Swiss, but it is Federer who has been victorious in their past five matches.