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

Author: ianamason

wllvm/arglistfilter.py

@@ -399,25 +399,24 @@ def getOutputFilename(self):
             return '{0}.o'.format(root)
         return 'a.out'
 
+    def getBitcodeFileName(self):
+        (dirs, baseFile) = os.path.split(self.getOutputFilename())
+        bcfilename = os.path.join(dirs, '.{0}.bc'.format(baseFile))
+        return bcfilename
+        
     # iam: returns a pair [objectFilename, bitcodeFilename] i.e .o and .bc.
     # the hidden flag determines whether the objectFile is hidden like the
     # 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):
-        if self.outputFilename is not None:
-            objFile = self.outputFilename
-            (dirs, baseFile) = os.path.split(objFile)
-            bcFile = os.path.join(dirs, '.{0}.bc'.format(baseFile))
-            return [objFile, bcFile]
+        (_, srcbase) = os.path.split(srcFile)
+        (srcroot, _) = os.path.splitext(srcbase)
+        if hidden:
+            objbase = '.{0}.o'.format(srcroot)
         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]
+            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

@@ -246,6 +246,9 @@ def buildAndAttachBitcode(builder):
         # maybe python-magic is in our future ...
         srcFile = af.inputFiles[0]
         (objFile, bcFile) = af.getArtifactNames(srcFile, hidden)
+        if af.outputFilename is not None:
+            objFile = af.outputFilename
+            bcFile = af.getBitcodeFileName()
         buildBitcodeFile(builder, srcFile, bcFile)
         attachBitcodePathToObject(bcFile, objFile)
 

wllvm/version.py

@@ -50,7 +50,9 @@
 
 1.1.0    - 4/21/2017  no new features on the horizon, no new bugs?
 
+1.1.1    - 4/25/2017 bugs introduced by the new fetures have hopefully been eradicated.
+
 
 """
 
-wllvm_version = '1.1.0'
+wllvm_version = '1.1.1'