diff options
| author | Nick Kledzik <kledzik@apple.com> | 2014-09-17 00:53:44 +0000 |
|---|---|---|
| committer | Nick Kledzik <kledzik@apple.com> | 2014-09-17 00:53:44 +0000 |
| commit | 2d2b254e7c40c294c67d43c847d3341baa5b9f15 (patch) | |
| tree | 373afcc95466a53bcffcb27d5657ce17d92cc673 | |
| parent | b54bbe358ab83f04e56a36be7e28d1541246e1c6 (diff) | |
| download | bcm5719-llvm-2d2b254e7c40c294c67d43c847d3341baa5b9f15.tar.gz bcm5719-llvm-2d2b254e7c40c294c67d43c847d3341baa5b9f15.zip | |
Fix identify_magic() with mach-o stub dylibs.
The wrong value was returned and the unittest did not cover the stub dylib case.
llvm-svn: 217933
| -rw-r--r-- | llvm/lib/Support/Path.cpp | 2 | ||||
| -rw-r--r-- | llvm/unittests/Support/Path.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/llvm/lib/Support/Path.cpp b/llvm/lib/Support/Path.cpp index 781c17c1879..7e02f5fecc3 100644 --- a/llvm/lib/Support/Path.cpp +++ b/llvm/lib/Support/Path.cpp @@ -999,7 +999,7 @@ file_magic identify_magic(StringRef Magic) { case 6: return file_magic::macho_dynamically_linked_shared_lib; case 7: return file_magic::macho_dynamic_linker; case 8: return file_magic::macho_bundle; - case 9: return file_magic::macho_dynamic_linker; + case 9: return file_magic::macho_dynamically_linked_shared_lib_stub; case 10: return file_magic::macho_dsym_companion; } break; diff --git a/llvm/unittests/Support/Path.cpp b/llvm/unittests/Support/Path.cpp index a12e9b79211..ae4c9eb207f 100644 --- a/llvm/unittests/Support/Path.cpp +++ b/llvm/unittests/Support/Path.cpp @@ -501,6 +501,8 @@ const char macho_dynamic_linker[] = "\xfe\xed\xfa\xce..........\x00\x07"; const char macho_bundle[] = "\xfe\xed\xfa\xce..........\x00\x08"; const char macho_dsym_companion[] = "\xfe\xed\xfa\xce..........\x00\x0a"; const char windows_resource[] = "\x00\x00\x00\x00\x020\x00\x00\x00\xff"; +const char macho_dynamically_linked_shared_lib_stub[] = + "\xfe\xed\xfa\xce..........\x00\x09"; TEST_F(FileSystemTest, Magic) { struct type { @@ -526,6 +528,7 @@ TEST_F(FileSystemTest, Magic) { DEFINE(macho_dynamically_linked_shared_lib), DEFINE(macho_dynamic_linker), DEFINE(macho_bundle), + DEFINE(macho_dynamically_linked_shared_lib_stub), DEFINE(macho_dsym_companion), DEFINE(windows_resource) #undef DEFINE |
