From 533959eb27291d15ac6792839dd665fb1e333677 Mon Sep 17 00:00:00 2001
From: Priyanka Advani <padvani@google.com>
Date: Thu, 23 May 2024 23:55:27 +0000
Subject: [PATCH] Revert "Parallelize VerifyProvidersWereUnchanged"

This reverts commit 2071d15a29ba5cf2038029b9c312467331a14ee4.

Reason for revert: Droidmonitor triggered revert due to b/342483801.

Change-Id: Ib892a3b17a5fcefb40d316e9dce9d5432293ec25
---
 context.go | 52 +++++++++++++++-------------------------------------
 1 file changed, 15 insertions(+), 37 deletions(-)

diff --git a/context.go b/context.go
index 7241b8e..16841ae 100644
--- a/context.go
+++ b/context.go
@@ -4144,46 +4144,24 @@ func (c *Context) VerifyProvidersWereUnchanged() []error {
 	if !c.buildActionsReady {
 		return []error{ErrBuildActionsNotReady}
 	}
-	errorCh := make(chan []error)
-	doneCh := make(chan []error)
-	go func() {
-		doneCh <- parallelVisit(c.modulesSorted, unorderedVisitorImpl{}, parallelVisitLimit,
-			func(m *moduleInfo, pause chan<- pauseSpec) bool {
-				var errors []error
-				for i, provider := range m.providers {
-					if provider != nil {
-						hash, err := proptools.HashProvider(provider)
-						if err != nil {
-							errors = append(errors, fmt.Errorf("provider %q on module %q was modified after being set, and no longer hashable afterwards: %s", providerRegistry[i].typ, m.Name(), err.Error()))
-							continue
-						}
-						if m.providerInitialValueHashes[i] != hash {
-							errors = append(errors, fmt.Errorf("provider %q on module %q was modified after being set", providerRegistry[i].typ, m.Name()))
-						}
-					} else if m.providerInitialValueHashes[i] != 0 {
-						// This should be unreachable, because in setProvider we check if the provider has already been set.
-						errors = append(errors, fmt.Errorf("provider %q on module %q was unset somehow, this is an internal error", providerRegistry[i].typ, m.Name()))
-					}
-				}
-				if errors != nil {
-					errorCh <- errors
-				}
-				return false
-			})
-	}()
-
 	var errors []error
-	done := false
-	for !done {
-		select {
-		case newErrors := <-doneCh:
-			errors = append(errors, newErrors...)
-			done = true
-		case newErrors := <-errorCh:
-			errors = append(errors, newErrors...)
+	for _, m := range c.modulesSorted {
+		for i, provider := range m.providers {
+			if provider != nil {
+				hash, err := proptools.HashProvider(provider)
+				if err != nil {
+					errors = append(errors, fmt.Errorf("provider %q on module %q was modified after being set, and no longer hashable afterwards: %s", providerRegistry[i].typ, m.Name(), err.Error()))
+					continue
+				}
+				if provider != nil && m.providerInitialValueHashes[i] != hash {
+					errors = append(errors, fmt.Errorf("provider %q on module %q was modified after being set", providerRegistry[i].typ, m.Name()))
+				}
+			} else if m.providerInitialValueHashes[i] != 0 {
+				// This should be unreachable, because in setProvider we check if the provider has already been set.
+				errors = append(errors, fmt.Errorf("provider %q on module %q was unset somehow, this is an internal error", providerRegistry[i].typ, m.Name()))
+			}
 		}
 	}
-
 	return errors
 }