Skip to content

Fix map mutation during iteration in renameExportable #668

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

Open
a-hilaly wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix map mutation during iteration in renameExportable #668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 22 additions & 3 deletions pkg/api/passes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package api
import (
"fmt"
"regexp"
"sort"
"strings"
"unicode"
)
Expand Down Expand Up @@ -302,7 +303,13 @@ loop:
// renameExportable renames all operation names to be exportable names.
// All nested Shape names are also updated to the exportable variant.
func (a *API) renameExportable() {
for name, op := range a.Operations {
opNames := make([]string, 0, len(a.Operations))
for name := range a.Operations {
opNames = append(opNames, name)
}
sort.Strings(opNames)
for _, name := range opNames {
op := a.Operations[name]
newName := a.ExportableName(name)
if newName != name {
delete(a.Operations, name)
Expand All @@ -311,7 +318,13 @@ func (a *API) renameExportable() {
op.ExportedName = newName
}

for k, s := range a.Shapes {
shapeKeys := make([]string, 0, len(a.Shapes))
for k := range a.Shapes {
shapeKeys = append(shapeKeys, k)
}
sort.Strings(shapeKeys)
for _, k := range shapeKeys {
s := a.Shapes[k]
// FIXME SNS has lower and uppercased shape names with the same name,
// except the lowercased variant is used exclusively for string and
// other primitive types. Renaming both would cause a collision.
Expand All @@ -320,7 +333,13 @@ func (a *API) renameExportable() {
continue
}

for mName, member := range s.MemberRefs {
memberNames := make([]string, 0, len(s.MemberRefs))
for mName := range s.MemberRefs {
memberNames = append(memberNames, mName)
}
sort.Strings(memberNames)
for _, mName := range memberNames {
member := s.MemberRefs[mName]
newName := a.ExportableName(mName)
if newName != mName {
delete(s.MemberRefs, mName)
Expand Down