blob: 814ca30879a005122adfb04df90b31e40b1ad872 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
--- libtapi-1.30/lib/Core/MachODylibReader.cpp.orig 2017-02-11 21:36:40.000000000 +0100
+++ libtapi-1.30/lib/Core/MachODylibReader.cpp 2017-02-11 21:48:25.000000000 +0100
@@ -37,7 +37,11 @@
}
auto binaryOrErr = createBinary(bufferRef);
+#if LLVM_NEW_ERROR_API
+ if (binaryOrErr.takeError())
+#else
if (binaryOrErr.getError())
+#endif
return FileType::Invalid;
Binary &bin = *binaryOrErr.get();
@@ -49,7 +53,11 @@
for (auto OI = UB->begin_objects(), OE = UB->end_objects(); OI != OE; ++OI) {
auto objOrErr = OI->getAsObjectFile();
// Ignore archives.
+#if LLVM_NEW_ERROR_API
+ if (objOrErr.takeError())
+#else
if (objOrErr.getError())
+#endif
continue;
auto &obj = *objOrErr.get();
@@ -228,7 +236,11 @@
? SymbolFlags::WeakReferenced
: SymbolFlags::None;
auto symbolName = symbol.getName();
+#if LLVM_NEW_ERROR_API
+ if (symbolName.takeError())
+#else
if (symbolName.getError())
+#endif
continue;
StringRef name;
@@ -244,8 +256,14 @@
file->setPath(memBuffer.getBufferIdentifier());
auto binaryOrErr = createBinary(memBuffer);
+// no way to figure this out from the headers :-(
+#if LLVM_NEW_ERROR_API
+ if (auto ec = binaryOrErr.takeError()) {
+ file->setErrorCode(llvm::errorToErrorCode(std::move(ec)));
+#else
if (auto ec = binaryOrErr.getError()) {
file->setErrorCode(ec);
+#endif
return std::move(file);
}
@@ -263,7 +281,11 @@
auto objOrErr = OI->getAsObjectFile();
// Ignore archives.
+#if LLVM_NEW_ERROR_API
+ if (objOrErr.takeError())
+#else
if (objOrErr.getError())
+#endif
continue;
auto &object = *objOrErr.get();
|
