Reinstate r133513 (reverted in r133700) with an additional fix for a -Wshorten-64-to-32 warning in Instructions.h. llvm-svn: 133708 GitOrigin-RevId: 61ea0e469254e0c7ab0e190b463d994b9316846c