---

yaml
---
r: 314343
b: refs/heads/master
c: b380764
h: refs/heads/master
i:
  314341: 863bab3
  314339: 99cfcfd
  314335: e83c21c

Author: David Ungar

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1011998a97523328cbcec33d47b893819aad560c
+refs/heads/master: b38076490b5402178d1b07faa13bc8fbefb74563
 refs/heads/master-next: 66a7e661ff8e88e2d4efab3e430197a7a941e352
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/Decl.h

@@ -1908,8 +1908,9 @@ class PatternBindingEntry {
     // initializer is ASTContext-allocated it is safe.
 
     /// Exactly the expr the programmer wrote
-    Expr *origInit;
-    /// Might be transformed, e.g. for a property wrapper
+    Expr *originalInit;
+    /// Might be transformed, e.g. for a property wrapper. In the absence of
+    /// transformation or synthesis, holds the expr as parsed.
     Expr *initAfterSynthesis;
     /// The location of the equal '=' token.
     SourceLoc EqualLoc;
@@ -1932,6 +1933,7 @@ class PatternBindingEntry {
   friend class PatternBindingInitializer;
 
 public:
+  /// \p E is the initializer as parsed.
   PatternBindingEntry(Pattern *P, SourceLoc EqualLoc, Expr *E,
                       DeclContext *InitContext)
     : PatternAndFlags(P, {}), InitExpr({E, E, EqualLoc}),
@@ -1955,7 +1957,7 @@ class PatternBindingEntry {
   Expr *getExecutableInit() const {
     return isInitializerSubsumed() ? nullptr : getInit();
   }
-  SourceRange getOrigInitRange() const;
+  SourceRange getOriginalInitRange() const;
   void setInit(Expr *E);
 
   /// Gets the text of the initializer expression, stripping out inactive
@@ -1987,10 +1989,10 @@ class PatternBindingEntry {
 
   /// Retrieve the initializer after the =, if any, as it was written in the
   /// source.
-  Expr *getOrigInit() const;
-  
+  Expr *getOriginalInit() const;
+
   /// Set the initializer after the = as it was written in the source.
-  void setOrigInit(Expr*);
+  void setOriginalInit(Expr *);
 
   bool isInitializerChecked() const {
     return PatternAndFlags.getInt().contains(Flags::Checked);
@@ -2120,9 +2122,9 @@ class PatternBindingDecl final : public Decl,
   Expr *getExecutableInit(unsigned i) const {
     return getPatternList()[i].getExecutableInit();
   }
-  
-  SourceRange getOrigInitRange(unsigned i) const {
-    return getPatternList()[i].getOrigInitRange();
+
+  SourceRange getOriginalInitRange(unsigned i) const {
+    return getPatternList()[i].getOriginalInitRange();
   }
 
   void setInit(unsigned i, Expr *E) {

trunk/include/swift/AST/PropertyWrappers.h

@@ -183,7 +183,8 @@ void simple_display(
 
 /// Given the initializer for the given property with an attached property
 /// wrapper, dig out the original initialization expression.
-/// Cannot just dig out the getOrigInit() value because this function checks
+///
+/// Cannot just dig out the getOriginalInit() value because this function checks
 /// types, etc. Erroneous code won't return a result from here.
 Expr *findOriginalPropertyWrapperInitialValue(VarDecl *var, Expr *init);
 

trunk/lib/AST/ASTDumper.cpp

@@ -906,11 +906,11 @@ namespace {
       for (auto entry : PBD->getPatternList()) {
         OS << '\n';
         printRec(entry.getPattern());
-        if (entry.getOrigInit()) {
+        if (entry.getOriginalInit()) {
           OS << '\n';
           OS.indent(Indent + 2);
           OS << "Original init:\n";
-          printRec(entry.getOrigInit());
+          printRec(entry.getOriginalInit());
         }
         if (entry.getInit()) {
           OS << '\n';

trunk/lib/AST/ASTScopeCreation.cpp

@@ -629,8 +629,8 @@ ASTScopeImpl *PatternEntryDeclScope::expandAScopeThatCreatesANewInsertionPoint(
   // initializer (because of InterpolatedLiteralStrings and EditorPlaceHolders),
   // so compute it ourselves.
   SourceLoc initializerEnd;
-  if (patternEntry.getOrigInit() &&
-      patternEntry.getOrigInit()->getSourceRange().isValid()) {
+  if (patternEntry.getOriginalInit() &&
+      patternEntry.getOriginalInit()->getSourceRange().isValid()) {
     auto *initializer =
         scopeCreator.createSubtree<PatternEntryInitializerScope>(
             this, decl, patternEntryIndex, vis);
@@ -649,8 +649,8 @@ ASTScopeImpl *
 PatternEntryInitializerScope::expandAScopeThatCreatesANewInsertionPoint(
     ScopeCreator &scopeCreator) {
   // Create a child for the initializer expression.
-  ASTVisitorForScopeCreation().visitExpr(getPatternEntry().getOrigInit(), this,
-                                         scopeCreator);
+  ASTVisitorForScopeCreation().visitExpr(getPatternEntry().getOriginalInit(),
+                                         this, scopeCreator);
   return this;
 }
 

trunk/lib/AST/ASTScopeSourceRange.cpp

@@ -213,7 +213,7 @@ SourceRange PatternEntryDeclScope::getChildlessSourceRange() const {
 }
 
 SourceRange PatternEntryInitializerScope::getChildlessSourceRange() const {
-  return getPatternEntry().getOrigInit()->getSourceRange();
+  return getPatternEntry().getOriginalInit()->getSourceRange();
 }
 
 SourceRange PatternEntryUseScope::getChildlessSourceRange() const {

trunk/lib/AST/Decl.cpp

@@ -1391,18 +1391,18 @@ unsigned PatternBindingDecl::getPatternEntryIndexForVarDecl(const VarDecl *VD) c
   return ~0U;
 }
 
-Expr *PatternBindingEntry::getOrigInit() const {
-  return InitContextAndIsText.getInt() ? nullptr : InitExpr.origInit;
+Expr *PatternBindingEntry::getOriginalInit() const {
+  return InitContextAndIsText.getInt() ? nullptr : InitExpr.originalInit;
 }
 
-SourceRange PatternBindingEntry::getOrigInitRange() const {
-  if (auto *i = getOrigInit())
+SourceRange PatternBindingEntry::getOriginalInitRange() const {
+  if (auto *i = getOriginalInit())
     return i->getSourceRange();
   return SourceRange();
 }
 
-void PatternBindingEntry::setOrigInit(Expr *E) {
-  InitExpr.origInit = E;
+void PatternBindingEntry::setOriginalInit(Expr *E) {
+  InitExpr.originalInit = E;
   InitContextAndIsText.setInt(false);
 }
 
@@ -1460,7 +1460,7 @@ SourceLoc PatternBindingEntry::getEndLoc(bool omitAccessors) const {
     if (lastAccessorEnd.isValid())
       return lastAccessorEnd;
   }
-  const auto initEnd = getOrigInitRange().End;
+  const auto initEnd = getOriginalInitRange().End;
   if (initEnd.isValid())
     return initEnd;
 
@@ -1492,7 +1492,7 @@ StringRef PatternBindingEntry::getInitStringRepresentation(
   if (InitContextAndIsText.getInt() && !InitStringRepresentation.empty())
     return InitStringRepresentation;
   auto &sourceMgr = getAnchoringVarDecl()->getASTContext().SourceMgr;
-  auto init = getInit();
+  auto init = getOriginalInit();
   return extractInlinableText(sourceMgr, init, scratch);
 }
 

trunk/lib/Parse/ParseDecl.cpp

@@ -5222,7 +5222,7 @@ Parser::parseDeclVar(ParseDeclOptions Flags,
       PBDEntries.back().setEqualLoc(EqualLoc);
 
       ParserResult<Expr> init = parseExpr(diag::expected_init_value);
-      PBDEntries.back().setOrigInit(init.getPtrOrNull());
+      PBDEntries.back().setOriginalInit(init.getPtrOrNull());
 
       // If this Pattern binding was not supposed to have an initializer, but it
       // did, diagnose this and remove it.

trunk/lib/Sema/PCMacro.cpp

@@ -435,7 +435,7 @@ class Instrumenter : InstrumenterBase {
 
               SourceRange SR = PBD->getSourceRange();
               if (!SR.isValid()) {
-                SR = PBD->getOrigInitRange(0);
+                SR = PBD->getOriginalInitRange(0);
               }
 
               Added<Stmt *> LogBefore = buildLoggerCall(SR, true);