1 files changed, 31 insertions, 28 deletions

diff --git a/lldb/source/Expression/IRDynamicChecks.cpp b/lldb/source/Expression/IRDynamicChecks.cpp
index 64fdb08157a..c2195de4d44 100644
--- a/lldb/source/Expression/IRDynamicChecks.cpp
+++ b/lldb/source/Expression/IRDynamicChecks.cpp
@@ -506,6 +506,32 @@ protected:
 
         return true;
     }
+    
+    static llvm::Function *GetFunction(llvm::Value *value)
+    {
+        if (llvm::Function *function = llvm::dyn_cast<llvm::Function>(value))
+        {
+            return function;
+        }
+        
+        if (llvm::ConstantExpr *const_expr = llvm::dyn_cast<llvm::ConstantExpr>(value))
+        {
+            switch (const_expr->getOpcode())
+            {
+            default:
+                return nullptr;
+            case llvm::Instruction::BitCast:
+                return GetFunction(const_expr->getOperand(0));
+            }
+        }
+        
+        return nullptr;
+    }
+    
+    static llvm::Function *GetCalledFunction(llvm::CallInst *inst)
+    {
+        return GetFunction(inst->getCalledValue());
+    }
 
     bool InspectInstruction(llvm::Instruction &i) override
     {
@@ -515,35 +541,12 @@ protected:
 
         if (call_inst)
         {
-            // This metadata is set by IRForTarget::MaybeHandleCall().
-
-            MDNode *metadata = call_inst->getMetadata("lldb.call.realName");
-
-            if (!metadata)
+            const llvm::Function *called_function = GetCalledFunction(call_inst);
+            
+            if (!called_function)
                 return true;
-
-            if (metadata->getNumOperands() != 1)
-            {
-                if (log)
-                    log->Printf("Function call metadata has %d operands for [%p] %s",
-                                metadata->getNumOperands(),
-                                static_cast<void*>(call_inst),
-                                PrintValue(call_inst).c_str());
-                return false;
-            }
-
-            MDString *real_name = dyn_cast<MDString>(metadata->getOperand(0));
-
-            if (!real_name)
-            {
-                if (log)
-                    log->Printf("Function call metadata is not an MDString for [%p] %s",
-                                static_cast<void*>(call_inst),
-                                PrintValue(call_inst).c_str());
-                return false;
-            }
-
-            std::string name_str = real_name->getString();
+            
+            std::string name_str = called_function->getName().str();
             const char* name_cstr = name_str.c_str();
 
             if (log)