Changeset 55553 in webkit

Timestamp:

Mar 4, 2010 2:15:28 PM (14 years ago)

Author:

Simon Fraser

Message:

2010-03-04 Simon Fraser <Simon Fraser>

Build fix: add exceptions to the check-for-global-initializers script
for FocusController and SpatialNavigation, and improve the script
to actually print out the globals found.

• Scripts/check-for-global-initializers:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/check-for-global-initializers (modified) (5 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Build fix: add exceptions to the check-for-global-initializers script
+        for FocusController and SpatialNavigation, and improve the script
+        to actually print out the globals found.
+
+        * Scripts/check-for-global-initializers:
+
 2010-03-04  Dirk Pranke  <dpranke@chromium.org>
 

trunk/WebKitTools/Scripts/check-for-global-initializers

@@ -38 +38 @@
 
 sub touch($);
+sub demangle($);
 
 my $arch = $ENV{'CURRENT_ARCH'};
@@ -79 +80 @@
     }
     my $sawGlobal = 0;
+    my @globals;
     while (<NM>) {
         if (/^STDOUT:/) {
-            $sawGlobal = 1 if /__GLOBAL__I/;
+            my $line = $_;
+            if ($line =~ /__GLOBAL__I(.+)$/) {
+                $sawGlobal = 1;
+                push(@globals, demangle($1));
+            }
         } else {
             print STDERR if $_ ne "nm: no name list\n";
@@ -113 +119 @@
                 next if $shortName eq "SVGElementInstance.o";
                 next if $shortName eq "XMLHttpRequest.o";
+
+                #FIXME: check to see if these are legit.
+                next if $shortName eq "FocusController.o";
+                next if $shortName eq "SpatialNavigation.o";
             }
             if ($target eq "WebKit") {
@@ -121 +131 @@
 
         print "ERROR: $shortName has a global initializer in it! ($file)\n";
+        print "ERROR: @globals\n";
         $sawError = 1;
     }
@@ -139 +150 @@
     close(TOUCH);
 }
+
+sub demangle($)
+{
+    my ($symbol) = @_;
+    if (!open FILT, "c++filt $symbol |") {
+        print "ERROR: Could not open c++filt\n";
+        return;
+    }
+    my $result = <FILT>;
+    close FILT;
+    chomp $result;
+    return $result;
+}
+