Merge pull request #5296 from apple/ubuntu-16-10-fix

shahmishal · web-flow · commit e2509607488a · 2016-10-14T16:20:25.000-07:00
Initialize CachedVFile with nullptr
diff --git a/include/swift/Basic/SourceManager.h b/include/swift/Basic/SourceManager.h
@@ -40,7 +40,7 @@ class SourceManager {
     int LineOffset;
   };
   std::map<const char *, VirtualFile> VirtualFiles;
-  mutable std::pair<const char *, const VirtualFile*> CachedVFile = {};
+  mutable std::pair<const char *, const VirtualFile*> CachedVFile = {nullptr, nullptr};
 
 public:
   llvm::SourceMgr &getLLVMSourceMgr() {
diff --git a/lib/Basic/SourceLoc.cpp b/lib/Basic/SourceLoc.cpp
@@ -82,7 +82,7 @@ bool SourceManager::openVirtualFile(SourceLoc loc, StringRef name,
 
   CharSourceRange range = CharSourceRange(*this, loc, end);
   VirtualFiles[end.Value.getPointer()] = { range, name, lineOffset };
-  CachedVFile = {};
+  CachedVFile = {nullptr, nullptr};
   return true;
 }
 
@@ -99,7 +99,7 @@ void SourceManager::closeVirtualFile(SourceLoc end) {
 #endif
     return;
   }
-  CachedVFile = {};
+  CachedVFile = {nullptr, nullptr};
 
   CharSourceRange oldRange = virtualFile->Range;
   virtualFile->Range = CharSourceRange(*this, virtualFile->Range.getStart(),

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ bool SourceManager::openVirtualFile(SourceLoc loc, StringRef name,`
`82`	`82`
`83`	`83`	`CharSourceRange range = CharSourceRange(*this, loc, end);`
`84`	`84`	`VirtualFiles[end.Value.getPointer()] = { range, name, lineOffset };`
`85`		`- CachedVFile = {};`
	`85`	`+ CachedVFile = {nullptr, nullptr};`
`86`	`86`	`return true;`
`87`	`87`	`}`
`88`	`88`
`@@ -99,7 +99,7 @@ void SourceManager::closeVirtualFile(SourceLoc end) {`
`99`	`99`	`#endif`
`100`	`100`	`return;`
`101`	`101`	`}`
`102`		`- CachedVFile = {};`
	`102`	`+ CachedVFile = {nullptr, nullptr};`
`103`	`103`
`104`	`104`	`CharSourceRange oldRange = virtualFile->Range;`
`105`	`105`	`virtualFile->Range = CharSourceRange(*this, virtualFile->Range.getStart(),`