Author: yaxunl Date: Sun Dec 18 00:35:06 2016 New Revision: 290058 URL: http://llvm.org/viewvc/llvm-project?rev=290058&view=rev Log: Attempt to fix build failure and regressions due to r290056
Add llvm:: namespace to StringRef. Make conversion between bool and uint64_t explicit. Modified: cfe/trunk/include/clang/Basic/OpenCLOptions.h cfe/trunk/lib/Serialization/ASTReader.cpp cfe/trunk/lib/Serialization/ASTWriter.cpp Modified: cfe/trunk/include/clang/Basic/OpenCLOptions.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenCLOptions.h?rev=290058&r1=290057&r2=290058&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/OpenCLOptions.h (original) +++ cfe/trunk/include/clang/Basic/OpenCLOptions.h Sun Dec 18 00:35:06 2016 @@ -32,24 +32,24 @@ class OpenCLOptions { }; llvm::StringMap<Info> OptMap; public: - bool isKnown(StringRef Ext) const { + bool isKnown(llvm::StringRef Ext) const { return OptMap.find(Ext) != OptMap.end(); } - bool isEnabled(StringRef Ext) const { + bool isEnabled(llvm::StringRef Ext) const { return OptMap.find(Ext)->second.Enabled; } // Is supported as either an extension or an (optional) core feature for // OpenCL version \p CLVer. - bool isSupported(StringRef Ext, unsigned CLVer) const { + bool isSupported(llvm::StringRef Ext, unsigned CLVer) const { auto I = OptMap.find(Ext)->getValue(); return I.Supported && I.Avail <= CLVer; } // Is supported (optional) OpenCL core features for OpenCL version \p CLVer. // For supported extension, return false. - bool isSupportedCore(StringRef Ext, unsigned CLVer) const { + bool isSupportedCore(llvm::StringRef Ext, unsigned CLVer) const { auto I = OptMap.find(Ext)->getValue(); return I.Supported && I.Avail <= CLVer && I.Core != ~0U && CLVer >= I.Core; @@ -57,13 +57,13 @@ public: // Is supported OpenCL extension for OpenCL version \p CLVer. // For supported (optional) core feature, return false. - bool isSupportedExtension(StringRef Ext, unsigned CLVer) const { + bool isSupportedExtension(llvm::StringRef Ext, unsigned CLVer) const { auto I = OptMap.find(Ext)->getValue(); return I.Supported && I.Avail <= CLVer && (I.Core == ~0U || CLVer < I.Core); } - void enable(StringRef Ext, bool V = true) { + void enable(llvm::StringRef Ext, bool V = true) { OptMap[Ext].Enabled = V; } @@ -71,7 +71,7 @@ public: /// \param Ext name of the extension optionally prefixed with /// '+' or '-' /// \param Enable used when \p Ext is not prefixed by '+' or '-' - void support(StringRef Ext, bool V = true) { + void support(llvm::StringRef Ext, bool V = true) { assert(!Ext.empty() && "Extension is empty."); switch (Ext[0]) { Modified: cfe/trunk/lib/Serialization/ASTReader.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=290058&r1=290057&r2=290058&view=diff ============================================================================== --- cfe/trunk/lib/Serialization/ASTReader.cpp (original) +++ cfe/trunk/lib/Serialization/ASTReader.cpp Sun Dec 18 00:35:06 2016 @@ -3167,8 +3167,8 @@ ASTReader::ReadASTBlock(ModuleFile &F, u for (unsigned I = 0, E = Record.size(); I != E; ) { auto Name = ReadString(Record, I); auto &Opt = OpenCLExtensions.OptMap[Name]; - Opt.Supported = Record[I++]; - Opt.Enabled = Record[I++]; + Opt.Supported = Record[I++] != 0; + Opt.Enabled = Record[I++] != 0; Opt.Avail = Record[I++]; Opt.Core = Record[I++]; } Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=290058&r1=290057&r2=290058&view=diff ============================================================================== --- cfe/trunk/lib/Serialization/ASTWriter.cpp (original) +++ cfe/trunk/lib/Serialization/ASTWriter.cpp Sun Dec 18 00:35:06 2016 @@ -3944,8 +3944,8 @@ void ASTWriter::WriteOpenCLExtensions(Se for (const auto &I:Opts.OptMap) { AddString(I.getKey(), Record); auto V = I.getValue(); - Record.push_back(V.Supported); - Record.push_back(V.Enabled); + Record.push_back(V.Supported ? 1 : 0); + Record.push_back(V.Enabled ? 1 : 0); Record.push_back(V.Avail); Record.push_back(V.Core); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits