diff options
author | dim <dim@FreeBSD.org> | 2015-02-14 12:18:48 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-02-14 12:18:48 +0000 |
commit | ff28d95d1f024411955913aaa68c17f2b09c46fd (patch) | |
tree | dfd4e4f0fa9ce6e010e098662d5f00a37c9ff0e3 /lib/CodeGen/CodeGenModule.cpp | |
parent | cf8e1ca250cdf4ade1e7d628e56040eb27797b5d (diff) | |
download | FreeBSD-src-ff28d95d1f024411955913aaa68c17f2b09c46fd.zip FreeBSD-src-ff28d95d1f024411955913aaa68c17f2b09c46fd.tar.gz |
Vendor import of clang RELEASE_360/rc3 tag r229040 (effectively, 3.6.0 RC3):
https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/rc3@229040
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
-rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 1b07160..9f4567d 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -935,8 +935,8 @@ static void emitUsed(CodeGenModule &CGM, StringRef Name, UsedArray.resize(List.size()); for (unsigned i = 0, e = List.size(); i != e; ++i) { UsedArray[i] = - llvm::ConstantExpr::getBitCast(cast<llvm::Constant>(&*List[i]), - CGM.Int8PtrTy); + llvm::ConstantExpr::getPointerBitCastOrAddrSpaceCast( + cast<llvm::Constant>(&*List[i]), CGM.Int8PtrTy); } if (UsedArray.empty()) |