Re: regression: gdb.objc/basicclass.exp [Re: [RFA] "Error in re-setting breakpoint," c++/12750]

[Keith Seitz <keiths@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1760 bytes --]

On 06/01/2011 12:07 AM, Jan Kratochvil wrote:
> -PASS: gdb.objc/basicclass.exp: resetting breakpoints when rerunning
> -PASS: gdb.objc/basicclass.exp: continue until method breakpoint
> -PASS: gdb.objc/basicclass.exp: print an ivar of self
> -PASS: gdb.objc/basicclass.exp: print self
> -PASS: gdb.objc/basicclass.exp: print contents of self
> +FAIL: gdb.objc/basicclass.exp: resetting breakpoints when rerunning
> +FAIL: gdb.objc/basicclass.exp: continue until method breakpoint (GDB internal error)
> +FAIL: gdb.objc/basicclass.exp: print an ivar of self
> +FAIL: gdb.objc/basicclass.exp: print self
> +FAIL: gdb.objc/basicclass.exp: print contents of self

This is caused by a thinko in objc-lang.c:find_methods. Amongst its many 
duties, that function counts the number of ObjC symbols seen in an 
objfile, storing this result in the objfile. It is then checked every 
time find_methods is called.

However, the loop over the minimal symbols has a few continuations in 
it, e.g., to check if the symbol is in the desired block and other 
things; if not, it continues the loop with the next minimal symbol. 
Unfortunately, that bypasses the incrementing of the objfile's symbol 
counter.

The method not being in the desired block does not make it an invalid 
ObjC method for the objfile. It must still be counted for the later 
assertion.

Before the patch for c++/12750, decode_objc would always get NULL for 
file_symtab (so why does it even have that parameter?), and the check 
for the block would never occur.

This is all way more verbiage than the simple patch to fix it: increment 
the counter before shorting the loop.

Keith

ChangeLog
2011-06-01  Keith Seitz  <keiths@redhat.com>

	* objc-lang.c (find_methods): Increment objfile_csym earlier.


[-- Attachment #2: objc-regression.patch --]
[-- Type: text/plain, Size: 684 bytes --]

diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index dfa5388..592b52e 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -1221,6 +1221,8 @@ find_methods (struct symtab *symtab, char type,
 	  pc = gdbarch_convert_from_func_ptr_addr (gdbarch, pc,
 						   &current_target);
 
+	  objfile_csym++;
+
 	  if (symtab)
 	    if (pc < BLOCK_START (block) || pc >= BLOCK_END (block))
 	      /* Not in the specified symtab.  */
@@ -1237,8 +1239,6 @@ find_methods (struct symtab *symtab, char type,
 	  if (parse_method (tmp, &ntype, &nclass,
 			    &ncategory, &nselector) == NULL)
 	    continue;
-      
-	  objfile_csym++;
 
 	  if ((type != '\0') && (ntype != type))
 	    continue;