handle -Wl,--start-group ... -Wl,--end-group properly etc

Author: ianamason

.pylintrc

@@ -357,7 +357,7 @@ max-returns=6
 max-branches=20
 
 # Maximum number of statements in function / method body
-max-statements=50
+max-statements=60
 
 # Maximum number of parents for a class (see R0901).
 max-parents=7

Makefile

@@ -22,7 +22,7 @@ all:
 
 #local editable install for developing
 develop:
-	pip install -e .
+	pip3 install -e .
 
 
 dist: clean
@@ -40,7 +40,7 @@ publish: dist
 
 
 install:
-	pip install
+	pip3 install
 
 check_clang:
 	cd test; python3 -m unittest -v test_base_driver test_clang_driver

setup.py

@@ -37,6 +37,7 @@
             'wfortran = wllvm.wfortran:main',
             'wllvm-sanity-checker = wllvm.sanity:main',
             'extract-bc = wllvm.extractor:main',
+            'wparse-args = wllvm.wparser:main',
         ],
     },
 

wllvm/arglistfilter.py

@@ -47,8 +47,8 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             '-v' : (0, ArgumentListFilter.compileOnlyCallback),
 
             #warnings (apart from the regex below)
-            '-w' : (0, ArgumentListFilter.compileUnaryCallback),
-            '-W' : (0, ArgumentListFilter.compileUnaryCallback),
+            '-w' : (0, ArgumentListFilter.compileOnlyCallback),
+            '-W' : (0, ArgumentListFilter.compileOnlyCallback),
 
 
             #iam: if this happens, then we need to stop and think.
@@ -330,6 +330,18 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
                 (arity, handler) = argExactMatches[currentItem]
                 flagArgs = self._shiftArgs(arity)
                 handler(self, currentItem, *flagArgs)
+            elif currentItem == '-Wl,--start-group':
+                linkingGroup = [currentItem]
+                terminated = False
+                while self._inputArgs:
+                    groupCurrent = self._inputArgs.popleft()
+                    linkingGroup.append(groupCurrent)
+                    if groupCurrent == "-Wl,--end-group":
+                        terminated = True
+                        break
+                if not terminated:
+                    _logger.warning('Did not find a closing "-Wl,--end-group" to match "-Wl,--start-group"')
+                self.linkingGroupCallback(linkingGroup)
             else:
                 matched = False
                 for pattern, (arity, handler) in argPatterns.items():
@@ -456,6 +468,10 @@ def linkBinaryCallback(self, flag, arg):
         self.linkArgs.append(flag)
         self.linkArgs.append(arg)
 
+    def linkingGroupCallback(self, args):
+        _logger.debug('linkingGroupCallback: %s', args)
+        self.linkArgs.extend(args)
+
     #flags common to both linking and compiling (coverage for example)
     def compileLinkUnaryCallback(self, flag):
         _logger.debug('compileLinkUnaryCallback: %s', flag)

wllvm/version.py

@@ -79,7 +79,13 @@
 1.2.7    - 3/23/2020 Added the LLVM_BITCODE_GENERATION_FLAGS  to allow LTO support.
 
 1.2.8    - 3/23/2020 Added the LLVM_BITCODE_GENERATION_FLAGS  to allow LTO support. (pip uploading issues)
+
+1.2.9    - 2/20/2021 Various fixes:
+                        wllvm-sanity-checker prints correctly now we are python3
+                        Eliminated "....".format(...) in favor of f'...{thingy}....' How many times did python try to get this right?
+                        e.g. handle -Wl,--start-group ... -Wl,--end-group properly.
+                        e.g. -W and -w don't trip the compile only flag.
 """
 
-wllvm_version = '1.2.8'
-wllvm_date = 'March 23 2020'
+wllvm_version = '1.2.9'
+wllvm_date = 'February 20 2020'

wllvm/wparser.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+"""This is a wrapper around the real compiler.
+
+It first invokes a real compiler to generate
+an object file.  Then it invokes a bitcode
+compiler to generate a parallel bitcode file.
+It records the location of the bitcode in an
+ELF section of the object file so that it can be
+found later after all of the objects are
+linked into a library or executable.
+"""
+
+import sys
+
+from .arglistfilter import ArgumentListFilter
+
+def main():
+    cmd = list(sys.argv)
+    cmd = cmd[1:]
+    args = ArgumentListFilter(cmd)
+    args.dump()
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())