diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7081621534a..927a080088c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	Code cleanup.
+	* parse.c (exp_iterate): Use operator_length wrapper function.
+
 2010-05-18  Michael Snyder  <msnyder@vmware.com>
 
 	* ada-lang.c: White space.
diff --git a/gdb/parse.c b/gdb/parse.c
index cf5189ab4d2..1c8b3508ec7 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -1510,8 +1510,7 @@ exp_iterate (struct expression *exp,
     {
       int pos, args, oplen = 0;
 
-      exp->language_defn->la_exp_desc->operator_length (exp, endpos,
-							&oplen, &args);
+      operator_length (exp, endpos, &oplen, &args);
       gdb_assert (oplen > 0);
 
       pos = endpos - oplen;