Skip to content

fix dead code appearing after panic #34

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
cce merged 2 commits into from
Oct 20, 2025
Merged

fix dead code appearing after panic #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11ed964
don't print unused code after calling panic() from MaxSize functions
cce Oct 17, 2025
aacd6d8
fix return after panic
cce Oct 17, 2025
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
67 changes: 51 additions & 16 deletions gen/maxsize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ type maxSizeGen struct {
state maxSizeState
ctx *Context
topics *Topics
halted bool
}

func (s *maxSizeGen) Method() Method { return MaxSize }
Expand All @@ -53,7 +54,7 @@ func (s *maxSizeGen) Apply(dirs []string) error {
// this lets us chain together addition
// operations where possible
func (s *maxSizeGen) addConstant(sz string) {
if !s.p.ok() {
if !s.p.ok() || s.halted {
return
}

Expand Down Expand Up @@ -105,17 +106,34 @@ func (s *maxSizeGen) Execute(p Elem) ([]string, error) {
s.ctx = &Context{}
s.ctx.PushString(p.TypeName())

s.halted = false

// receiver := imutMethodReceiver(p)
s.p.printf("\nfunc %s (s int) {", getMaxSizeMethod(p.TypeName()))
s.state = assignM
next(s, p)
s.p.nakedReturn()
if s.halted {
if s.p.ok() {
s.p.print("\n}\n")
}
} else {
s.p.nakedReturn()
}
s.topics.Add(p.TypeName(), getMaxSizeMethod(p.TypeName()))
return nil, s.p.err
}

func (s *maxSizeGen) panicf(format string, args ...interface{}) {
if !s.p.ok() || s.halted {
return
}
s.state = addM
s.p.printf("\npanic(%s)", strconv.Quote(fmt.Sprintf(format, args...)))
s.halted = true
}

func (s *maxSizeGen) gStruct(st *Struct) {
if !s.p.ok() {
if !s.p.ok() || s.halted {
return
}

Expand All @@ -138,6 +156,9 @@ func (s *maxSizeGen) gStruct(st *Struct) {
return
}
next(s, st.Fields[i].FieldElem)
if s.halted {
return
}
}
} else {
data := msgp.AppendMapHeader(nil, nfields)
Expand All @@ -151,25 +172,33 @@ func (s *maxSizeGen) gStruct(st *Struct) {
data = msgp.AppendString(data, st.Fields[i].FieldTag)
s.addConstant(strconv.Itoa(len(data)))
next(s, st.Fields[i].FieldElem)
if s.halted {
return
}
}
}
}

func (s *maxSizeGen) gPtr(p *Ptr) {
if !s.p.ok() || s.halted {
return
}
s.state = addM // inner must use add
next(s, p.Value)
if s.halted {
return
}
s.state = addM // closing block; reset to add
}

func (s *maxSizeGen) gSlice(sl *Slice) {
if !s.p.ok() {
if !s.p.ok() || s.halted {
return
}
s.state = addM
s.p.comment("Calculating size of slice: " + sl.Varname())
if (sl.AllocBound() == "" || sl.AllocBound() == "-") && (sl.MaxTotalBytes() == "" || sl.MaxTotalBytes() == "-") {
s.p.printf("\npanic(\"Slice %s is unbounded\")", sl.Varname())
s.state = addM // reset the add to prevent further + expressions from being added to the end the panic statement
s.panicf("Slice %s is unbounded", sl.Varname())
return
}

Expand All @@ -193,14 +222,14 @@ func (s *maxSizeGen) gSlice(sl *Slice) {
if str, err := maxSizeExpr(childElement); err == nil {
s.addConstant(fmt.Sprintf("((%s) * (%s))", topLevelAllocBound, str))
} else {
s.p.printf("\npanic(\"Unable to determine max size: %s\")", err)
s.panicf("Unable to determine max size: %v", err)
}
s.state = addM
return
}

func (s *maxSizeGen) gArray(a *Array) {
if !s.p.ok() {
if !s.p.ok() || s.halted {
return
}
// If this is not the first line where we define s = ... then we need to reset the state
Expand All @@ -215,21 +244,23 @@ func (s *maxSizeGen) gArray(a *Array) {
if str, err := maxSizeExpr(a.Els); err == nil {
s.addConstant(fmt.Sprintf("((%s) * (%s))", a.Size, str))
} else {
s.p.printf("\npanic(\"Unable to determine max size: %s\")", err)
s.panicf("Unable to determine max size: %v", err)

}
s.state = addM
return
}

func (s *maxSizeGen) gMap(m *Map) {
if !s.p.ok() || s.halted {
return
}
vn := m.Varname()
s.state = addM
s.addConstant(builtinSize(mapHeader))
topLevelAllocBound := m.AllocBound()
if topLevelAllocBound != "" && topLevelAllocBound == "-" {
s.p.printf("\npanic(\"Map %s is unbounded\")", m.Varname())
s.state = addM // reset the add to prevent further + expressions from being added to the end the panic statement
s.panicf("Map %s is unbounded", m.Varname())
return
}
splitBounds := strings.Split(m.AllocBound(), ",")
Expand All @@ -245,17 +276,23 @@ func (s *maxSizeGen) gMap(m *Map) {
s.p.printf("\ns += %s", topLevelAllocBound)
s.state = multM
next(s, m.Key)
if s.halted {
return
}

s.p.comment("Adding size of map values for " + vn)
s.p.printf("\ns += %s", topLevelAllocBound)
s.state = multM
next(s, m.Value)
if s.halted {
return
}

s.state = addM
}

func (s *maxSizeGen) gBase(b *BaseElem) {
if !s.p.ok() {
if !s.p.ok() || s.halted {
return
}
if b.MaxTotalBytes() != "" {
Expand All @@ -275,8 +312,7 @@ func (s *maxSizeGen) gBase(b *BaseElem) {

value, err := baseMaxSizeExpr(b.Value, vname, b.BaseName(), b.TypeName(), b.common.AllocBound())
if err != nil {
s.p.printf("\npanic(\"Unable to determine max size: %s\")", err)
s.state = addM // reset the add to prevent further + expressions from being added to the end the panic statement
s.panicf("Unable to determine max size: %v", err)
return
}
s.p.printf("\ns += %s", value)
Expand All @@ -289,8 +325,7 @@ func (s *maxSizeGen) gBase(b *BaseElem) {
}
value, err := baseMaxSizeExpr(b.Value, vname, b.BaseName(), b.TypeName(), b.common.AllocBound())
if err != nil {
s.p.printf("\npanic(\"Unable to determine max size: %s\")", err)
s.state = addM // reset the add to prevent further + expressions from being added to the end the panic statement
s.panicf("Unable to determine max size: %v", err)
return
}
s.addConstant(value)
Expand Down