MachODump.cpp: fix MSVC build

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220518 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Hans Wennborg
2014-10-23 21:59:17 +00:00
parent 4d962b05ca
commit e4e2ea6839

View File

@@ -821,7 +821,7 @@ const char *get_objc2_64bit_class_name(uint64_t pointer_value,
const char *symbol_name = get_symbol_64(offset, S, info, n_value); const char *symbol_name = get_symbol_64(offset, S, info, n_value);
if (symbol_name == nullptr) if (symbol_name == nullptr)
return nullptr; return nullptr;
const char *class_name = rindex(symbol_name, '$'); const char *class_name = strrchr(symbol_name, '$');
if (class_name != nullptr && class_name[1] == '_' && class_name[2] != '\0') if (class_name != nullptr && class_name[1] == '_' && class_name[2] != '\0')
return class_name + 2; return class_name + 2;
else else
@@ -978,7 +978,7 @@ const char *GuessLiteralPointer(uint64_t ReferenceValue, uint64_t ReferencePC,
const char *name = get_dyld_bind_info_symbolname(ReferenceValue, info); const char *name = get_dyld_bind_info_symbolname(ReferenceValue, info);
if (name != nullptr) { if (name != nullptr) {
*ReferenceType = LLVMDisassembler_ReferenceType_Out_Objc_Class_Ref; *ReferenceType = LLVMDisassembler_ReferenceType_Out_Objc_Class_Ref;
const char *class_name = rindex(name, '$'); const char *class_name = strrchr(name, '$');
if (class_name != nullptr && class_name[1] == '_' && if (class_name != nullptr && class_name[1] == '_' &&
class_name[2] != '\0') { class_name[2] != '\0') {
info->class_name = class_name + 2; info->class_name = class_name + 2;
@@ -1074,8 +1074,8 @@ const char *SymbolizerSymbolLookUp(void *DisInfo, uint64_t ReferenceValue,
} }
const char *SymbolName = nullptr; const char *SymbolName = nullptr;
if (ReferenceValue != 0xffffffffffffffffLLU && if (ReferenceValue != 0xffffffffffffffffULL &&
ReferenceValue != 0xfffffffffffffffeLLU) { ReferenceValue != 0xfffffffffffffffeULL) {
StringRef name = info->AddrMap->lookup(ReferenceValue); StringRef name = info->AddrMap->lookup(ReferenceValue);
if (!name.empty()) if (!name.empty())
SymbolName = name.data(); SymbolName = name.data();