Changeset 167010 in webkit

Timestamp:

Apr 9, 2014 2:48:26 AM (10 years ago)

Author:

Csaba Osztrogonác

Message:

Stylechecker: False positive on inline asm code.
​https://bugs.webkit.org/show_bug.cgi?id=130570

Patch by Gergo Balogh <​gbalogh.u-szeged@partner.samsung.com> on 2014-04-09
Reviewed by Csaba Osztrogonác.

Disable stylechecking in asm blocks.

• Scripts/webkitpy/style/checkers/cpp.py:

(process_line):
(_InlineASMState):
(_InlineASMState.init):
(_InlineASMState.process_line):
(_InlineASMState.isInside):
(_process_lines):

• Scripts/webkitpy/style/checkers/cpp_unittest.py:

(WebKitStyleTest.test_member_initialization_list):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp.py (modified) (5 diffs)
• Scripts/webkitpy/style/checkers/cpp_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-04-09  Gergo Balogh  <gbalogh.u-szeged@partner.samsung.com>
+
+        Stylechecker: False positive on inline asm code.
+        https://bugs.webkit.org/show_bug.cgi?id=130570
+
+        Reviewed by Csaba Osztrogonác.
+
+        Disable stylechecking in asm blocks.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (process_line):
+        (_InlineASMState):
+        (_InlineASMState.__init__):
+        (_InlineASMState.process_line):
+        (_InlineASMState.isInside):
+        (_process_lines):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (WebKitStyleTest.test_member_initialization_list):
+
 2014-04-09  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py

@@ -3621 +3621 @@
 def process_line(filename, file_extension,
                  clean_lines, line, include_state, function_state,
-                 class_state, file_state, enum_state, error):
+                 class_state, file_state, enum_state, asm_state, error):
     """Processes a single line in the file.
 
@@ -3638 +3638 @@
       enum_state: A _EnumState instance which maintains an enum declaration
                   state.
+      asm_state: The state of inline ASM code.
       error: A callable to which errors are reported, which takes arguments:
              line number, error level, and message
@@ -3648 +3649 @@
         return
     if match(r'\s*\b__asm\b', raw_lines[line]):  # Ignore asm lines as they format differently.
+        return
+    asm_state.process_line(raw_lines[line])
+    if asm_state.is_in_asm():  # Ignore further checks because asm blocks formatted differently.
         return
     check_function_definition(filename, file_extension, clean_lines, line, function_state, error)
@@ -3661 +3665 @@
 
 
+class _InlineASMState(object):
+    """Stores the state for the inline asm codes."""
+    def __init__(self):
+        self._is_in_asm = False
+
+    def process_line(self, line):
+        if match(r'\s*asm\s+(volatile)?\(', line):
+            self._is_in_asm = True
+        elif search(r'\);$', line) and self._is_in_asm:  # Can not do more without a proper parser (or lexer).
+            self._is_in_asm = False
+
+    def is_in_asm(self):
+        return self._is_in_asm
+
+
 def _process_lines(filename, file_extension, lines, error, min_confidence):
     """Performs lint checks and reports any errors to the given error function.
@@ -3687 +3706 @@
     file_state = _FileState(clean_lines, file_extension)
     enum_state = _EnumState()
+    asm_state = _InlineASMState()
     for line in xrange(clean_lines.num_lines()):
         process_line(filename, file_extension, clean_lines, line,
                      include_state, function_state, class_state, file_state,
-                     enum_state, error)
+                     enum_state, asm_state, error)
     class_state.check_finished(error)
 

trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py

@@ -5026 +5026 @@
          'Missing space after ,  [whitespace/comma] [3]'])
 
-        fine_example = (
+        self.assert_multi_line_lint((
             'MyClass::MyClass(Document* doc)\n'
             '    : MySuperClass()\n'
@@ -5034 +5034 @@
             '#endif\n'
             '    , m_myMember(0)\n'
-            '{ }')
-        self.assert_multi_line_lint(fine_example, '')
+            '{ }'), '')
+
+        self.assert_multi_line_lint((
+            'asm volatile('
+            '    "lock; cmpxchgl %3, %2"\n'
+            '    "sete %1"\n'
+            '    : "+a"(expected), "=q"(result), "+m"(*location)\n'
+            '    : "r"(newValue)\n'
+            '    : "memory"\n'
+            ');'), '')
 
         self.assert_multi_line_lint('''\