When recovering from 'undeclared type' errors with a remapped type, use the remapped type as the actual type.
When recovering from 'undeclared type' errors with a remapped type, use the remapped type as the actual type.

Swift SVN r15722

gregomni/swift,sschiau/swift,shahmishal/swift,ken0nek/swift,emilstahl/swift,natecook1000/swift,khizkhiz/swift,SwiftAndroid/swift,stephentyrone/swift,dduan/swift,apple/swift,devincoughlin/swift,huonw/swift,adrfer/swift,alblue/swift,therealbnut/swift,modocache/swift,harlanhaskins/swift,shahmishal/swift,natecook1000/swift,manavgabhawala/swift,harlanhaskins/swift,milseman/swift,airspeedswift/swift,austinzheng/swift,karwa/swift,hooman/swift,CodaFi/swift,kentya6/swift,parkera/swift,KrishMunot/swift,MukeshKumarS/Swift,russbishop/swift,kstaring/swift,slavapestov/swift,codestergit/swift,lorentey/swift,slavapestov/swift,swiftix/swift,Jnosh/swift,parkera/swift,ken0nek/swift,jtbandes/swift,benlangmuir/swift,xedin/swift,natecook1000/swift,ken0nek/swift,glessard/swift,tjw/swift,kusl/swift,emilstahl/swift,arvedviehweger/swift,alblue/swift,khizkhiz/swift,atrick/swift,kstaring/swift,parkera/swift,brentdax/swift,dduan/swift,ben-ng/swift,KrishMunot/swift,jopamer/swift,jopamer/swift,JaSpa/swift,practicalswift/swift,rudkx/swift,austinzheng/swift,parkera/swift,harlanhaskins/swift,kstaring/swift,kperryua/swift,brentdax/swift,bitjammer/swift,kusl/swift,tardieu/swift,kusl/swift,airspeedswift/swift,allevato/swift,jtbandes/swift,gmilos/swift,dreamsxin/swift,JGiola/swift,ahoppen/swift,karwa/swift,parkera/swift,gregomni/swift,alblue/swift,jtbandes/swift,milseman/swift,ben-ng/swift,return/swift,cbrentharris/swift,ben-ng/swift,frootloops/swift,johnno1962d/swift,uasys/swift,khizkhiz/swift,practicalswift/swift,IngmarStein/swift,LeoShimonaka/swift,calebd/swift,return/swift,KrishMunot/swift,tinysun212/swift-windows,dduan/swift,JaSpa/swift,MukeshKumarS/Swift,hooman/swift,shajrawi/swift,uasys/swift,johnno1962d/swift,parkera/swift,karwa/swift,SwiftAndroid/swift,djwbrown/swift,jopamer/swift,tkremenek/swift,jckarter/swift,stephentyrone/swift,swiftix/swift,hughbe/swift,aschwaighofer/swift,SwiftAndroid/swift,jmgc/swift,arvedviehweger/swift,tjw/swift,jmgc/swift,khizkhiz/swift,johnno1962d/swift,lorentey/swift,austinzheng/swift,jopamer/swift,CodaFi/swift,deyton/swift,Ivacker/swift,russbishop/swift,karwa/swift,Ivacker/swift,kstaring/swift,hooman/swift,deyton/swift,jckarter/swift,return/swift,allevato/swift,karwa/swift,stephentyrone/swift,frootloops/swift,jmgc/swift,jmgc/swift,amraboelela/swift,tinysun212/swift-windows,aschwaighofer/swift,xwu/swift,devincoughlin/swift,milseman/swift,huonw/swift,mightydeveloper/swift,tkremenek/swift,gottesmm/swift,jckarter/swift,rudkx/swift,LeoShimonaka/swift,amraboelela/swift,sschiau/swift,adrfer/swift,glessard/swift,Jnosh/swift,therealbnut/swift,stephentyrone/swift,khizkhiz/swift,IngmarStein/swift,gribozavr/swift,tinysun212/swift-windows,tjw/swift,ken0nek/swift,danielmartin/swift,tkremenek/swift,devincoughlin/swift,sdulal/swift,gottesmm/swift,dduan/swift,djwbrown/swift,LeoShimonaka/swift,hughbe/swift,codestergit/swift,aschwaighofer/swift,devincoughlin/swift,gmilos/swift,austinzheng/swift,russbishop/swift,amraboelela/swift,tardieu/swift,manavgabhawala/swift,apple/swift,ahoppen/swift,ahoppen/swift,karwa/swift,kusl/swift,tkremenek/swift,shahmishal/swift,jopamer/swift,alblue/swift,MukeshKumarS/Swift,gregomni/swift,codestergit/swift,LeoShimonaka/swift,modocache/swift,deyton/swift,tjw/swift,kentya6/swift,modocache/swift,JGiola/swift,Ivacker/swift,airspeedswift/swift,felix91gr/swift,therealbnut/swift,djwbrown/swift,LeoShimonaka/swift,therealbnut/swift,shahmishal/swift,atrick/swift,kentya6/swift,swiftix/swift.old,shajrawi/swift,rudkx/swift,cbrentharris/swift,gmilos/swift,IngmarStein/swift,russbishop/swift,bitjammer/swift,danielmartin/swift,deyton/swift,SwiftAndroid/swift,brentdax/swift,CodaFi/swift,nathawes/swift,kperryua/swift,airspeedswift/swift,Ivacker/swift,felix91gr/swift,xedin/swift,roambotics/swift,ahoppen/swift,jckarter/swift,modocache/swift,khizkhiz/swift,ahoppen/swift,uasys/swift,felix91gr/swift,therealbnut/swift,LeoShimonaka/swift,arvedviehweger/swift,lorentey/swift,allevato/swift,gribozavr/swift,therealbnut/swift,shahmishal/swift,hooman/swift,natecook1000/swift,felix91gr/swift,modocache/swift,sschiau/swift,swiftix/swift.old,adrfer/swift,zisko/swift,hughbe/swift,russbishop/swift,sdulal/swift,ahoppen/swift,kusl/swift,roambotics/swift,LeoShimonaka/swift,codestergit/swift,JGiola/swift,jtbandes/swift,mightydeveloper/swift,return/swift,KrishMunot/swift,calebd/swift,gmilos/swift,devincoughlin/swift,devincoughlin/swift,danielmartin/swift,gottesmm/swift,shahmishal/swift,jckarter/swift,frootloops/swift,harlanhaskins/swift,xedin/swift,tardieu/swift,nathawes/swift,tinysun212/swift-windows,arvedviehweger/swift,dduan/swift,bitjammer/swift,calebd/swift,LeoShimonaka/swift,danielmartin/swift,OscarSwanros/swift,Ivacker/swift,frootloops/swift,MukeshKumarS/Swift,OscarSwanros/swift,milseman/swift,kstaring/swift,gottesmm/swift,sdulal/swift,MukeshKumarS/Swift,amraboelela/swift,allevato/swift,cbrentharris/swift,aschwaighofer/swift,xedin/swift,xedin/swift,uasys/swift,kusl/swift,Jnosh/swift,JGiola/swift,harlanhaskins/swift,MukeshKumarS/Swift,swiftix/swift.old,xedin/swift,amraboelela/swift,danielmartin/swift,sschiau/swift,atrick/swift,slavapestov/swift,lorentey/swift,jtbandes/swift,devincoughlin/swift,brentdax/swift,kentya6/swift,natecook1000/swift,MukeshKumarS/Swift,felix91gr/swift,gribozavr/swift,glessard/swift,CodaFi/swift,johnno1962d/swift,djwbrown/swift,rudkx/swift,felix91gr/swift,brentdax/swift,codestergit/swift,benlangmuir/swift,kperryua/swift,Jnosh/swift,swiftix/swift,tjw/swift,sdulal/swift,huonw/swift,allevato/swift,djwbrown/swift,swiftix/swift,aschwaighofer/swift,emilstahl/swift,slavapestov/swift,glessard/swift,gottesmm/swift,alblue/swift,codestergit/swift,kentya6/swift,benlangmuir/swift,frootloops/swift,allevato/swift,dreamsxin/swift,hooman/swift,kstaring/swift,gottesmm/swift,huonw/swift,apple/swift,huonw/swift,parkera/swift,lorentey/swift,emilstahl/swift,kstaring/swift,felix91gr/swift,gmilos/swift,glessard/swift,roambotics/swift,lorentey/swift,russbishop/swift,kusl/swift,SwiftAndroid/swift,tkremenek/swift,xwu/swift,gmilos/swift,sschiau/swift,austinzheng/swift,mightydeveloper/swift,bitjammer/swift,practicalswift/swift,shajrawi/swift,tkremenek/swift,IngmarStein/swift,natecook1000/swift,practicalswift/swift,frootloops/swift,nathawes/swift,huonw/swift,KrishMunot/swift,return/swift,arvedviehweger/swift,tjw/swift,deyton/swift,kentya6/swift,alblue/swift,karwa/swift,airspeedswift/swift,hughbe/swift,shajrawi/swift,stephentyrone/swift,swiftix/swift.old,manavgabhawala/swift,codestergit/swift,zisko/swift,roambotics/swift,gregomni/swift,JGiola/swift,OscarSwanros/swift,sschiau/swift,slavapestov/swift,xedin/swift,atrick/swift,xwu/swift,johnno1962d/swift,tardieu/swift,modocache/swift,nathawes/swift,alblue/swift,return/swift,xedin/swift,SwiftAndroid/swift,swiftix/swift.old,ben-ng/swift,benlangmuir/swift,gmilos/swift,nathawes/swift,kperryua/swift,ken0nek/swift,emilstahl/swift,arvedviehweger/swift,mightydeveloper/swift,manavgabhawala/swift,uasys/swift,russbishop/swift,jtbandes/swift,jopamer/swift,jopamer/swift,swiftix/swift,danielmartin/swift,gribozavr/swift,johnno1962d/swift,shajrawi/swift,roambotics/swift,practicalswift/swift,apple/swift,swiftix/swift.old,mightydeveloper/swift,calebd/swift,karwa/swift,jckarter/swift,KrishMunot/swift,apple/swift,tkremenek/swift,manavgabhawala/swift,devincoughlin/swift,arvedviehweger/swift,shajrawi/swift,dduan/swift,allevato/swift,austinzheng/swift,IngmarStein/swift,zisko/swift,shajrawi/swift,natecook1000/swift,rudkx/swift,swiftix/swift,gribozavr/swift,JaSpa/swift,xwu/swift,IngmarStein/swift,Ivacker/swift,parkera/swift,djwbrown/swift,adrfer/swift,ben-ng/swift,JGiola/swift,johnno1962d/swift,stephentyrone/swift,hooman/swift,JaSpa/swift,benlangmuir/swift,tardieu/swift,ken0nek/swift,kentya6/swift,kperryua/swift,hughbe/swift,gregomni/swift,benlangmuir/swift,airspeedswift/swift,sdulal/swift,hughbe/swift,jckarter/swift,zisko/swift,harlanhaskins/swift,tinysun212/swift-windows,uasys/swift,bitjammer/swift,practicalswift/swift,shahmishal/swift,CodaFi/swift,kperryua/swift,gribozavr/swift,stephentyrone/swift,cbrentharris/swift,djwbrown/swift,sschiau/swift,Jnosh/swift,hooman/swift,jtbandes/swift,JaSpa/swift,dduan/swift,practicalswift/swift,kusl/swift,cbrentharris/swift,calebd/swift,jmgc/swift,milseman/swift,gribozavr/swift,nathawes/swift,SwiftAndroid/swift,KrishMunot/swift,xwu/swift,milseman/swift,aschwaighofer/swift,ben-ng/swift,amraboelela/swift,cbrentharris/swift,shahmishal/swift,tinysun212/swift-windows,lorentey/swift,lorentey/swift,atrick/swift,tardieu/swift,OscarSwanros/swift,sschiau/swift,kperryua/swift,atrick/swift,swiftix/swift.old,gribozavr/swift,gregomni/swift,sdulal/swift,uasys/swift,zisko/swift,glessard/swift,xwu/swift,slavapestov/swift,amraboelela/swift,ken0nek/swift,sdulal/swift,JaSpa/swift,calebd/swift,manavgabhawala/swift,bitjammer/swift,deyton/swift,IngmarStein/swift,huonw/swift,tardieu/swift,brentdax/swift,kentya6/swift,shajrawi/swift,swiftix/swift,gottesmm/swift,frootloops/swift,milseman/swift,Jnosh/swift,JaSpa/swift,CodaFi/swift,austinzheng/swift,emilstahl/swift,mightydeveloper/swift,jmgc/swift,danielmartin/swift,OscarSwanros/swift,airspeedswift/swift,therealbnut/swift,rudkx/swift,sdulal/swift,khizkhiz/swift,OscarSwanros/swift,xwu/swift,brentdax/swift,jmgc/swift,practicalswift/swift,nathawes/swift,Ivacker/swift,calebd/swift,return/swift,aschwaighofer/swift,adrfer/swift,harlanhaskins/swift,mightydeveloper/swift,deyton/swift,zisko/swift,modocache/swift,adrfer/swift,manavgabhawala/swift,swiftix/swift.old,tinysun212/swift-windows,hughbe/swift,zisko/swift,bitjammer/swift,cbrentharris/swift,emilstahl/swift,mightydeveloper/swift,OscarSwanros/swift,cbrentharris/swift,emilstahl/swift,Ivacker/swift,Jnosh/swift,ben-ng/swift,adrfer/swift,CodaFi/swift,tjw/swift,apple/swift,roambotics/swift,slavapestov/swift