merge llvm3.3