1 files changed, 3 insertions, 8 deletions
diff --git a/lldb/source/Target/ThreadPlanStepOut.cpp b/lldb/source/Target/ThreadPlanStepOut.cpp
index 71ccf80428b..ba529587437 100644
--- a/lldb/source/Target/ThreadPlanStepOut.cpp
+++ b/lldb/source/Target/ThreadPlanStepOut.cpp
@@ -464,17 +464,12 @@ ThreadPlanStepOut::CalculateReturnValue ()
         
     if (m_immediate_step_from_function != NULL)
     {
-        Type *return_type = m_immediate_step_from_function->GetType();
-        lldb::clang_type_t return_clang_type = m_immediate_step_from_function->GetReturnClangType();
-        if (return_type && return_clang_type)
+        ClangASTType return_clang_type = m_immediate_step_from_function->GetClangType().GetFunctionReturnType();
+        if (return_clang_type)
         {
-            ClangASTType ast_type (return_type->GetClangAST(), return_clang_type);
-            
             lldb::ABISP abi_sp = m_thread.GetProcess()->GetABI();
             if (abi_sp)
-            {
-                m_return_valobj_sp = abi_sp->GetReturnValueObject(m_thread, ast_type);
-            }
+                m_return_valobj_sp = abi_sp->GetReturnValueObject(m_thread, return_clang_type);
         }
     }
 }