summaryrefslogtreecommitdiffstats
path: root/lld/lib/ReaderWriter/MachO/ObjCPass.cpp
diff options
context:
space:
mode:
authorMehdi Amini <mehdi.amini@apple.com>2016-11-11 04:29:25 +0000
committerMehdi Amini <mehdi.amini@apple.com>2016-11-11 04:29:25 +0000
commitc1edf566b9ba18806c9a69e77db1cc8e57a14c8d (patch)
treeea1b174a6e594d2b6929f9e4845cc2ba3d9d6f93 /lld/lib/ReaderWriter/MachO/ObjCPass.cpp
parent41af43092ccc8030bb49cea324d85eecd5ae68a8 (diff)
downloadbcm5719-llvm-c1edf566b9ba18806c9a69e77db1cc8e57a14c8d.tar.gz
bcm5719-llvm-c1edf566b9ba18806c9a69e77db1cc8e57a14c8d.zip
Prevent at compile time converting from Error::success() to Expected<T>
This would trigger an assertion at runtime otherwise. Differential Revision: https://reviews.llvm.org/D26482 llvm-svn: 286562
Diffstat (limited to 'lld/lib/ReaderWriter/MachO/ObjCPass.cpp')
-rw-r--r--lld/lib/ReaderWriter/MachO/ObjCPass.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lld/lib/ReaderWriter/MachO/ObjCPass.cpp b/lld/lib/ReaderWriter/MachO/ObjCPass.cpp
index ba24b3fecdf..4712d8ca969 100644
--- a/lld/lib/ReaderWriter/MachO/ObjCPass.cpp
+++ b/lld/lib/ReaderWriter/MachO/ObjCPass.cpp
@@ -103,7 +103,7 @@ public:
// Add the image info.
mergedFile.addAtom(*getImageInfo());
- return llvm::Error();
+ return llvm::Error::success();
}
private:
OpenPOWER on IntegriCloud