Changeset 290883 in webkit

Timestamp:

Mar 7, 2022, 4:43:32 AM (5 years ago)

Author:

berto@igalia.com

Message:

makeprop.pl breaks reproducible builds
​https://bugs.webkit.org/show_bug.cgi?id=237521

Reviewed by Carlos Garcia Campos.

• css/makeprop.pl: Sort hash elements so the output file is always

the same across different builds.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/makeprop.pl (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-07  Alberto Garcia  <berto@igalia.com>
+
+        makeprop.pl breaks reproducible builds
+        https://bugs.webkit.org/show_bug.cgi?id=237521
+
+        Reviewed by Carlos Garcia Campos.
+
+        * css/makeprop.pl: Sort hash elements so the output file is always
+        the same across different builds.
+
 2022-03-07  Nikolas Zimmermann  <nzimmermann@igalia.com>
 

trunk/Source/WebCore/css/makeprop.pl

@@ -56 +56 @@
 my $jsonHashRef = $jsonDecoder->decode($input);
 my $propertiesHashRef = $jsonHashRef->{properties};
-my @allNames = keys(%$propertiesHashRef);
+my @allNames = sort keys(%$propertiesHashRef);
 die "We've reached more than 1024 CSS properties, please make sure to update CSSProperty/StylePropertyMetadata accordingly" if @allNames > 1024;
 
@@ -473 +473 @@
     switch (id) {
 EOF
-  foreach my $name (keys %runtimeFlags) {
+  foreach my $name (sort keys %runtimeFlags) {
     print GPERF "    case CSSPropertyID::CSSProperty" . $nameToId{$name} . ":\n";
     print GPERF "        return RuntimeEnabledFeatures::sharedFeatures()." . $runtimeFlags{$name} . "Enabled();\n";
@@ -501 +501 @@
 EOF
 
-foreach my $name (keys %settingsFlags) {
+foreach my $name (sort keys %settingsFlags) {
   print GPERF "    case CSSPropertyID::CSSProperty" . $nameToId{$name} . ":\n";
   print GPERF "        return settings->" . $settingsFlags{$name} . "();\n";
@@ -648 +648 @@
     switch (id) {
 EOF
-for my $logicalPropertyGroup (values %logicalPropertyGroups) {
-    for my $name (values %{ $logicalPropertyGroup->{"logical"} }) {
+for my $logicalPropertyGroup (sort values %logicalPropertyGroups) {
+    for my $name (sort values %{ $logicalPropertyGroup->{"logical"} }) {
         print GPERF "    case CSSPropertyID::CSSProperty" . $nameToId{$name} . ":\n";
     }
@@ -666 +666 @@
 EOF
 
-for my $logicalPropertyGroup (values %logicalPropertyGroups) {
+for my $logicalPropertyGroup (sort values %logicalPropertyGroups) {
     for my $kind ("logical", "physical") {
-        for my $name (values %{ $logicalPropertyGroup->{$kind} }) {
+        for my $name (sort values %{ $logicalPropertyGroup->{$kind} }) {
             print GPERF "    case CSSPropertyID::CSSProperty" . $nameToId{$name} . ":\n";
         }
@@ -686 +686 @@
 EOF
 
-for my $logicalPropertyGroup (values %logicalPropertyGroups) {
+for my $logicalPropertyGroup (sort values %logicalPropertyGroups) {
     my $logical = $logicalPropertyGroup->{"logical"};
     my $physical = $logicalPropertyGroup->{"physical"};
     for my $first ($logical, $physical) {
         my $second = $first eq $logical ? $physical : $logical;
-        while (my ($resolver, $name) = each %{ $first }) {
+        for my $resolver (sort keys %{ $first }) {
+            my $name = $first->{$resolver};
             print GPERF "    case CSSPropertyID::CSSProperty" . $nameToId{$name} . ":\n";
         }
         print GPERF "        switch (id2) {\n";
-        while (my ($resolver, $name) = each %{ $second }) {
+        for my $resolver (sort keys %{ $second }) {
+            my $name = $second->{$resolver};
             print GPERF "        case CSSPropertyID::CSSProperty" . $nameToId{$name} . ":\n";
         }
@@ -719 +721 @@
 EOF
 
-for my $logicalPropertyGroup (values %logicalPropertyGroups) {
-    while (my ($resolver, $name) = each %{ $logicalPropertyGroup->{"logical"} }) {
+for my $logicalPropertyGroup (sort values %logicalPropertyGroups) {
+    for my $resolver (sort keys %{ $logicalPropertyGroup->{"logical"} }) {
+        my $name = $logicalPropertyGroup->{"logical"}->{$resolver};
         my $kind = $logicalPropertyGroup->{"kind"};
         my $kindId = nameToId($kind);