Make gen-postmortem-metadata.py more reliable

tools/gen-postmortem-metadata.py

 #!/usr/bin/env python
 
 #
 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
@@ skipping 209 matching lines @@
 
 #undef FRAME_CONST
 
 ''' % sys.argv[0];
 
 footer = '''
 }
 '''
 
 #
+# Get the base class
+#
+def get_base_class(klass):
+        if (klass == 'Object'):
+                return klass;
+
+        if (not (klass in klasses)):
+                return None;
+
+        k = klasses[klass];
+
+        return get_base_class(k['parent']);
+
+#
 # Loads class hierarchy and type information from "objects.h".
 #
 def load_objects():
         objfilename = sys.argv[2];
         objfile = open(objfilename, 'r');
         in_insttype = False;
 
         typestr = '';
 
         #
@@ skipping 17 matching lines @@
                 if (in_insttype and line.startswith('};')):
                         in_insttype = False;
                         continue;
 
                 line = re.sub('//.*', '', line.rstrip().lstrip());
 
                 if (in_insttype):
                         typestr += line;
                         continue;
 
-                match = re.match('class (\w[^\s:]*)(: public (\w[^\s{]*))?\s*{',
+                match = re.match('class (\w[^:]*)(: public (\w[^{]*))?\s*{\s*',
                     line);
 
                 if (match):
-                        klass = match.group(1);
+                        klass = match.group(1).rstrip().lstrip();
                         pklass = match.group(3);
+                        if (pklass):
+                                pklass = pklass.rstrip().lstrip();
                         klasses[klass] = { 'parent': pklass };
 
         #
         # Process the instance type declaration.
         #
         entries = typestr.split(',');
         for entry in entries:
                 types[re.sub('\s*=.*', '', entry).lstrip()] = True;
 
         #
@@ skipping 230 matching lines @@
                 });
 
         emit_set(out, consts);
 
         out.write('/* class hierarchy information */\n');
         consts = [];
         keys = klasses.keys();
         keys.sort();
         for klassname in keys:
                 pklass = klasses[klassname]['parent'];
+                bklass = get_base_class(klassname);
+                if (bklass != 'Object'):
+                        continue;
                 if (pklass == None):
                         continue;
 
                 consts.append({
                     'name': 'parent_%s__%s' % (klassname, pklass),
                     'value': 0
                 });
 
         emit_set(out, consts);
 
         out.write('/* field information */\n');
         emit_set(out, fields);
 
         out.write(footer);
 
 if (len(sys.argv) < 4):
         print('usage: %s output.cc objects.h objects-inl.h' % sys.argv[0]);
         sys.exit(2);
 
 load_objects();
 load_fields();
 emit_config();