[llvm] r183840 - Inline Path::isBitcodeFile into only use and remove it.
Rafael Espindola
rafael.espindola at gmail.com
Wed Jun 12 08:13:57 PDT 2013
Author: rafael
Date: Wed Jun 12 10:13:57 2013
New Revision: 183840
URL: http://llvm.org/viewvc/llvm-project?rev=183840&view=rev
Log:
Inline Path::isBitcodeFile into only use and remove it.
Modified:
llvm/trunk/include/llvm/Support/PathV1.h
llvm/trunk/lib/Support/Path.cpp
llvm/trunk/tools/lto/LTOModule.cpp
Modified: llvm/trunk/include/llvm/Support/PathV1.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/PathV1.h?rev=183840&r1=183839&r2=183840&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/PathV1.h (original)
+++ llvm/trunk/include/llvm/Support/PathV1.h Wed Jun 12 10:13:57 2013
@@ -226,13 +226,6 @@ namespace sys {
/// @brief Determine if the path references an archive file.
bool isArchive() const;
- /// This function determines if the path name in the object references an
- /// LLVM Bitcode file by looking at its magic number.
- /// @returns true if the file starts with the magic number for LLVM
- /// bitcode files.
- /// @brief Determine if the path references a bitcode file.
- bool isBitcodeFile() const;
-
/// This function determines if the path name in the object references a
/// native Dynamic Library (shared library, shared object) by looking at
/// the file's magic number. The Path object must reference a file, not a
Modified: llvm/trunk/lib/Support/Path.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Path.cpp?rev=183840&r1=183839&r2=183840&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Path.cpp (original)
+++ llvm/trunk/lib/Support/Path.cpp Wed Jun 12 10:13:57 2013
@@ -77,14 +77,6 @@ Path::appendSuffix(StringRef suffix) {
}
}
-bool
-Path::isBitcodeFile() const {
- fs::file_magic type;
- if (fs::identify_magic(str(), type))
- return false;
- return type == fs::file_magic::bitcode;
-}
-
// Include the truly platform-specific parts of this class.
#if defined(LLVM_ON_UNIX)
#include "Unix/Path.inc"
Modified: llvm/trunk/tools/lto/LTOModule.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOModule.cpp?rev=183840&r1=183839&r2=183840&view=diff
==============================================================================
--- llvm/trunk/tools/lto/LTOModule.cpp (original)
+++ llvm/trunk/tools/lto/LTOModule.cpp Wed Jun 12 10:13:57 2013
@@ -32,7 +32,6 @@
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Path.h"
-#include "llvm/Support/PathV1.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/TargetSelect.h"
@@ -170,7 +169,10 @@ bool LTOModule::isBitcodeFile(const void
}
bool LTOModule::isBitcodeFile(const char *path) {
- return llvm::sys::Path(path).isBitcodeFile();
+ sys::fs::file_magic type;
+ if (sys::fs::identify_magic(path, type))
+ return false;
+ return type == sys::fs::file_magic::bitcode;
}
/// isBitcodeFileForTarget - Returns 'true' if the file (or memory contents) is
More information about the llvm-commits
mailing list