aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Transforms/Instrumentation/DebugIR.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-12-04 02:59:27 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-04 02:59:28 +0000
commit876d6995443e99d13696f3941c3a789a4daa7c7a (patch)
tree8fb36d3910e3ee4c4e1b7422f4f017108efc52f5 /lib/Transforms/Instrumentation/DebugIR.cpp
parentd2327b22152ced7bc46dc629fc908959e8a52d03 (diff)
parent37ed9c199ca639565f6ce88105f9e39e898d82d0 (diff)
downloadexternal_llvm-876d6995443e99d13696f3941c3a789a4daa7c7a.zip
external_llvm-876d6995443e99d13696f3941c3a789a4daa7c7a.tar.gz
external_llvm-876d6995443e99d13696f3941c3a789a4daa7c7a.tar.bz2
Merge "Update aosp/master LLVM for rebase to r222494."
Diffstat (limited to 'lib/Transforms/Instrumentation/DebugIR.cpp')
-rw-r--r--lib/Transforms/Instrumentation/DebugIR.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Transforms/Instrumentation/DebugIR.cpp b/lib/Transforms/Instrumentation/DebugIR.cpp
index f2f1738..5234341 100644
--- a/lib/Transforms/Instrumentation/DebugIR.cpp
+++ b/lib/Transforms/Instrumentation/DebugIR.cpp
@@ -396,7 +396,7 @@ private:
Elements.push_back(getOrCreateType(T->getStructElementType(i)));
// set struct elements
- StructDescriptor.setTypeArray(Builder.getOrCreateArray(Elements));
+ StructDescriptor.setArrays(Builder.getOrCreateArray(Elements));
} else if (T->isPointerTy()) {
Type *PointeeTy = T->getPointerElementType();
if (!(N = getType(PointeeTy)))
@@ -440,7 +440,7 @@ private:
Params.push_back(getOrCreateType(T));
}
- DIArray ParamArray = Builder.getOrCreateArray(Params);
+ DITypeArray ParamArray = Builder.getOrCreateTypeArray(Params);
return Builder.createSubroutineType(DIFile(FileNode), ParamArray);
}
@@ -525,11 +525,11 @@ std::string DebugIR::getPath() {
void DebugIR::writeDebugBitcode(const Module *M, int *fd) {
std::unique_ptr<raw_fd_ostream> Out;
- std::string error;
+ std::error_code EC;
if (!fd) {
std::string Path = getPath();
- Out.reset(new raw_fd_ostream(Path.c_str(), error, sys::fs::F_Text));
+ Out.reset(new raw_fd_ostream(Path, EC, sys::fs::F_Text));
DEBUG(dbgs() << "WRITING debug bitcode from Module " << M << " to file "
<< Path << "\n");
} else {