Add back a couple checks removed by r129128; the fact that an intitializer

is an array of structures doesn't imply it's a ConstantArray of
ConstantStruct.

llvm-svn: 129207