diff options
| -rw-r--r-- | lldb/source/Expression/IRDynamicChecks.cpp | 15 | ||||
| -rw-r--r-- | lldb/source/Expression/IRForTarget.cpp | 10 |
2 files changed, 8 insertions, 17 deletions
diff --git a/lldb/source/Expression/IRDynamicChecks.cpp b/lldb/source/Expression/IRDynamicChecks.cpp index c2515c9730c..4030f149ab2 100644 --- a/lldb/source/Expression/IRDynamicChecks.cpp +++ b/lldb/source/Expression/IRDynamicChecks.cpp @@ -517,23 +517,16 @@ private: return false; } - ConstantDataArray *real_name = dyn_cast<ConstantDataArray>(metadata->getOperand(0)); + MDString *real_name = dyn_cast<MDString>(metadata->getOperand(0)); if (!real_name) { if (log) - log->Printf("Function call metadata is not a ConstantArray for [%p] %s", call_inst, PrintValue(call_inst).c_str()); + log->Printf("Function call metadata is not an MDString for [%p] %s", call_inst, PrintValue(call_inst).c_str()); return false; } - - if (!real_name->isString()) - { - if (log) - log->Printf("Function call metadata is not a string for [%p] %s", call_inst, PrintValue(call_inst).c_str()); - return false; - } - - std::string name_str = real_name->getAsString(); + + std::string name_str = real_name->getString(); const char* name_cstr = name_str.c_str(); if (log) diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp index 778c6c0b183..65ff324b843 100644 --- a/lldb/source/Expression/IRForTarget.cpp +++ b/lldb/source/Expression/IRForTarget.cpp @@ -337,12 +337,10 @@ IRForTarget::RegisterFunctionMetadata(LLVMContext &context, if (Instruction *user_inst = dyn_cast<Instruction>(user)) { - Constant *name_array = ConstantDataArray::getString(context, StringRef(name)); - - ArrayRef<Value *> md_values(name_array); - - MDNode *metadata = MDNode::get(context, md_values); - + MDString* md_name = MDString::get(context, StringRef(name)); + + MDNode *metadata = MDNode::get(context, md_name); + user_inst->setMetadata("lldb.call.realName", metadata); } else |
