Fix the failing escape analysis tests.
Fix the failing escape analysis tests.

The failure was introduced when escaping via function pointer call was
separated from normal escapes.  This change checks both the normal and
fptr escapes for the test setup.

wangxiayang/llvm-analysis,wangxiayang/llvm-analysis,travitch/llvm-analysis,travitch/llvm-analysis