diff options
| author | Harlan Haskins <harlan@harlanhaskins.com> | 2019-08-01 21:31:56 +0000 |
|---|---|---|
| committer | Harlan Haskins <harlan@harlanhaskins.com> | 2019-08-01 21:31:56 +0000 |
| commit | 8d323d150610bed1feeb79d7a29c9958a4c8bcac (patch) | |
| tree | 166514f9a8bba05ea1504afab5c319975a57675d /clang/lib/CodeGen/CodeGenAction.cpp | |
| parent | 461f0722dd26487c1faa497ba37aabed1477a561 (diff) | |
| download | bcm5719-llvm-8d323d150610bed1feeb79d7a29c9958a4c8bcac.tar.gz bcm5719-llvm-8d323d150610bed1feeb79d7a29c9958a4c8bcac.zip | |
[clang] Adopt new FileManager error-returning APIs
Update the callers of FileManager::getFile and FileManager::getDirectory to handle the new llvm::ErrorOr-returning methods.
Signed-off-by: Harlan Haskins <harlan@apple.com>
llvm-svn: 367616
Diffstat (limited to 'clang/lib/CodeGen/CodeGenAction.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenAction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CodeGenAction.cpp b/clang/lib/CodeGen/CodeGenAction.cpp index 0ae9ea427d6..8ca866e75d6 100644 --- a/clang/lib/CodeGen/CodeGenAction.cpp +++ b/clang/lib/CodeGen/CodeGenAction.cpp @@ -561,13 +561,13 @@ const FullSourceLoc BackendConsumer::getBestLocationFromDebugLoc( if (D.isLocationAvailable()) { D.getLocation(Filename, Line, Column); if (Line > 0) { - const FileEntry *FE = FileMgr.getFile(Filename); + auto FE = FileMgr.getFile(Filename); if (!FE) FE = FileMgr.getFile(D.getAbsolutePath()); if (FE) { // If -gcolumn-info was not used, Column will be 0. This upsets the // source manager, so pass 1 if Column is not set. - DILoc = SourceMgr.translateFileLineCol(FE, Line, Column ? Column : 1); + DILoc = SourceMgr.translateFileLineCol(*FE, Line, Column ? Column : 1); } } BadDebugInfo = DILoc.isInvalid(); |
