Commit d279bcff authored by Damien George's avatar Damien George
Browse files

py/objstr: Fix eager optimisation of str/bytes addition.

The RHS can only be returned if it is the same type as the LHS.
parent 7b7ff60f
...@@ -354,7 +354,7 @@ mp_obj_t mp_obj_str_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { ...@@ -354,7 +354,7 @@ mp_obj_t mp_obj_str_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
switch (op) { switch (op) {
case MP_BINARY_OP_ADD: case MP_BINARY_OP_ADD:
case MP_BINARY_OP_INPLACE_ADD: { case MP_BINARY_OP_INPLACE_ADD: {
if (lhs_len == 0) { if (lhs_len == 0 && mp_obj_get_type(rhs_in) == lhs_type) {
return rhs_in; return rhs_in;
} }
if (rhs_len == 0) { if (rhs_len == 0) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment