21 lines
969 B
Diff
21 lines
969 B
Diff
--- gcc/go/gofrontend/wb.cc (revision 268947)
|
|
+++ gcc/go/gofrontend/wb.cc (revision 268948)
|
|
@@ -904,7 +904,8 @@ Gogo::check_write_barrier(Block* enclosi
|
|
ref = Expression::make_unary(OPERATOR_AND, ref, loc);
|
|
ref = Expression::make_cast(unsafe_pointer_type, ref, loc);
|
|
ref = Expression::make_cast(puint32_type, ref, loc);
|
|
- ref = Expression::make_unary(OPERATOR_MULT, ref, loc);
|
|
+ ref = Expression::make_dereference(ref,
|
|
+ Expression::NIL_CHECK_NOT_NEEDED, loc);
|
|
Expression* zero = Expression::make_integer_ul(0, ref->type(), loc);
|
|
Expression* cond = Expression::make_binary(OPERATOR_EQEQ, ref, zero, loc);
|
|
|
|
--- gcc/go/gofrontend/MERGE (revision 268947)
|
|
+++ gcc/go/gofrontend/MERGE (revision 268948)
|
|
@@ -1,4 +1,4 @@
|
|
-0563f2d018cdb2cd685c254bac5ceb38396d0a27
|
|
+1a74b8a22b2ff7f430729aa87ecb8cea7b5cdd70
|
|
|
|
The first line of this file holds the git revision number of the last
|
|
merge done from the gofrontend repository.
|