From: Adam Nemet <anemet@apple.com>
Date: Tue, 13 Mar 2018 04:37:01 +0000 (+0000)
Subject: [LTO] Return proper error object rather than null LTOModule
X-Git-Tag: android-x86-7.1-r4~3906
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b0d20586e989ab5b08d6217cbdd14aae8d58d3e7;p=android-x86%2Fexternal-llvm.git

[LTO] Return proper error object rather than null LTOModule

This caused a crash in LTOModule::createInLocalContext.

rdar://37926841

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@327359 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/LTO/LTOModule.cpp b/lib/LTO/LTOModule.cpp
index f7fe85e5085..b26c371a082 100644
--- a/lib/LTO/LTOModule.cpp
+++ b/lib/LTO/LTOModule.cpp
@@ -208,7 +208,7 @@ LTOModule::makeLTOModule(MemoryBufferRef Buffer, const TargetOptions &options,
   std::string errMsg;
   const Target *march = TargetRegistry::lookupTarget(TripleStr, errMsg);
   if (!march)
-    return std::unique_ptr<LTOModule>(nullptr);
+    return make_error_code(object::object_error::arch_not_found);
 
   // construct LTOModule, hand over ownership of module and target
   SubtargetFeatures Features;