Changeset 171264 in webkit

Timestamp:

Jul 19, 2014 11:07:43 AM (10 years ago)

Author:

mrowe@apple.com

Message:

<​https://webkit.org/b/135085> Ensure that make_names.pl generates the same result when run multiple times.

Perl 5.18 introduced hash randomization. This results in the iteration order of hashes being different
from one run to the next. To ensure identical output we can iterate over the hash keys in sorted order.

Reviewed by Alexey Proskuryakov.

• bindings/scripts/StaticString.pm:

(GenerateStrings):
(GenerateStringAsserts):

• dom/make_names.pl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/StaticString.pm (modified) (2 diffs)
• dom/make_names.pl (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-19  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/135085> Ensure that make_names.pl generates the same result when run multiple times.
+
+        Perl 5.18 introduced hash randomization. This results in the iteration order of hashes being different
+        from one run to the next. To ensure identical output we can iterate over the hash keys in sorted order.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * bindings/scripts/StaticString.pm:
+        (GenerateStrings):
+        (GenerateStringAsserts):
+        * dom/make_names.pl:
+
 2014-07-19  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/bindings/scripts/StaticString.pm

@@ -34 +34 @@
     my @result = ();
 
-    while ( my ($name, $value) = each %strings ) {
-        push(@result, "static const LChar ${name}String8[] = \"${value}\";\n");
+    for my $name (sort keys %strings) {
+        push(@result, "static const LChar ${name}String8[] = \"$strings{$name}\";\n");
     }
 
     push(@result, "\n");
 
-    while ( my ($name, $value) = each %strings ) {
+    for my $name (sort keys %strings) {
+        my $value = $strings{$name};
         my $length = length($value);
         my $hash = Hasher::GenerateHashValue($value);
@@ -67 +68 @@
     push(@result, "#ifndef NDEBUG\n");
 
-    while ( my ($name, $value) = each %strings ) {
+    for my $name (sort keys %strings) {
         push(@result, "    reinterpret_cast<StringImpl*>(&${name}Data)->assertHashIsCorrect();\n");
     }

trunk/Source/WebCore/dom/make_names.pl

@@ -120 +120 @@
     print F StaticString::GenerateStrings(\%parameters);
 
-    while ( my ($name, $identifier) = each %parameters ) {
+    for my $name (sort keys %parameters) {
         print F "DEFINE_GLOBAL(AtomicString, $name)\n";
     }
@@ -129 +129 @@
     print F StaticString::GenerateStringAsserts(\%parameters);
 
-    while ( my ($name, $identifier) = each %parameters ) {
+    for my $name (sort keys %parameters) {
         # FIXME: Would like to use static_cast here, but there are differences in const
         # depending on whether SKIP_STATIC_CONSTRUCTORS_ON_GCC is used, so stick with a