Merge branch 'master' of https://github.com/SRI-CSL/whole-program-llvm

Author: ianamason

wllvm/arglistfilter.py

@@ -404,17 +404,20 @@ def getOutputFilename(self):
     # bitcodeFile is (starts with a '.'), use the logging level & DUMPING flag to get a sense
     # of what is being written out.
     def getArtifactNames(self, srcFile, hidden=False):
-        (_, srcbase) = os.path.split(srcFile)
-        (srcroot, _) = os.path.splitext(srcbase)
-        if hidden:
-            objbase = '.{0}.o'.format(srcroot)
-        else:
-            objbase = '{0}.o'.format(srcroot)
-        bcbase = '.{0}.o.bc'.format(srcroot)
-        path = ''
         if self.outputFilename is not None:
-            path = os.path.dirname(self.outputFilename)
-        return [os.path.join(path, objbase), os.path.join(path, bcbase)]
+            objFile = self.outputFilename
+            (dirs, baseFile) = os.path.split(objFile)
+            bcFile = os.path.join(dirs, '.{0}.bc'.format(baseFile))
+            return [objFile, bcFile]
+        else:
+            (_, srcbase) = os.path.split(srcFile)
+            (srcroot, _) = os.path.splitext(srcbase)
+            if hidden:
+                objbase = '.{0}.o'.format(srcroot)
+            else:
+                objbase = '{0}.o'.format(srcroot)
+            bcbase = '.{0}.o.bc'.format(srcroot)
+            return [objbase, bcbase]
 
     #iam: for printing our partitioning of the args
     def dump(self):

wllvm/compilers.py

@@ -106,6 +106,13 @@ def attachBitcodePathToObject(bcPath, outFileName):
         objcopyCmd = ['objcopy', '--add-section', '{0}={1}'.format(elfSectionName, f.name), outFileName]
     orc = 0
 
+    # loicg: If the environment variable WLLVM_BC_STORE is set, copy the bitcode
+    # file to that location, using a hash of the original bitcode path as a name
+    storeEnv = os.getenv('WLLVM_BC_STORE')
+    if storeEnv:
+        hashName = hashlib.sha256(absBcPath).hexdigest()
+        copyfile(absBcPath, os.path.join(storeEnv, hashName))
+
     try:
         if os.path.getsize(outFileName) > 0:
             objProc = Popen(objcopyCmd)
@@ -122,13 +129,6 @@ def attachBitcodePathToObject(bcPath, outFileName):
         _logger.error('objcopy failed with %s', orc)
         sys.exit(-1)
 
-    # loicg: If the environment variable WLLVM_BC_STORE is set, copy the bitcode
-    # file to that location, using a hash of the original bitcode path as a name
-    storeEnv = os.getenv('WLLVM_BC_STORE')
-    if storeEnv:
-        hashName = hashlib.sha256(absBcPath).hexdigest()
-        copyfile(absBcPath, os.path.join(storeEnv, hashName))
-
 class BuilderBase(object):
     def __init__(self, cmd, isCxx, prefixPath=None):
         self.cmd = cmd

wllvm/extraction.py

@@ -163,7 +163,7 @@ def getStorePath(bcPath):
 def getBitcodePath(bcPath):
     """Tries to resolve the whereabouts of the bitcode.
 
-    First, ihecks if the given path points to an existing bitcode file.
+    First, checks if the given path points to an existing bitcode file.
     If it does not, it tries to look for the bitcode file in the store directory given
     by the environment variable WLLVM_BC_STORE.
     """
@@ -298,6 +298,7 @@ def handleArchive(pArgs):
 
                     for bcFile in contents:
                         if bcFile != '':
+                            bcFile = getBitcodePath(bcFile)
                             if not os.path.exists(bcFile):
                                 _logger.warning('%s lists bitcode library "%s" but it could not be found', f, bcFile)
                             else: