BuilderTransform: Use optional declared type

Author: Azoy

lib/Sema/BuilderTransform.cpp

@@ -621,18 +621,24 @@ class BuilderClosureVisitor
   }
 
   Expr *buildSomeExpr(Expr *arg) {
+    auto optionalDecl = ctx.getOptionalDecl();
+    auto optionalType = optionalDecl->getDeclaredType();
+
     auto loc = arg->getStartLoc();
     auto optionalTypeExpr =
-      TypeExpr::createImplicitHack(loc, ctx.getOptionalType(), ctx);
+      TypeExpr::createImplicitHack(loc, optionalType, ctx);
     auto someRef = new (ctx) UnresolvedDotExpr(
         optionalTypeExpr, loc, DeclNameRef(ctx.getIdentifier("some")),
         DeclNameLoc(loc), /*implicit=*/true);
     return CallExpr::createImplicit(ctx, someRef, arg, { });
   }
 
   Expr *buildNoneExpr(SourceLoc endLoc) {
+    auto optionalDecl = ctx.getOptionalDecl();
+    auto optionalType = optionalDecl->getDeclaredType();
+
     auto optionalTypeExpr =
-      TypeExpr::createImplicitHack(endLoc, ctx.getOptionalType(), ctx);
+      TypeExpr::createImplicitHack(endLoc, optionalType, ctx);
     return new (ctx) UnresolvedDotExpr(
         optionalTypeExpr, endLoc, DeclNameRef(ctx.getIdentifier("none")),
         DeclNameLoc(endLoc), /*implicit=*/true);