---

yaml
---
r: 348974
b: refs/heads/master
c: 483bd5d
h: refs/heads/master

Author: nkcsgexi

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a877fe6ee36b8475ebad8c488403bf05e62ae38c
+refs/heads/master: 483bd5dbc364cbe7cdfd6e3b1d92f1b3cd774be3
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/SourceFile.h

@@ -276,6 +276,7 @@ class SourceFile final : public FileUnit {
 
   Identifier getDiscriminatorForPrivateValue(const ValueDecl *D) const override;
   Identifier getPrivateDiscriminator() const { return PrivateDiscriminator; }
+  Optional<BasicDeclLocs> getBasicLocsForDecl(const Decl *D) const override;
 
   virtual bool walk(ASTWalker &walker) override;
 

trunk/lib/AST/Module.cpp

@@ -686,6 +686,32 @@ TypeDecl *SourceFile::lookupLocalType(llvm::StringRef mangledName) const {
   return nullptr;
 }
 
+Optional<BasicDeclLocs>
+SourceFile::getBasicLocsForDecl(const Decl *D) const {
+  auto *FileCtx = D->getDeclContext()->getModuleScopeContext();
+  assert(FileCtx == this && "D doesn't belong to this source file");
+  if (FileCtx != this) {
+    // D doesn't belong to this file. This shouldn't happen in practice.
+    return None;
+  }
+  if (D->getLoc().isInvalid())
+    return None;
+  SourceManager &SM = getASTContext().SourceMgr;
+  BasicDeclLocs Result;
+  Result.SourceFilePath = SM.getDisplayNameForLoc(D->getLoc());
+  auto setLineColumn = [&SM](LineColumn &Home, SourceLoc Loc) {
+    if (Loc.isValid()) {
+      std::tie(Home.Line, Home.Column) = SM.getLineAndColumn(Loc);
+    }
+  };
+#define SET(X) setLineColumn(Result.X, D->get##X());
+  SET(Loc)
+  SET(StartLoc)
+  SET(EndLoc)
+#undef SET
+  return Result;
+}
+
 void ModuleDecl::getDisplayDecls(SmallVectorImpl<Decl*> &Results) const {
   // FIXME: Should this do extra access control filtering?
   FORWARD(getDisplayDecls, (Results));

trunk/lib/Serialization/SerializeDoc.cpp

@@ -651,44 +651,23 @@ writer.write<uint32_t>(data.X.Column);
     return Result;
   }
 
-  Optional<DeclLocationsTableData> getLocDataFromSource(Decl *D, SourceFile *SF) {
-    if (SF->getFilename().empty())
-      return None;
-    if (!SF->getBufferID().hasValue())
-      return None;
-    auto &SM = D->getASTContext().SourceMgr;
-    DeclLocationsTableData Result;
-    // Use getDisplayNameForLoc could give use file name specified by #sourceLocation
-    SmallString<128> SourceFilePath = SM.getDisplayNameForLoc(D->getLoc());
-    llvm::sys::fs::make_absolute(SourceFilePath);
-    Result.SourceFileOffset = FWriter.getTextOffset(SourceFilePath);
-    Result.Loc = getLineColumn(SM, D->getLoc());
-    Result.StartLoc = getLineColumn(SM, D->getStartLoc());
-    Result.EndLoc = getLineColumn(SM, D->getEndLoc());
-    return Result;
-  }
-
   Optional<DeclLocationsTableData> getLocData(Decl *D) {
     auto *File = D->getDeclContext()->getModuleScopeContext();
-    if (auto *SF = dyn_cast<SourceFile>(File)) {
-      // Get location from source when we have access to the source.
-      return getLocDataFromSource(D, SF);
-    } else {
-      // Merge modules.
-      auto Locs = cast<FileUnit>(File)->getBasicLocsForDecl(D);
-      if (!Locs.hasValue())
-        return None;
-      DeclLocationsTableData Result;
-      Result.SourceFileOffset = FWriter.getTextOffset(Locs->SourceFilePath);
+    auto Locs = cast<FileUnit>(File)->getBasicLocsForDecl(D);
+    if (!Locs.hasValue())
+      return None;
+    DeclLocationsTableData Result;
+    llvm::SmallString<128> AbsolutePath = Locs->SourceFilePath;
+    llvm::sys::fs::make_absolute(AbsolutePath);
+    Result.SourceFileOffset = FWriter.getTextOffset(AbsolutePath.str());
 #define COPY_LINE_COLUMN(X)                                                   \
 Result.X.Line = Locs->X.Line;                                                 \
 Result.X.Column = Locs->X.Column;
-      COPY_LINE_COLUMN(Loc)
-      COPY_LINE_COLUMN(StartLoc)
-      COPY_LINE_COLUMN(EndLoc)
+    COPY_LINE_COLUMN(Loc)
+    COPY_LINE_COLUMN(StartLoc)
+    COPY_LINE_COLUMN(EndLoc)
 #undef COPY_LINE_COLUMN
-      return Result;
-    }
+    return Result;
   }
 
   bool shouldSerializeSourceLoc(Decl *D) {