Skip to content

Update llbuild to master #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2020
Merged

Update llbuild to master #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
575c557
Update llbuild to master
aciidgh May 8, 2020
9801c43
Don't call LLBuild's taskInComplete from a thread.
DougGregor May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 8 additions & 18 deletions Sources/SwiftDriver/Execution/JobExecutor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ struct JobExecutorBuildDelegate: LLBuildEngineDelegate {
case ExecuteAllJobsRule.ruleName:
return ExecuteAllJobsRule(key)
case ExecuteJobRule.ruleName:
return ExecuteJobRule(key)
return ExecuteJobRule(key, context: context)
default:
fatalError("Unknown rule \(rule)")
}
Expand Down Expand Up @@ -336,18 +336,18 @@ class ExecuteJobRule: LLBuildRule {
override class var ruleName: String { "\(ExecuteJobRule.self)" }

private let key: RuleKey
private let context: JobExecutor.Context

/// True if any of the inputs had any error.
private var allInputsSucceeded: Bool = true

init(_ key: Key) {
init(_ key: Key, context: JobExecutor.Context) {
self.key = RuleKey(key)
self.context = context
super.init()
}

override func start(_ engine: LLTaskBuildEngine) {
let context = engine.jobExecutorContext

for (idx, input) in key.job.inputs.enumerated() {
if let producingJob = context.producerMap[input.file] {
let key = ExecuteJobRule.RuleKey(job: producingJob)
Expand Down Expand Up @@ -375,14 +375,11 @@ class ExecuteJobRule: LLBuildRule {
return engine.taskIsComplete(DriverBuildValue.jobExecution(success: false))
}

let context = engine.jobExecutorContext
context.jobQueue.addOperation {
self.executeJob(engine)
}
engine.taskIsComplete(self.executeJob(engine))
}

private func executeJob(_ engine: LLTaskBuildEngine) {
let context = engine.jobExecutorContext
private func executeJob(_ engine: LLTaskBuildEngine) -> DriverBuildValue {
let context = self.context
let resolver = context.argsResolver
let job = key.job
let env = context.env.merging(job.extraEnvironment, uniquingKeysWith: { $1 })
Expand Down Expand Up @@ -433,15 +430,8 @@ class ExecuteJobRule: LLBuildRule {
value = .jobExecution(success: false)
}

engine.taskIsComplete(value)
return value
}
}

extension Job: LLBuildValue { }

extension LLTaskBuildEngine {
/// Returns the job executor context.
var jobExecutorContext: JobExecutor.Context {
return (delegate as! JobExecutorBuildDelegate).context
}
}
4 changes: 0 additions & 4 deletions Sources/SwiftDriver/Execution/llbuild.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ public class LLTaskBuildEngine {
self.engine = engine
}

var delegate: LLBuildEngineDelegate {
return (engine.engine.delegate as! LLBuildEngine.Delegate).delegate
}

public func taskNeedsInput<T: LLBuildKey>(_ key: T, inputID: Int) {
let encodedKey = RuleKey(
rule: T.BuildRule.ruleName, data: key.toKey().data).toKey()
Expand Down