---

yaml
---
r: 348895
b: refs/heads/master
c: 907a8c3
h: refs/heads/master
i:
  348893: 61065f4
  348891: 19f6d74
  348887: c173b2f
  348879: eca457c
  348863: cd5c694

Author: vedantk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 40555302784023509f1b342b93d27c392e8f8099
+refs/heads/master: 907a8c37f589da6f6e3f116c933af1be887d41cc
 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/USRGeneration.h

@@ -9,12 +9,6 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//
-// Unique Symbol References (USRs) provide a textual encoding for
-// declarations. These are used for indexing, analogous to how mangled names
-// are used in object files.
-//
-//===----------------------------------------------------------------------===//
 
 #ifndef SWIFT_AST_USRGENERATION_H
 #define SWIFT_AST_USRGENERATION_H

trunk/include/swift/Basic/StringExtras.h

@@ -21,6 +21,7 @@
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/OptionSet.h"
 #include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/Support/Allocator.h"
@@ -64,8 +65,6 @@ namespace swift {
 
   public:
     StringRef copyString(StringRef string);
-
-    llvm::BumpPtrAllocator &getAllocator() { return Allocator; }
   };
 
   namespace camel_case {
@@ -431,13 +430,11 @@ StringRef matchLeadingTypeName(StringRef name, OmissionTypeName typeName);
 /// Describes a set of names with an inheritance relationship.
 class InheritedNameSet {
   const InheritedNameSet *Parent;
-  llvm::StringSet<llvm::BumpPtrAllocator &> Names;
+  llvm::StringSet<> Names;
 
 public:
   /// Construct a new inherited name set with the given parent.
-  InheritedNameSet(const InheritedNameSet *parent,
-                   llvm::BumpPtrAllocator &allocator)
-      : Parent(parent), Names(allocator) { }
+  explicit InheritedNameSet(const InheritedNameSet *parent) : Parent(parent) { }
 
   // Add a new name to the set.
   void add(StringRef name);

trunk/include/swift/Parse/ASTGen.h

@@ -79,11 +79,6 @@ class ASTGen {
   //===--------------------------------------------------------------------===//
   // Expressions.
 
-  Expr *generate(const syntax::ExprSyntax &Expr, const SourceLoc Loc);
-  Expr *generate(const syntax::IdentifierExprSyntax &Expr, const SourceLoc Loc);
-  Expr *generate(const syntax::EditorPlaceholderExprSyntax &Expr,
-                 const SourceLoc Loc);
-  Expr *generate(const syntax::SpecializeExprSyntax &Expr, const SourceLoc Loc);
   Expr *generate(const syntax::IntegerLiteralExprSyntax &Expr,
                  const SourceLoc Loc);
   Expr *generate(const syntax::FloatLiteralExprSyntax &Expr,
@@ -101,13 +96,7 @@ class ASTGen {
                  const SourceLoc Loc);
   Expr *generate(const syntax::UnknownExprSyntax &Expr, const SourceLoc Loc);
 
-  std::pair<DeclName, DeclNameLoc> generateUnqualifiedDeclName(
-      const syntax::TokenSyntax &idTok,
-      const Optional<syntax::DeclNameArgumentsSyntax> &args,
-      const SourceLoc Loc);
-
 private:
-
   Expr *generateMagicIdentifierLiteralExpression(
       const syntax::TokenSyntax &PoundToken, const SourceLoc Loc);
 
@@ -179,9 +168,10 @@ class ASTGen {
   //===--------------------------------------------------------------------===//
   // Generics.
 
-  void generate(const syntax::GenericArgumentClauseSyntax &Arg,
-                const SourceLoc Loc, SourceLoc &lAngleLoc, SourceLoc &rAngleLoc,
-                SmallVectorImpl<TypeRepr *> &args);
+  TypeRepr *generate(const syntax::GenericArgumentSyntax &Arg,
+                     const SourceLoc Loc);
+  llvm::SmallVector<TypeRepr *, 4>
+  generate(const syntax::GenericArgumentListSyntax &Args, const SourceLoc Loc);
 
   GenericParamList *
   generate(const syntax::GenericParameterClauseListSyntax &clause,

trunk/include/swift/Parse/Parser.h

@@ -1480,8 +1480,6 @@ class Parser {
   /// _)
   /// \param loc The location of the label (empty if it doesn't exist)
   void parseOptionalArgumentLabel(Identifier &name, SourceLoc &loc);
-  bool parseOptionalArgumentLabelSyntax(Optional<ParsedTokenSyntax> &name,
-                                        Optional<ParsedTokenSyntax> &colon);
 
   /// Parse an unqualified-decl-name.
   ///
@@ -1500,20 +1498,10 @@ class Parser {
                                     bool allowOperators=false,
                                     bool allowZeroArgCompoundNames=false,
                                     bool allowDeinitAndSubscript=false);
-  ParserStatus
-  parseUnqualifiedDeclNameSyntax(Optional<ParsedTokenSyntax> &identTok,
-                                 Optional<ParsedDeclNameArgumentsSyntax> &declNameArg,
-                                 bool afterDot, const Diagnostic &diag,
-                                 bool allowOperators=false,
-                                 bool allowZeroArgCompoundNames=false,
-                                 bool allowDeinitAndSubscript=false);
-
-  ParsedSyntaxResult<ParsedExprSyntax> parseExprIdentifierSyntax();
-  ParsedSyntaxResult<ParsedExprSyntax>
-  parseExprSpecializeSyntax(ParsedExprSyntax &&);
 
   Expr *parseExprIdentifier();
-  Expr *parseExprEditorPlaceholder(SourceLoc loc, StringRef text);
+  Expr *parseExprEditorPlaceholder(Token PlaceholderTok,
+                                   Identifier PlaceholderId);
 
   /// Parse a closure expression after the opening brace.
   ///

trunk/include/swift/SIL/SILConstants.h

@@ -556,7 +556,7 @@ class SymbolicValue {
   void dump() const;
 };
 
-static_assert(sizeof(SymbolicValue) == 2 * sizeof(uint64_t),
+static_assert(sizeof(SymbolicValue) == 2 * sizeof(void *),
               "SymbolicValue should stay small");
 static_assert(std::is_pod<SymbolicValue>::value,
               "SymbolicValue should stay POD");

trunk/lib/AST/Decl.cpp

@@ -4962,7 +4962,7 @@ getNameFromObjcAttribute(const ObjCAttr *attr, DeclName preferredName) {
 ObjCSelector
 AbstractStorageDecl::getObjCGetterSelector(Identifier preferredName) const {
   // If the getter has an @objc attribute with a name, use that.
-  if (auto getter = getOpaqueAccessor(AccessorKind::Get)) {
+  if (auto getter = getParsedAccessor(AccessorKind::Get)) {
       if (auto name = getNameFromObjcAttribute(getter->getAttrs().
           getAttribute<ObjCAttr>(), preferredName))
         return *name;
@@ -4992,7 +4992,7 @@ AbstractStorageDecl::getObjCGetterSelector(Identifier preferredName) const {
 ObjCSelector
 AbstractStorageDecl::getObjCSetterSelector(Identifier preferredName) const {
   // If the setter has an @objc attribute with a name, use that.
-  auto setter = getOpaqueAccessor(AccessorKind::Set);
+  auto setter = getParsedAccessor(AccessorKind::Set);
   auto objcAttr = setter ? setter->getAttrs().getAttribute<ObjCAttr>()
                          : nullptr;
   if (auto name = getNameFromObjcAttribute(objcAttr, DeclName(preferredName))) {

trunk/lib/ClangImporter/ImportName.cpp

@@ -1842,10 +1842,10 @@ const InheritedNameSet *NameImporter::getAllPropertyNames(
   }
 
   // Create the set of properties.
-  llvm::BumpPtrAllocator &alloc = scratch.getAllocator();
-  known = allProperties.insert({
-      std::pair<const clang::ObjCInterfaceDecl *, char>(classDecl, forInstance),
-      llvm::make_unique<InheritedNameSet>(parentSet, alloc) }).first;
+  known = allProperties.insert(
+            { std::pair<const clang::ObjCInterfaceDecl *, char>(classDecl,
+                                                                forInstance),
+              llvm::make_unique<InheritedNameSet>(parentSet) }).first;
 
   // Local function to add properties from the given set.
   auto addProperties = [&](clang::DeclContext::decl_range members) {