Fixed variable lifetime in loops

src/build/core/CompileDefinition.go

@@ -44,26 +44,35 @@ func (f *Function) AddVariable(variable *Variable) {
 		f.Comment("%s = %s (%s, %d uses)", variable.Name, variable.Value, variable.Register, variable.Alive)
 	}
 
-	f.Scope().variables[variable.Name] = variable
-	f.Scope().Reserve(variable.Register)
-	f.Scope().Use(variable.Register)
+	scope := f.Scope()
+	variable.Scope = scope
+
+	scope.variables[variable.Name] = variable
+	scope.Reserve(variable.Register)
+	scope.Use(variable.Register)
 }
 
 func (f *Function) useVariable(variable *Variable) {
-	for _, scope := range f.scopes {
+	for i, scope := range f.scopes {
+		if scope.inLoop && variable.Scope != scope {
+			continue
+		}
+
 		local := scope.variables[variable.Name]
 
-		if local != nil {
-			local.Alive--
+		if local == nil {
+			continue
 		}
 
+		local.Alive--
+
 		if local.Alive < 0 {
 			panic("incorrect number of variable use calls")
 		}
 
 		if local.Alive == 0 {
 			if config.Comments {
-				f.Comment("%s died (%s)", local.Name, local.Register)
+				f.Comment("%s died (%s) in scope %d", local.Name, local.Register, i)
 			}
 
 			scope.Free(local.Register)