changes to make codegen.cpp build with latest llvm 3.6
Merge pull request #8131 from jakebolewski/jcb/fixllvm36

changes to make codegen.cpp build with latest llvm 3.6