Merge GDB 7.5.1

gdb/inline-frame.c

 /* Inline frame unwinder for GDB.
 
    Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "inline-frame.h"
 #include "addrmap.h"
 #include "block.h"
 #include "frame-unwind.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "symtab.h"
 #include "vec.h"
 
 #include "gdb_assert.h"
 
@@ skipping 370 matching lines @@
     inline_count++;
 
   /* Simulate some most-inner inlined frames which were suppressed, so
      they can be stepped into later.  If we are unwinding already
      outer frames from some non-inlined frame this does not apply.  */
   if (next_frame == NULL)
     inline_count += inline_skipped_frames (inferior_ptid);
 
   return inline_count;
 }