One minor question: the options are stored in std::map<std::string, std::string>. I wonder if there is any specific reason not to use llvm::StringMap in this case. http://reviews.llvm.org/D8164 EMAIL PREFERENCES http://reviews.llvm.org/settings/panel/emailpreferences/