Convert operand to element type in channel send

axw · axw · commit 12f466aa6776 · 2013-10-06T00:44:16.000+08:00
Fixes #91
diff --git a/channels.go b/channels.go
@@ -29,16 +29,16 @@ func (v *LLVMValue) chanClose() {
 }
 
 func (v *LLVMValue) chanSend(value Value) {
+	elttyp := v.typ.Underlying().(*types.Chan).Elem()
+	value = value.Convert(elttyp)
 	var ptr llvm.Value
 	if value, ok := value.(*LLVMValue); ok && value.pointer != nil {
 		ptr = value.pointer.LLVMValue()
 	}
-	elttyp := v.typ.Underlying().(*types.Chan).Elem()
 	c := v.compiler
 	if ptr.IsNil() {
 		ptr = c.builder.CreateAlloca(c.types.ToLLVM(elttyp), "")
-		value := value.Convert(elttyp).LLVMValue()
-		c.builder.CreateStore(value, ptr)
+		c.builder.CreateStore(value.LLVMValue(), ptr)
 	}
 	uintptr_ := c.builder.CreatePtrToInt(ptr, c.target.IntPtrType(), "")
 	nb := boolLLVMValue(false)

Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,16 @@ func (v *LLVMValue) chanClose() {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func (v *LLVMValue) chanSend(value Value) {`
	`32`	`+ elttyp := v.typ.Underlying().(*types.Chan).Elem()`
	`33`	`+ value = value.Convert(elttyp)`
`32`	`34`	`var ptr llvm.Value`
`33`	`35`	`if value, ok := value.(*LLVMValue); ok && value.pointer != nil {`
`34`	`36`	`ptr = value.pointer.LLVMValue()`
`35`	`37`	`}`
`36`		`- elttyp := v.typ.Underlying().(*types.Chan).Elem()`
`37`	`38`	`c := v.compiler`
`38`	`39`	`if ptr.IsNil() {`
`39`	`40`	`ptr = c.builder.CreateAlloca(c.types.ToLLVM(elttyp), "")`
`40`		`- value := value.Convert(elttyp).LLVMValue()`
`41`		`- c.builder.CreateStore(value, ptr)`
	`41`	`+ c.builder.CreateStore(value.LLVMValue(), ptr)`
`42`	`42`	`}`
`43`	`43`	`uintptr_ := c.builder.CreatePtrToInt(ptr, c.target.IntPtrType(), "")`
`44`	`44`	`nb := boolLLVMValue(false)`