[analyzer] Reapply 138382 and 138388 (reverted in 138419 and 138420). The...

[analyzer] Reapply 138382 and 138388 (reverted in 138419 and 138420). The issue seems to have been with the uninitialized variable fixed in 138424; a fix for another Heisencrasher coming soon.

llvm-svn: 138426