Fix some name shadowing warnings.  Remove redundant function definition
Fix some name shadowing warnings.  Remove redundant function definition

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