danog/gllvm
1
0
Fork 0
mirror of https://github.com/danog/gllvm.git synced 2024-11-30 06:29:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

extractor: Add a "strict extraction" mode

Browse Source 
The more permissive current behavior remains the default.
This commit is contained in:
William Woodruff 2020-08-04 12:59:52 -04:00
parent 3389f1fde6
commit c14c8e6d73
No known key found for this signature in database
GPG Key ID: 70F70A3979DDCED3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shared/extractor.go
View File

@ -58,6 +58,7 @@ type ExtractionArgs struct {
SortBitcodeFiles bool // sort the arguments to linking and archiving (debugging too) SortBitcodeFiles bool // sort the arguments to linking and archiving (debugging too)
BuildBitcodeModule bool // buld an archive rather than a module BuildBitcodeModule bool // buld an archive rather than a module
KeepTemp bool // keep temporary linking folder KeepTemp bool // keep temporary linking folder
StrictExtract bool // turn extraction failures into errors
LinkArgSize int // maximum size of a llvm-link command line LinkArgSize int // maximum size of a llvm-link command line
InputType int InputType int
ObjectTypeInArchive int // Type of file that can be put into an archive ObjectTypeInArchive int // Type of file that can be put into an archive
@ -85,10 +86,11 @@ ea.OutputFile: %v
ea.LlvmArchiverName: %v ea.LlvmArchiverName: %v
ea.LlvmLinkerName: %v ea.LlvmLinkerName: %v
ea.ArchiverName: %v ea.ArchiverName: %v
ea.StrictExtract: %v
` `
return fmt.Sprintf(format, ea.Verbose, ea.WriteManifest, ea.SortBitcodeFiles, ea.BuildBitcodeModule, return fmt.Sprintf(format, ea.Verbose, ea.WriteManifest, ea.SortBitcodeFiles, ea.BuildBitcodeModule,
ea.KeepTemp, ea.LinkArgSize, ea.InputFile, ea.OutputFile, ea.LlvmArchiverName, ea.KeepTemp, ea.LinkArgSize, ea.InputFile, ea.OutputFile, ea.LlvmArchiverName,
ea.LlvmLinkerName, ea.ArchiverName) ea.LlvmLinkerName, ea.ArchiverName, ea.StrictExtract)
} }
//ParseSwitches parses the command line into an ExtractionArgs object. //ParseSwitches parses the command line into an ExtractionArgs object.
@ -106,6 +108,7 @@ func ParseSwitches(args []string) (ea ExtractionArgs) {
flagSet.StringVar(&ea.LlvmLinkerName, "l", "llvm-link", "the llvm linker (i.e. llvm-link)") flagSet.StringVar(&ea.LlvmLinkerName, "l", "llvm-link", "the llvm linker (i.e. llvm-link)")
flagSet.IntVar(&ea.LinkArgSize, "n", 0, "maximum llvm-link command line size (in bytes)") flagSet.IntVar(&ea.LinkArgSize, "n", 0, "maximum llvm-link command line size (in bytes)")
flagSet.BoolVar(&ea.KeepTemp, "t", false, "keep temporary linking folder") flagSet.BoolVar(&ea.KeepTemp, "t", false, "keep temporary linking folder")
flagSet.BoolVar(&ea.StrictExtract, "S", false, "exit with an error if extraction fails")
err := flagSet.Parse(args[1:]) err := flagSet.Parse(args[1:])
@ -259,7 +262,7 @@ func handleExecutable(ea ExtractionArgs) (success bool) {
// get the list of bitcode paths // get the list of bitcode paths
var artifactPaths []string var artifactPaths []string
artifactPaths, success = ea.Extractor(ea.InputFile) artifactPaths, success = ea.Extractor(ea.InputFile)
if !success { if !success && ea.StrictExtract {
return return
} }
@ -310,7 +313,7 @@ func handleThinArchive(ea ExtractionArgs) (success bool) {
if len(obj) > 0 { if len(obj) > 0 {
var artifacts []string var artifacts []string
artifacts, success = ea.Extractor(obj) artifacts, success = ea.Extractor(obj)
if !success { if !success && ea.StrictExtract {
return return
} }
LogInfo("\t%v\n", artifacts) LogInfo("\t%v\n", artifacts)
@ -466,7 +469,7 @@ func handleArchive(ea ExtractionArgs) (success bool) {
if obj != "" && extractFile(ea, inputFile, obj, i) { if obj != "" && extractFile(ea, inputFile, obj, i) {
var artifacts []string var artifacts []string
artifacts, success = ea.Extractor(obj) artifacts, success = ea.Extractor(obj)
if !success { if !success && ea.StrictExtract {
return return
} }
LogInfo("\t%v\n", artifacts) LogInfo("\t%v\n", artifacts)