@@ -24,7 +24,7 @@
{
// General indicator that value is not used.
RFT_VOID,
- // Go type bool, C type _Bool.
+ // Go untyped bool, C type _Bool.
RFT_BOOL,
// Go type *bool, C type _Bool*.
RFT_BOOLPTR,
@@ -93,7 +93,7 @@
go_unreachable();
case RFT_BOOL:
- t = Type::lookup_bool_type();
+ t = Type::make_boolean_type();
break;
case RFT_BOOLPTR:
@@ -1150,7 +1150,10 @@
// var present_temp bool
Temporary_statement* present_temp =
- Statement::make_temporary(Type::lookup_bool_type(), NULL, loc);
+ Statement::make_temporary((this->present_->type()->is_sink_type())
+ ? Type::make_boolean_type()
+ : this->present_->type(),
+ NULL, loc);
b->add_statement(present_temp);
// present_temp = mapaccess2(DESCRIPTOR, MAP, &key_temp, &val_temp)
@@ -1163,7 +1166,6 @@
Expression* a4 = Expression::make_unary(OPERATOR_AND, ref, loc);
Expression* call = Runtime::make_call(Runtime::MAPACCESS2, loc, 4,
a1, a2, a3, a4);
-
ref = Expression::make_temporary_reference(present_temp, loc);
ref->set_is_lvalue();
Statement* s = Statement::make_assignment(ref, call, loc);
@@ -1426,7 +1428,10 @@
// var closed_temp bool
Temporary_statement* closed_temp =
- Statement::make_temporary(Type::lookup_bool_type(), NULL, loc);
+ Statement::make_temporary((this->closed_->type()->is_sink_type())
+ ? Type::make_boolean_type()
+ : this->closed_->type(),
+ NULL, loc);
b->add_statement(closed_temp);
// closed_temp = chanrecv2(type, channel, &val_temp)
===================================================================
@@ -41,21 +41,21 @@ func main() {
asBool(1 != 2) // ok now
asBool(i < j) // ok now
- _, b = m[2] // ERROR "cannot .* bool.*type Bool"
+ _, b = m[2]
var inter interface{}
- _, b = inter.(Map) // ERROR "cannot .* bool.*type Bool"
+ _, b = inter.(Map)
_ = b
var minter interface {
M()
}
- _, b = minter.(Map) // ERROR "cannot .* bool.*type Bool"
+ _, b = minter.(Map)
_ = b
_, bb := <-c
asBool(bb) // ERROR "cannot use.*type bool.*as type Bool"
- _, b = <-c // ERROR "cannot .* bool.*type Bool"
+ _, b = <-c
_ = b
asString(String(slice)) // ok