The 2014 US Open champion will play the Swiss maestro in the second round of the French Open on Thursday.