From owner-svn-src-all@FreeBSD.ORG Wed Mar 19 13:15:17 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 948E45E3; Wed, 19 Mar 2014 13:15:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 66AD63EA; Wed, 19 Mar 2014 13:15:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2JDFHNe045804; Wed, 19 Mar 2014 13:15:17 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2JDFHWX045802; Wed, 19 Mar 2014 13:15:17 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201403191315.s2JDFHWX045802@svn.freebsd.org> From: Ed Maste Date: Wed, 19 Mar 2014 13:15:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r263365 - stable/10/contrib/llvm/tools/lldb/source/Target X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Mar 2014 13:15:17 -0000 Author: emaste Date: Wed Mar 19 13:15:16 2014 New Revision: 263365 URL: http://svnweb.freebsd.org/changeset/base/263365 Log: MFC r258098: Merge upstream LLDB r194487: Log failure to restore thread state in ThreadPlanCallFunction::DoTakedown In order to help track down llvm.org/pr17226. Sponsored by: DARPA, AFRL Modified: stable/10/contrib/llvm/tools/lldb/source/Target/Thread.cpp stable/10/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/llvm/tools/lldb/source/Target/Thread.cpp ============================================================================== --- stable/10/contrib/llvm/tools/lldb/source/Target/Thread.cpp Wed Mar 19 13:13:47 2014 (r263364) +++ stable/10/contrib/llvm/tools/lldb/source/Target/Thread.cpp Wed Mar 19 13:15:16 2014 (r263365) @@ -511,8 +511,7 @@ Thread::CheckpointThreadState (ThreadSta bool Thread::RestoreRegisterStateFromCheckpoint (ThreadStateCheckpoint &saved_state) { - RestoreSaveFrameZero(saved_state.register_backup); - return true; + return RestoreSaveFrameZero(saved_state.register_backup); } bool Modified: stable/10/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp ============================================================================== --- stable/10/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp Wed Mar 19 13:13:47 2014 (r263364) +++ stable/10/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp Wed Mar 19 13:15:16 2014 (r263365) @@ -299,7 +299,11 @@ ThreadPlanCallFunction::DoTakedown (bool m_takedown_done = true; m_stop_address = m_thread.GetStackFrameAtIndex(0)->GetRegisterContext()->GetPC(); m_real_stop_info_sp = GetPrivateStopInfo (); - m_thread.RestoreRegisterStateFromCheckpoint(m_stored_thread_state); + if (!m_thread.RestoreRegisterStateFromCheckpoint(m_stored_thread_state)) + { + if (log) + log->Printf("ThreadPlanCallFunction(%p): DoTakedown failed to restore register state", this); + } SetPlanComplete(success); ClearBreakpoints(); if (log && log->GetVerbose())