Fix parameter indexing when a non-removed error param is followed by blocks.
Fix parameter indexing when a non-removed error param is followed by blocks.

Tested as part of the next commit.

Swift SVN r28977

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