Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b90833e authored by Colin Cross's avatar Colin Cross
Browse files

Optimize sanitizerRuntimeDepsMutator 

sanitizerRuntimeDepsMutator only modifies the currently visited
module, it can visit modules in parallel.

Also, stop recursing into modules that are not static dependencies,
and stop recursing if the module already has all modifications that
the mutator could make.

Test: m checkbuild
Change-Id: I95a57f763a91940f1854ba3c587a2f70e8baba97
parent 643614de

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ func init() { 
		ctx.TopDown("tsan_deps", sanitizerDepsMutator(tsan))

		ctx.BottomUp("tsan", sanitizerMutator(tsan)).Parallel()



		ctx.TopDown("sanitize_runtime_deps", sanitizerRuntimeDepsMutator)

		ctx.TopDown("sanitize_runtime_deps", sanitizerRuntimeDepsMutator).Parallel()

		ctx.BottomUp("sanitize_runtime", sanitizerRuntimeMutator).Parallel()



		ctx.BottomUp("coverage", coverageMutator).Parallel()

cc/sanitize.go

+11 −2
Original line number Diff line number Diff line
@@ -701,8 +701,8 @@ func sanitizerRuntimeDepsMutator(mctx android.TopDownMutatorContext) { 
			if !isSanitizableDependencyTag(mctx.OtherModuleDependencyTag(child)) {

				return false

			}

			if d, ok := child.(*Module); ok && d.static() && d.sanitize != nil {



			if d, ok := child.(*Module); ok && d.static() && d.sanitize != nil {

				if enableMinimalRuntime(d.sanitize) {

					// If a static dependency is built with the minimal runtime,

					// make sure we include the ubsan minimal runtime.
@@ -713,8 +713,17 @@ func sanitizerRuntimeDepsMutator(mctx android.TopDownMutatorContext) { 
					// make sure we include the ubsan runtime.

					c.sanitize.Properties.UbsanRuntimeDep = true

				}



				if c.sanitize.Properties.MinimalRuntimeDep &&

					c.sanitize.Properties.UbsanRuntimeDep {

					// both flags that this mutator might set are true, so don't bother recursing

					return false

				}



				return true

			} else {

				return false

			}

		})

	}

}