The identifier shouldn't be added to the scope, the decl should.

This fixes strange assertions that just started triggering.

llvm-svn: 42721