- removed need for int() conversion now that x << s has correct type

- updated golden.out

R=r
DELTA=9  (0 added, 8 deleted, 1 changed)
OCL=14657
CL=14657

diff --git a/test/golden.out b/test/golden.out
index f3cac9ad691d4c5dc027eb50d980de5ba3eb451c..1cae7f9f57c6a81219563b714dbb4bd23c14b4d8 100644 (file)
--- a/test/golden.out
+++ b/test/golden.out
@@ -193,8 +193,6 @@ fixedbugs/bug015.go:7: overflow converting constant to <int64>INT64
 
 =========== fixedbugs/bug016.go
 fixedbugs/bug016.go:7: overflow converting constant to <uint32>UINT32
-fixedbugs/bug016.go:7: illegal types for operand: AS
-       (<int32>INT32)
 
 =========== fixedbugs/bug025.go
 fixedbugs/bug025.go:7: variable exported but not defined: Foo
@@ -227,10 +225,6 @@ ok
 fixedbugs/bug073.go:8: illegal types for operand: LSH
        (<int32>INT32)
        (<int32>INT32)
-fixedbugs/bug073.go:8: illegal types for operand: AS
-       (<int32>INT32)
 fixedbugs/bug073.go:9: illegal types for operand: RSH
        (<int32>INT32)
        (<int32>INT32)
-fixedbugs/bug073.go:9: illegal types for operand: AS
-       (<int32>INT32)

diff --git a/test/hashmap.go b/test/hashmap.go
index bf3001c7d6f29676f5de747dfdeb2d6eb1fb9049..86a3422726c5886ffacf4a01427d34d9edf10700 100755 (executable)
--- a/test/hashmap.go
+++ b/test/hashmap.go
@@ -47,9 +47,7 @@ type HashMap struct {
 
 
 func (m *HashMap) capacity() uint32 {
-       // TODO we need to figure out how to determine the type of
-       // a shifted 'untyped' int so we can get rid of the conversion
-       return uint32(1) << m.log2_capacity_;
+       return 1 << m.log2_capacity_;
 }