---

yaml
---
r: 348719
b: refs/heads/master
c: 9726704
h: refs/heads/master
i:
  348717: 8eb2163
  348715: 1297e6b
  348711: d80c897
  348703: 69bf368

Author: rintaro

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0264687b394632ccf4e921fe65bee6c651729b45
+refs/heads/master: 972670436fb0b0d74bbcd4d34f52283510851425
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/Parse/ASTGen.h

@@ -37,9 +37,8 @@ class ASTGen {
 
   // FIXME: remove when Syntax can represent all types and ASTGen can handle
   // them
-  /// Types that cannot be represented by Syntax or generated by ASTGen.
-  llvm::DenseMap<SourceLoc, TypeRepr *> Types;
-
+  /// Decl attributes that cannot be represented by Syntax or generated by
+  /// ASTGen.
   llvm::DenseMap<SourceLoc, DeclAttributes> ParsedDeclAttrs;
 
 public:
@@ -205,10 +204,6 @@ class ASTGen {
   TypeRepr *lookupType(syntax::TypeSyntax Type);
 
 public:
-  void addType(TypeRepr *Type, const SourceLoc Loc);
-  bool hasType(const SourceLoc Loc) const;
-  TypeRepr *getType(const SourceLoc Loc) const;
-
   void addDeclAttributes(DeclAttributes attrs, const SourceLoc Loc);
   bool hasDeclAttributes(SourceLoc Loc) const;
   DeclAttributes getDeclAttributes(const SourceLoc Loc) const;

trunk/lib/Parse/ASTGen.cpp

@@ -265,11 +265,6 @@ TypeRepr *ASTGen::generate(const TypeSyntax &Type, const SourceLoc Loc,
   else if (auto Unknown = Type.getAs<UnknownTypeSyntax>())
     TypeAST = generate(*Unknown, Loc);
 
-  // todo [gsoc]: handle InheritedTypeSyntax & ClassRestrictionTypeSyntax?
-
-  if (!TypeAST && hasType(advanceLocBegin(Loc, Type)))
-    TypeAST = getType(advanceLocBegin(Loc, Type));
-
   return cacheType(Type, TypeAST);
 }
 
@@ -1065,18 +1060,6 @@ TypeRepr *ASTGen::lookupType(TypeSyntax Type) {
   return Found != TypeCache.end() ? Found->second : nullptr;
 }
 
-void ASTGen::addType(TypeRepr *Type, const SourceLoc Loc) {
-  Types.insert({Loc, Type});
-}
-
-bool ASTGen::hasType(const SourceLoc Loc) const {
-  return Types.find(Loc) != Types.end();
-}
-
-TypeRepr *ASTGen::getType(const SourceLoc Loc) const {
-  return Types.find(Loc)->second;
-}
-
 void ASTGen::addDeclAttributes(DeclAttributes attrs, SourceLoc Loc) {
   ParsedDeclAttrs.insert({Loc, attrs});
 }