remove ExecutableSectionSize from Context

Author: alessio-perugini

arduino/builder/builder.go

@@ -63,6 +63,9 @@ type Builder struct {
 	// Progress of all various steps
 	Progress *progress.Struct
 
+	// Sizer results
+	executableSectionsSize ExecutablesFileSections
+
 	*BuildOptionsManager
 }
 
@@ -184,3 +187,8 @@ func (b *Builder) GetSketchBuildPath() *paths.Path {
 func (b *Builder) GetLibrariesBuildPath() *paths.Path {
 	return b.librariesBuildPath
 }
+
+// ExecutableSectionsSize fixdoc
+func (b *Builder) ExecutableSectionsSize() ExecutablesFileSections {
+	return b.executableSectionsSize
+}

arduino/builder/sizer.go

@@ -51,16 +51,24 @@ func (s ExecutablesFileSections) ToRPCExecutableSectionSizeArray() []*rpc.Execut
 }
 
 // Size fixdoc
-func (b *Builder) Size(sketchError bool) (ExecutablesFileSections, error) {
+func (b *Builder) Size(sketchError bool) error {
 	if b.onlyUpdateCompilationDatabase || sketchError {
-		return nil, nil
+		return nil
 	}
 
+	check := b.checkSize
 	if b.buildProperties.ContainsKey("recipe.advanced_size.pattern") {
-		return b.checkSizeAdvanced()
+		check = b.checkSizeAdvanced
 	}
 
-	return b.checkSize()
+	result, err := check()
+	if err != nil {
+		return err
+	}
+
+	b.executableSectionsSize = result
+
+	return nil
 }
 
 func (b *Builder) checkSizeAdvanced() (ExecutablesFileSections, error) {

commands/compile/compile.go

@@ -384,7 +384,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 		}
 	}
 
-	r.ExecutableSectionsSize = builderCtx.ExecutableSectionsSize.ToRPCExecutableSectionSizeArray()
+	r.ExecutableSectionsSize = sketchBuilder.ExecutableSectionsSize().ToRPCExecutableSectionSizeArray()
 
 	logrus.Tracef("Compile %s for %s successful", sk.Name, fqbnIn)
 

legacy/builder/builder.go

@@ -202,9 +202,7 @@ func (s *Builder) Run(ctx *types.Context) error {
 		}),
 
 		types.BareCommand(func(ctx *types.Context) error {
-			executableSectionsSize, err := ctx.Builder.Size(mainErr != nil)
-			ctx.ExecutableSectionsSize = executableSectionsSize
-			return err
+			return ctx.Builder.Size(mainErr != nil)
 		}),
 	}
 	for _, command := range commands {

legacy/builder/types/context.go

@@ -49,9 +49,6 @@ type Context struct {
 	// C++ Parsing
 	LineOffset int
 
-	// Sizer results
-	ExecutableSectionsSize builder.ExecutablesFileSections
-
 	// Compilation Database to build/update
 	CompilationDatabase *compilation.Database
 }