Could you take a quick look at http://reviews.llvm.org/D5575 I changed it according to your comments and added a second refactoring patch to rename the LoopAnnotator to ScopAnnotator. - {F193710, layout=link} http://reviews.llvm.org/D5563