Merge pull request #1093 from swiftwasm/master

[pull] swiftwasm from master

Author: pull[bot]

include/swift/Basic/SourceManager.h

@@ -206,7 +206,7 @@ class SourceManager {
   ///
   /// This respects \c #sourceLocation directives.
   std::pair<unsigned, unsigned>
-  getLineAndColumn(SourceLoc Loc, unsigned BufferID = 0) const {
+  getPresumedLineAndColumnForLoc(SourceLoc Loc, unsigned BufferID = 0) const {
     assert(Loc.isValid());
     int LineOffset = getLineOffset(Loc);
     int l, c;
@@ -215,14 +215,15 @@ class SourceManager {
     return { LineOffset + l, c };
   }
 
-  /// Returns the real line number for a source location.
+  /// Returns the real line and column for a source location.
   ///
   /// If \p BufferID is provided, \p Loc must come from that source buffer.
   ///
   /// This does not respect \c #sourceLocation directives.
-  unsigned getLineNumber(SourceLoc Loc, unsigned BufferID = 0) const {
+  std::pair<unsigned, unsigned>
+  getLineAndColumnInBuffer(SourceLoc Loc, unsigned BufferID = 0) const {
     assert(Loc.isValid());
-    return LLVMSourceMgr.FindLineNumber(Loc.Value, BufferID);
+    return LLVMSourceMgr.getLineAndColumn(Loc.Value, BufferID);
   }
 
   StringRef getEntireTextForBuffer(unsigned BufferID) const;

include/swift/SIL/SILArgument.h

@@ -99,8 +99,7 @@ class SILArgument : public ValueBase {
     Bits.SILArgument.VOKind = static_cast<unsigned>(newKind);
   }
 
-  SILBasicBlock *getParent() { return parentBlock; }
-  const SILBasicBlock *getParent() const { return parentBlock; }
+  SILBasicBlock *getParent() const { return parentBlock; }
 
   SILFunction *getFunction();
   const SILFunction *getFunction() const;

include/swift/SIL/SILRemarkStreamer.h

@@ -94,7 +94,7 @@ toRemarkLocation(const SourceLoc &loc, const SourceManager &srcMgr) {
 
   StringRef file = srcMgr.getDisplayNameForLoc(loc);
   unsigned line, col;
-  std::tie(line, col) = srcMgr.getLineAndColumn(loc);
+  std::tie(line, col) = srcMgr.getPresumedLineAndColumnForLoc(loc);
   return llvm::remarks::RemarkLocation{file, line, col};
 }
 

include/swift/SILOptimizer/PassManager/Passes.def

@@ -260,6 +260,8 @@ PASS(PredictableDeadAllocationElimination, "predictable-deadalloc-elim",
      "Eliminate dead temporary allocations after diagnostics")
 PASS(RedundantPhiElimination, "redundant-phi-elimination",
      "Redundant Phi Block Argument Elimination")
+PASS(PhiExpansion, "phi-expansion",
+     "Replace Phi arguments by their only used field")
 PASS(ReleaseDevirtualizer, "release-devirtualizer",
      "SIL release Devirtualization")
 PASS(RetainSinking, "retain-sinking",

lib/AST/ASTScopeCreation.cpp

@@ -120,9 +120,9 @@ bool doesRangeableRangeMatch(const T *x, const SourceManager &SM,
   auto const r = getRangeableSourceRange(x);
   if (r.isInvalid())
     return false;
-  if (start && SM.getLineNumber(r.Start) != start)
+  if (start && SM.getLineAndColumnInBuffer(r.Start).first != start)
     return false;
-  if (end && SM.getLineNumber(r.End) != end)
+  if (end && SM.getLineAndColumnInBuffer(r.End).first != end)
     return false;
   if (file.empty())
     return true;
@@ -2122,7 +2122,7 @@ class LocalizableDeclContextCollector : public ASTWalker {
       return;
     auto bufID = SM.findBufferContainingLoc(loc);
     auto f = SM.getIdentifierForBuffer(bufID);
-    auto lin = SM.getLineNumber(loc);
+    auto lin = SM.getLineAndColumnInBuffer(loc).first;
     if (f.endswith(file) && lin == line)
       if (isa<PatternBindingDecl>(D))
         llvm::errs() << "*** catchForDebugging: " << lin << " ***\n";

lib/AST/ASTScopePrinting.cpp

@@ -118,8 +118,8 @@ static void printSourceRange(llvm::raw_ostream &out, const SourceRange range,
     return;
   }
 
-  auto startLineAndCol = SM.getLineAndColumn(range.Start);
-  auto endLineAndCol = SM.getLineAndColumn(range.End);
+  auto startLineAndCol = SM.getPresumedLineAndColumnForLoc(range.Start);
+  auto endLineAndCol = SM.getPresumedLineAndColumnForLoc(range.End);
 
   out << "[" << startLineAndCol.first << ":" << startLineAndCol.second << " - "
       << endLineAndCol.first << ":" << endLineAndCol.second << "]";

lib/AST/ASTScopeSourceRange.cpp

@@ -176,9 +176,9 @@ bool ASTScopeImpl::doesRangeMatch(unsigned start, unsigned end, StringRef file,
     return false;
   const auto &SM = getSourceManager();
   const auto r = getSourceRangeOfScope(true);
-  if (start && start != SM.getLineNumber(r.Start))
+  if (start && start != SM.getLineAndColumnInBuffer(r.Start).first)
     return false;
-  if (end && end != SM.getLineNumber(r.End))
+  if (end && end != SM.getLineAndColumnInBuffer(r.End).first)
     return false;
   if (file.empty())
     return true;

lib/AST/DeclContext.cpp

@@ -613,7 +613,7 @@ static unsigned getLineNumber(DCType *DC) {
     return 0;
 
   const ASTContext &ctx = static_cast<const DeclContext *>(DC)->getASTContext();
-  return ctx.SourceMgr.getLineAndColumn(loc).first;
+  return ctx.SourceMgr.getPresumedLineAndColumnForLoc(loc).first;
 }
 
 unsigned DeclContext::printContext(raw_ostream &OS, const unsigned indent,

lib/AST/GenericSignatureBuilder.cpp

@@ -1406,7 +1406,7 @@ void RequirementSource::print(llvm::raw_ostream &out,
 
     unsigned bufferID = srcMgr->findBufferContainingLoc(loc);
 
-    auto lineAndCol = srcMgr->getLineAndColumn(loc, bufferID);
+    auto lineAndCol = srcMgr->getPresumedLineAndColumnForLoc(loc, bufferID);
     out << " @ " << lineAndCol.first << ':' << lineAndCol.second;
   };
 

lib/AST/IncrementalRanges.cpp

@@ -36,7 +36,7 @@ using namespace incremental_ranges;
 
 SerializableSourceLocation::SerializableSourceLocation(
     const SourceLoc loc, const SourceManager &SM) {
-  auto lc = SM.getLineAndColumn(loc);
+  auto lc = SM.getPresumedLineAndColumnForLoc(loc);
   line = lc.first;
   column = lc.second;
 }