RE: r289991 - Revert r289979 due to regressions

2016-12-17 Thread Liu, Yaxun (Sam) via cfe-commits
Thanks. Sam From: Reid Kleckner [mailto:r...@google.com] Sent: Friday, December 16, 2016 5:24 PM To: Liu, Yaxun (Sam) Cc: cfe-commits Subject: Re: r289991 - Revert r289979 due to regressions This revert broke the build because you failed to resolve conflicts in include/clang/Basic

Re: r289991 - Revert r289979 due to regressions

2016-12-16 Thread Reid Kleckner via cfe-commits
This revert broke the build because you failed to resolve conflicts in include/clang/Basic/OpenCLOptions.h caused by r289985. I've reverted that file in r289997. On Fri, Dec 16, 2016 at 1:23 PM, Yaxun Liu via cfe-commits < cfe-commits@lists.llvm.org> wrote: > Author: yaxunl > Date: Fri Dec 16 15: