The old logic would add non-struct and non C++ struct variables to the local

scope. Now we only add C++ struct with non-trivial destructor variables to the
local scope.

llvm-svn: 115269