1 files changed, 22 insertions, 2 deletions
diff --git a/WebKitTools/Scripts/check-for-global-initializers b/WebKitTools/Scripts/check-for-global-initializers
index cf83048..0472901 100755
--- a/WebKitTools/Scripts/check-for-global-initializers
+++ b/WebKitTools/Scripts/check-for-global-initializers
@@ -37,6 +37,7 @@ use strict;
 use File::Basename;
 
 sub touch($);
+sub demangle($);
 
 my $arch = $ENV{'CURRENT_ARCH'};
 my $configuration = $ENV{'CONFIGURATION'};
@@ -78,9 +79,14 @@ for my $file (sort @files) {
         next;
     }
     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";
         }
@@ -119,7 +125,7 @@ for my $file (sort @files) {
             }
         }
 
-        print "ERROR: $shortName has a global initializer in it! ($file)\n";
+        print "ERROR: $shortName has one or more global initializers in it! ($file), near @globals\n";
         $sawError = 1;
     }
 }
@@ -138,3 +144,17 @@ sub touch($)
     open(TOUCH, ">", $path) or die "$!";
     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;
+}
+