diff options
| author | David Zarzycki <dave@znu.io> | 2018-02-26 18:42:30 +0000 |
|---|---|---|
| committer | David Zarzycki <dave@znu.io> | 2018-02-26 18:42:30 +0000 |
| commit | b0c752d3c164a0e70c7cac5ebe411a8d15bad61c (patch) | |
| tree | 28a5ecb38ba41ddcf368a92bae65c8af21896422 /clang/lib/Basic/SourceManager.cpp | |
| parent | d15f31936a5987a06066a2d49fba388c69a027eb (diff) | |
| download | bcm5719-llvm-b0c752d3c164a0e70c7cac5ebe411a8d15bad61c.tar.gz bcm5719-llvm-b0c752d3c164a0e70c7cac5ebe411a8d15bad61c.zip | |
Fix for LLVM r326109
llvm-svn: 326110
Diffstat (limited to 'clang/lib/Basic/SourceManager.cpp')
| -rw-r--r-- | clang/lib/Basic/SourceManager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp index 3bf70b66693..d4fad30ceea 100644 --- a/clang/lib/Basic/SourceManager.cpp +++ b/clang/lib/Basic/SourceManager.cpp @@ -170,8 +170,10 @@ llvm::MemoryBuffer *ContentCache::getBuffer(DiagnosticsEngine &Diag, const char *InvalidBOM = llvm::StringSwitch<const char *>(BufStr) .StartsWith("\xFE\xFF", "UTF-16 (BE)") .StartsWith("\xFF\xFE", "UTF-16 (LE)") - .StartsWith("\x00\x00\xFE\xFF", "UTF-32 (BE)") - .StartsWith("\xFF\xFE\x00\x00", "UTF-32 (LE)") + .StartsWith(llvm::StringLiteral::withInnerNUL("\x00\x00\xFE\xFF"), + "UTF-32 (BE)") + .StartsWith(llvm::StringLiteral::withInnerNUL("\xFF\xFE\x00\x00"), + "UTF-32 (LE)") .StartsWith("\x2B\x2F\x76", "UTF-7") .StartsWith("\xF7\x64\x4C", "UTF-1") .StartsWith("\xDD\x73\x66\x73", "UTF-EBCDIC") |
