Backed out changeset 51302571bf80 (bug 1730960) for causing build bustage in modules/libpref/init/StaticPrefList.yaml CLOSED TREE

js/src/jit/MIROps.yaml

@@ -98,7 +98,7 @@
 # movable
 # =======
 # Defines the movable MIR flag for movable instructions. This is used for knowing
-# whether we can hoist an instruction.
+# if we can hoist an instruction.
 #   - attribute not specified (default): no code generated
 #   - true: adds setMovable call in opcode constructor
 #
@@ -455,7 +455,7 @@
   alias_set: custom
 
 # Load |arguments[index]| from a mapped or unmapped arguments object. Bails out
-# when any elements were overridden or deleted. Also bails out if the index is
+# if any elements were overridden or deleted. Also bails out if the index is
 # out of bounds.
 - name: LoadArgumentsObjectArg
   operands:
@@ -467,7 +467,7 @@
   alias_set: custom
 
 # Load |arguments[index]| from a mapped or unmapped arguments object. Bails out
-# when any elements were overridden or deleted. Returns undefined if the index is
+# if any elements were overridden or deleted. Returns undefined if the index is
 # out of bounds.
 - name: LoadArgumentsObjectArgHole
   operands:

modules/libpref/init/StaticPrefList.yaml

@@ -2279,7 +2279,7 @@
   mirror: always
 
 # Whether window.location.reload() and window.history.go(0) should be blocked
-# when called directly from a window resize event handler.
+# if called directly from a window resize event handler.
 #
 # This used to be necessary long ago to prevent terrible UX when using stuff
 # like TypeAheadFind (bug 258917), but it also causes compat issues on mobile
@@ -5122,7 +5122,7 @@
 # `useRemoteSubframes` flag set.
 # Callers which cannot use `useRemoteSubframes` must use
 # `Services.appinfo.fissionAutostart` or `mozilla::FissionAutostart()` to check
-# whether fission is enabled by default.
+# if fission is enabled by default.
 - name: fission.autostart
   type: bool
   value: @IS_NOT_ANDROID@
@@ -7243,8 +7243,8 @@
 
   # Whether Gecko returns available composition string rect or TS_E_NOLAYOUT
   # from ITextStoreACP::GetTextExt() when the specified range is same as the
-  # range of composition string but some character rects in it are still
-  # dirty if and only if ATOK is active TIP.
+  # range of composition string but some character rects in it are still dirty
+  # if and only if ATOK is active TIP.
   # Note that this is ignored if active ATOK is or older than 2016 and
   # create_native_caret is true.
 -   name: intl.tsf.hack.atok.do_not_return_no_layout_error_of_composition_string
@@ -7273,8 +7273,8 @@
 
   # Whether Gecko returns available composition string rect or TS_E_NOLAYOUT
   # from ITextStoreACP::GetTextExt() when the specified range is same as the
-  # range of composition string but some character rects in it are still
-  # dirty if and only if Japanist 10 is active TIP.
+  # range of composition string but some character rects in it are still dirty
+  # if and only if Japanist 10 is active TIP.
 -   name: intl.tsf.hack.japanist10.do_not_return_no_layout_error_of_composition_string
     type: bool
     value: true
@@ -12881,8 +12881,8 @@
 #    (both in the output, and the images we select via srcset, for example).
 #
 # Therefore, using a high DPI is preferable. For now, we use 144dpi to match
-# physical printer output on Windows, but higher (e.g. 300dpi) might be better,
-# but only if it does not lead to issues such as excessive memory use.
+# physical printer output on Windows, but higher (e.g. 300dpi) might be better
+# if it does not lead to issues such as excessive memory use.
 - name: print.default_dpi
   type: float
   value: 144.0f
@@ -13874,9 +13874,9 @@
   mirror: once
 
 # On Windows 8.1, if the following preference is 2, we will attempt to detect
-# whether the Family Safety TLS interception feature has been enabled.
-# If so, we will behave as if the enterprise roots feature has been enabled
-# (i.e. import and trust third party root certificates from the OS).
+# if the Family Safety TLS interception feature has been enabled. If so, we
+# will behave as if the enterprise roots feature has been enabled (i.e. import
+# and trust third party root certificates from the OS).
 # With any other value of the pref or on any other platform, this does nothing.
 # This preference takes precedence over "security.enterprise_roots.enabled".
 - name: security.family_safety.mode

python/mozbuild/mozbuild/preprocessor.py

@@ -384,14 +384,10 @@ class Preprocessor:
         """
         self.marker = aMarker
         if aMarker:
-            instruction_prefix = "\s*{0}"
-            instruction_cmd = "(?P<cmd>[a-z]+)(?:\s+(?P<args>.*?))?\s*$"
-            instruction_fmt = instruction_prefix + instruction_cmd
-            ambiguous_fmt = instruction_prefix + "\s+" + instruction_cmd
-
-            self.instruction = re.compile(instruction_fmt.format(aMarker))
+            self.instruction = re.compile(
+                "\s*{0}(?P<cmd>[a-z]+)(?:\s+(?P<args>.*?))?\s*$".format(aMarker)
+            )
             self.comment = re.compile(aMarker, re.U)
-            self.ambiguous_comment = re.compile(ambiguous_fmt.format(aMarker))
         else:
 
             class NoMatch(object):
@@ -659,16 +655,8 @@ class Preprocessor:
                 cmd(args)
             if cmd != "literal":
                 self.actionLevel = 2
-        elif self.disableLevel == 0:
-            if self.comment.match(aLine):
-                # make sure the comment is not ambiguous with a command
-                m = self.ambiguous_comment.match(aLine)
-                if m:
-                    cmd = m.group("cmd")
-                    if cmd in self.cmds:
-                        raise Preprocessor.Error(self, "AMBIGUOUS_COMMENT", aLine)
-            else:
-                self.write(aLine)
+        elif self.disableLevel == 0 and not self.comment.match(aLine):
+            self.write(aLine)
 
     # Instruction handlers
     # These are named do_'instruction name' and take one argument

python/mozbuild/mozbuild/test/test_preprocessor.py

@@ -345,14 +345,6 @@ class TestPreprocessor(unittest.TestCase):
                 self.pp.do_include("f")
                 self.assertEqual(e.args[0][-1], "spit this message out")
 
-    def test_ambigous_command(self):
-        comment = "# if I tell you a joke\n"
-        with MockedOpen({"f": comment}):
-            with self.assertRaises(Preprocessor.Error) as e:
-                self.pp.do_include("f")
-            the_exception = e.exception
-            self.assertEqual(the_exception.args[0][-1], comment)
-
     def test_javascript_line(self):
         # The preprocessor is reading the filename from somewhere not caught
         # by MockedOpen.