From owner-svn-src-head@FreeBSD.ORG  Wed Nov 13 17:06:27 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 558C4DB3;
 Wed, 13 Nov 2013 17:06:27 +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 2B0AB2FD4;
 Wed, 13 Nov 2013 17:06:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rADH6RNQ013842;
 Wed, 13 Nov 2013 17:06:27 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rADH6QuZ013840;
 Wed, 13 Nov 2013 17:06:26 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201311131706.rADH6QuZ013840@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 13 Nov 2013 17:06:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258098 - head/contrib/llvm/tools/lldb/source/Target
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Nov 2013 17:06:27 -0000

Author: emaste
Date: Wed Nov 13 17:06:26 2013
New Revision: 258098
URL: http://svnweb.freebsd.org/changeset/base/258098

Log:
  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:
  head/contrib/llvm/tools/lldb/source/Target/Thread.cpp
  head/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp

Modified: head/contrib/llvm/tools/lldb/source/Target/Thread.cpp
==============================================================================
--- head/contrib/llvm/tools/lldb/source/Target/Thread.cpp	Wed Nov 13 16:50:19 2013	(r258097)
+++ head/contrib/llvm/tools/lldb/source/Target/Thread.cpp	Wed Nov 13 17:06:26 2013	(r258098)
@@ -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: head/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp
==============================================================================
--- head/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp	Wed Nov 13 16:50:19 2013	(r258097)
+++ head/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp	Wed Nov 13 17:06:26 2013	(r258098)
@@ -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())