Put back fixed version of code to avoid copying
padding within structs (sometimes).

llvm-svn: 47180
3 files changed