Rolled back array pointer changes.

markkurossi · Aug 2, 2022 · be3e504 · be3e504
1 parent 372927b
commit be3e504
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 30 deletions.
diff --git a/compiler/ast/builtin.go b/compiler/ast/builtin.go
@@ -94,15 +94,15 @@ func copySSA(block *ssa.Block, ctx *Codegen, gen *ssa.Generator,
 	var elementType types.Info
 
 	switch dst.Type.Type {
-	// case types.TArray:
-	// 	baseName = dst.Name
-	// 	baseType = dst.Type
-	// 	baseScope = dst.Scope
-	// 	baseBindings = block.Bindings
-	//
-	// 	dstOffset = 0
-	// 	elementType = *dst.Type.ElementType
-	// 	base = dst
+	case types.TArray:
+		baseName = dst.Name
+		baseType = dst.Type
+		baseScope = dst.Scope
+		baseBindings = block.Bindings
+
+		dstOffset = 0
+		elementType = *dst.Type.ElementType
+		base = dst
 
 	case types.TPtr:
 		elementType = *dst.Type.ElementType

diff --git a/compiler/ast/eval.go b/compiler/ast/eval.go
@@ -567,28 +567,9 @@ func (ast *Make) Eval(env *Env, ctx *Codegen, gen *ssa.Generator) (
 		typeInfo.ArraySize = length
 		typeInfo.Bits = typeInfo.ElementType.Bits * length
 		typeInfo.MinBits = typeInfo.Bits
+		v := gen.AnonVal(typeInfo)
 
-		// Allocate array from heap.
-		array := gen.NewVal(ctx.HeapVar(), typeInfo, 0)
-		ctx.Package.Bindings.Set(array, nil)
-
-		// Return pointer to array.
-		ptr := gen.AnonVal(types.Info{
-			Type:        types.TPtr,
-			Bits:        array.Type.Bits,
-			MinBits:     array.Type.Bits,
-			ElementType: &array.Type,
-		})
-		ptr.PtrInfo = &ssa.PtrInfo{
-			Name:          array.Name,
-			Bindings:      ctx.Package.Bindings,
-			Scope:         array.Scope,
-			ContainerType: array.Type,
-		}
-
-		fmt.Printf("*** make: => %v\n", ptr)
-
-		return ptr, true, nil
+		return v, true, nil
 	}
 
 	typeInfo.Bits = length