Use intrinsic id rather than name
llvm's OwningPtr has now been replaced with std::unique_ptr
Merge branch 'master' of github.com:CTSRD-SOAAP/soaap