diff options
Diffstat (limited to 'runtime/debugger.cc')
| -rw-r--r-- | runtime/debugger.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc index 733e8430c8..20ad372d3f 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -1149,7 +1149,7 @@ JDWP::JdwpError Dbg::SetArrayElements(JDWP::ObjectId array_id, int offset, int c if (o == ObjectRegistry::kInvalidObject) { return JDWP::ERR_INVALID_OBJECT; } - oa->Set(offset + i, o); + oa->Set<false>(offset + i, o); } } @@ -1582,10 +1582,12 @@ static JDWP::JdwpError SetFieldValueImpl(JDWP::ObjectId object_id, JDWP::FieldId if (IsPrimitiveTag(tag)) { if (tag == JDWP::JT_DOUBLE || tag == JDWP::JT_LONG) { CHECK_EQ(width, 8); - f->Set64(o, value); + // Debugging can't use transactional mode (runtime only). + f->Set64<false>(o, value); } else { CHECK_LE(width, 4); - f->Set32(o, value); + // Debugging can't use transactional mode (runtime only). + f->Set32<false>(o, value); } } else { mirror::Object* v = gRegistry->Get<mirror::Object*>(value); @@ -1598,7 +1600,8 @@ static JDWP::JdwpError SetFieldValueImpl(JDWP::ObjectId object_id, JDWP::FieldId return JDWP::ERR_INVALID_OBJECT; } } - f->SetObject(o, v); + // Debugging can't use transactional mode (runtime only). + f->SetObject<false>(o, v); } return JDWP::ERR_NONE; |