projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[X86][Haswell][SchedModel] Add architecture specific scheduling models.
[oota-llvm.git]
/
lib
/
Object
/
Binary.cpp
diff --git
a/lib/Object/Binary.cpp
b/lib/Object/Binary.cpp
index 9f6a68556f9a845881379d6f78e508d9092c4505..89e9d732ce9dcc9a95c410f33ed5c3cc4036a536 100644
(file)
--- a/
lib/Object/Binary.cpp
+++ b/
lib/Object/Binary.cpp
@@
-38,8
+38,9
@@
StringRef Binary::getFileName() const {
return Data->getBufferIdentifier();
}
return Data->getBufferIdentifier();
}
-ErrorOr<Binary *> object::createBinary(std::unique_ptr<MemoryBuffer> &Buffer,
- LLVMContext *Context) {
+ErrorOr<std::unique_ptr<Binary>>
+object::createBinary(std::unique_ptr<MemoryBuffer> Buffer,
+ LLVMContext *Context) {
sys::fs::file_magic Type = sys::fs::identify_magic(Buffer->getBuffer());
switch (Type) {
sys::fs::file_magic Type = sys::fs::identify_magic(Buffer->getBuffer());
switch (Type) {
@@
-74,10
+75,10
@@
ErrorOr<Binary *> object::createBinary(std::unique_ptr<MemoryBuffer> &Buffer,
llvm_unreachable("Unexpected Binary File Type");
}
llvm_unreachable("Unexpected Binary File Type");
}
-ErrorOr<
Binary *
> object::createBinary(StringRef Path) {
+ErrorOr<
std::unique_ptr<Binary>
> object::createBinary(StringRef Path) {
ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
MemoryBuffer::getFileOrSTDIN(Path);
if (std::error_code EC = FileOrErr.getError())
return EC;
ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
MemoryBuffer::getFileOrSTDIN(Path);
if (std::error_code EC = FileOrErr.getError())
return EC;
- return createBinary(
FileOrErr.get(
));
+ return createBinary(
std::move(*FileOrErr
));
}
}