Update Clang for 3.5 rebase (r209713).
Change-Id: I8c9133b0f8f776dc915f270b60f94962e771bc83
diff --git a/lib/Basic/FileSystemStatCache.cpp b/lib/Basic/FileSystemStatCache.cpp
index 9d87999..0f16e94 100644
--- a/lib/Basic/FileSystemStatCache.cpp
+++ b/lib/Basic/FileSystemStatCache.cpp
@@ -39,6 +39,7 @@
Data.IsDirectory = Status.isDirectory();
Data.IsNamedPipe = Status.getType() == llvm::sys::fs::file_type::fifo_file;
Data.InPCH = false;
+ Data.IsVFSMapped = Status.IsVFSMapped;
}
/// FileSystemStatCache::get - Get the 'stat' information for the specified
@@ -96,7 +97,7 @@
// fstat rarely fails. If it does, claim the initial open didn't
// succeed.
R = CacheMissing;
- *F = 0;
+ *F = nullptr;
}
}
}
@@ -110,7 +111,7 @@
// If not, close the file if opened.
if (F && *F) {
(*F)->close();
- *F = 0;
+ *F = nullptr;
}
return true;