[X86][Haswell][SchedModel] Add architecture specific scheduling models.

[oota-llvm.git] / lib / Object / IRObjectFile.cpp

diff --git a/lib/Object/IRObjectFile.cpp b/lib/Object/IRObjectFile.cpp
index 0639c71d1b0caeb4d0413e70b74361a50c9e8ba7..5323d9277eee1f4d47a8bceb6dd061f3b550f46d 100644 (file)
--- a/lib/Object/IRObjectFile.cpp
+++ b/lib/Object/IRObjectFile.cpp
@@ -11,13 +11,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Object/IRObjectFile.h"
+#include "RecordStreamer.h"
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/GVMaterializer.h"
 #include "llvm/IR/Mangler.h"
 #include "llvm/IR/Module.h"
-#include "llvm/Object/IRObjectFile.h"
-#include "llvm/Object/RecordStreamer.h"
 #include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
@@ -33,14 +33,8 @@ using namespace llvm;
 using namespace object;
 
 IRObjectFile::IRObjectFile(std::unique_ptr<MemoryBuffer> Object,
-                           std::error_code &EC, LLVMContext &Context)
-    : SymbolicFile(Binary::ID_IR, std::move(Object)) {
-  ErrorOr<Module *> MOrErr = getLazyBitcodeModule(Data.get(), Context);
-  if ((EC = MOrErr.getError()))
-    return;
-
-  M.reset(MOrErr.get());
-
+                           std::unique_ptr<Module> Mod)
+    : SymbolicFile(Binary::ID_IR, std::move(Object)), M(std::move(Mod)) {
   // If we have a DataLayout, setup a mangler.
   const DataLayout *DL = M->getDataLayout();
   if (!DL)
@@ -119,7 +113,11 @@ IRObjectFile::IRObjectFile(std::unique_ptr<MemoryBuffer> Object,
   }
 }
 
-IRObjectFile::~IRObjectFile() { M->getMaterializer()->releaseBuffer(); }
+IRObjectFile::~IRObjectFile() {
+  GVMaterializer *GVM =  M->getMaterializer();
+  if (GVM)
+    GVM->releaseBuffer();
+ }
 
 static const GlobalValue *getGV(DataRefImpl &Symb) {
   if ((Symb.p & 3) == 3)
@@ -240,16 +238,13 @@ uint32_t IRObjectFile::getSymbolFlags(DataRefImpl Symb) const {
   if (GV->hasLinkOnceLinkage() || GV->hasWeakLinkage())
     Res |= BasicSymbolRef::SF_Weak;
 
-  if (auto *Var = dyn_cast<GlobalVariable>(GV)) {
+  if (GV->getName().startswith("llvm."))
+    Res |= BasicSymbolRef::SF_FormatSpecific;
+  else if (auto *Var = dyn_cast<GlobalVariable>(GV)) {
     if (Var->getSection() == StringRef("llvm.metadata"))
       Res |= BasicSymbolRef::SF_FormatSpecific;
   }
 
-  if (auto *F = dyn_cast<Function>(GV)) {
-    if (F->getName().startswith("llvm."))
-      Res |= BasicSymbolRef::SF_FormatSpecific;
-  }
-
   return Res;
 }
 
@@ -275,10 +270,10 @@ basic_symbol_iterator IRObjectFile::symbol_end_impl() const {
 
 ErrorOr<IRObjectFile *> llvm::object::IRObjectFile::createIRObjectFile(
     std::unique_ptr<MemoryBuffer> Object, LLVMContext &Context) {
-  std::error_code EC;
-  std::unique_ptr<IRObjectFile> Ret(
-      new IRObjectFile(std::move(Object), EC, Context));
-  if (EC)
+  ErrorOr<Module *> MOrErr = getLazyBitcodeModule(Object.get(), Context);
+  if (std::error_code EC = MOrErr.getError())
     return EC;
-  return Ret.release();
+
+  std::unique_ptr<Module> M(MOrErr.get());
+  return new IRObjectFile(std::move(Object), std::move(M));
 }