[llvm] r313590 - Fix inverted regex search.

Zachary Turner via llvm-commits llvm-commits at lists.llvm.org
Mon Sep 18 16:14:15 PDT 2017


Author: zturner
Date: Mon Sep 18 16:14:15 2017
New Revision: 313590

URL: http://llvm.org/viewvc/llvm-project?rev=313590&view=rev
Log:
Fix inverted regex search.

I was using the pattern as the source string and vice versa
causing strange regular expression errors.

Modified:
    llvm/trunk/utils/lit/lit/llvm/config.py

Modified: llvm/trunk/utils/lit/lit/llvm/config.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/llvm/config.py?rev=313590&r1=313589&r2=313590&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/llvm/config.py (original)
+++ llvm/trunk/utils/lit/lit/llvm/config.py Mon Sep 18 16:14:15 2017
@@ -148,14 +148,14 @@ class LLVMConfig(object):
         output, _ = llvm_config_cmd.communicate()
         output = output.decode(encoding)
         lines = output.split('\n')
-        for (line, (_, patterns)) in zip(lines, features):
+        for (feature_line, (_, patterns)) in zip(lines, features):
             # We should have either a callable or a dictionary.  If it's a
             # dictionary, grep each key against the output and use the value if
             # it matches.  If it's a callable, it does the entire translation.
             if callable(patterns):
-                features_to_add = patterns(line)
+                features_to_add = patterns(feature_line)
                 self.config.available_features.update(features_to_add)
             else:
-                for (match, feature) in patterns.items():
-                    if re.search(line, match):
+                for (re_pattern, feature) in patterns.items():
+                    if re.search(re_pattern, feature_line):
                         self.config.available_features.add(feature)




More information about the llvm-commits mailing list