diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index acadbcc520..9778d39fe8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-03  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	PR gdb/2384:
+	* gdbtypes.c (get_vptr_fieldno): baseclass and basetype may have
+	different lifetimes.
+	
 2008-10-03  Joel Brobecker  <brobecker@adacore.com>
 
 	* solib-osf.c: Include "solib.h".
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index f7b0490821..6b405f4bc9 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -1324,7 +1324,7 @@ get_vptr_fieldno (struct type *type, struct type **basetypep)
 	    {
 	      /* If the type comes from a different objfile we can't cache
 		 it, it may have a different lifetime. PR 2384 */
-	      if (TYPE_OBJFILE (type) == TYPE_OBJFILE (baseclass))
+	      if (TYPE_OBJFILE (type) == TYPE_OBJFILE (basetype))
 		{
 		  TYPE_VPTR_FIELDNO (type) = fieldno;
 		  TYPE_VPTR_BASETYPE (type) = basetype;