Adapt to changes made in r302499. llvm-svn: 302501
Patch by Dan Liew <daniel.liew@imperial.ac.uk>! llvm-svn: 206662