Revert "Remove non-live vregs from GC map on return."
This change causes a test regression on the oat tests, back out until the change also updates the test for the new GC map values.
This reverts commit c0d120a0b1389f1f402d13e20b9e4abd9ab7cd95.
Change-Id: I48bc951b1dad9a9ae83cccf0b5b68ad60fac052c
diff --git a/runtime/verifier/instruction_flags.cc b/runtime/verifier/instruction_flags.cc
index f76c226..358791d 100644
--- a/runtime/verifier/instruction_flags.cc
+++ b/runtime/verifier/instruction_flags.cc
@@ -22,17 +22,16 @@
namespace verifier {
std::string InstructionFlags::ToString() const {
- char encoding[7];
+ char encoding[6];
if (!IsOpcode()) {
- strncpy(encoding, "XXXXXX", sizeof(encoding));
+ strncpy(encoding, "XXXXX", sizeof(encoding));
} else {
- strncpy(encoding, "------", sizeof(encoding));
- if (IsVisited()) encoding[kVisited] = 'V';
- if (IsChanged()) encoding[kChanged] = 'C';
- if (IsInTry()) encoding[kInTry] = 'T';
- if (IsBranchTarget()) encoding[kBranchTarget] = 'B';
+ strncpy(encoding, "-----", sizeof(encoding));
+ if (IsInTry()) encoding[kInTry] = 'T';
+ if (IsBranchTarget()) encoding[kBranchTarget] = 'B';
if (IsCompileTimeInfoPoint()) encoding[kCompileTimeInfoPoint] = 'G';
- if (IsReturn()) encoding[kReturn] = 'R';
+ if (IsVisited()) encoding[kVisited] = 'V';
+ if (IsChanged()) encoding[kChanged] = 'C';
}
return encoding;
}
diff --git a/runtime/verifier/instruction_flags.h b/runtime/verifier/instruction_flags.h
index e50ba13..9b2e595 100644
--- a/runtime/verifier/instruction_flags.h
+++ b/runtime/verifier/instruction_flags.h
@@ -93,21 +93,6 @@
return IsVisited() || IsChanged();
}
- void SetReturn() {
- flags_ |= 1 << kReturn;
- }
- void ClearReturn() {
- flags_ &= ~(1 << kReturn);
- }
- bool IsReturn() const {
- return (flags_ & (1 << kReturn)) != 0;
- }
-
- void SetCompileTimeInfoPointAndReturn() {
- SetCompileTimeInfoPoint();
- SetReturn();
- }
-
std::string ToString() const;
private:
@@ -123,8 +108,6 @@
kBranchTarget = 3,
// Location of interest to the compiler for GC maps and verifier based method sharpening.
kCompileTimeInfoPoint = 4,
- // A return instruction.
- kReturn = 5,
};
// Size of instruction in code units.
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index e182af7..2bf78d8 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -566,10 +566,8 @@
/* Flag instructions that are garbage collection points */
// All invoke points are marked as "Throw" points already.
// We are relying on this to also count all the invokes as interesting.
- if (inst->IsBranch() || inst->IsSwitch() || inst->IsThrow()) {
+ if (inst->IsBranch() || inst->IsSwitch() || inst->IsThrow() || inst->IsReturn()) {
insn_flags_[dex_pc].SetCompileTimeInfoPoint();
- } else if (inst->IsReturn()) {
- insn_flags_[dex_pc].SetCompileTimeInfoPointAndReturn();
}
dex_pc += inst->SizeInCodeUnits();
inst = inst->Next();
@@ -2658,20 +2656,6 @@
// Make workline consistent with fallthrough computed from peephole optimization.
work_line_->CopyFromLine(fallthrough_line.get());
}
- if (insn_flags_[next_insn_idx].IsReturn()) {
- // For returns we only care about the operand to the return, all other registers are dead.
- const Instruction* ret_inst = Instruction::At(code_item_->insns_ + next_insn_idx);
- Instruction::Code opcode = ret_inst->Opcode();
- if ((opcode == Instruction::RETURN_VOID) || (opcode == Instruction::RETURN_VOID_BARRIER)) {
- work_line_->MarkAllRegistersAsConflicts();
- } else {
- if (opcode == Instruction::RETURN_WIDE) {
- work_line_->MarkAllRegistersAsConflictsExceptWide(ret_inst->VRegA_11x());
- } else {
- work_line_->MarkAllRegistersAsConflictsExcept(ret_inst->VRegA_11x());
- }
- }
- }
RegisterLine* next_line = reg_table_.GetLine(next_insn_idx);
if (next_line != NULL) {
// Merge registers into what we have for the next instruction,
@@ -3659,24 +3643,7 @@
* there's nothing to "merge". Copy the registers over and mark it as changed. (This is the
* only way a register can transition out of "unknown", so this is not just an optimization.)
*/
- if (!insn_flags_[next_insn].IsReturn()) {
- target_line->CopyFromLine(merge_line);
- } else {
- // For returns we only care about the operand to the return, all other registers are dead.
- // Initialize them as conflicts so they don't add to GC and deoptimization information.
- const Instruction* ret_inst = Instruction::At(code_item_->insns_ + next_insn);
- Instruction::Code opcode = ret_inst->Opcode();
- if ((opcode == Instruction::RETURN_VOID) || (opcode == Instruction::RETURN_VOID_BARRIER)) {
- target_line->MarkAllRegistersAsConflicts();
- } else {
- target_line->CopyFromLine(merge_line);
- if (opcode == Instruction::RETURN_WIDE) {
- target_line->MarkAllRegistersAsConflictsExceptWide(ret_inst->VRegA_11x());
- } else {
- target_line->MarkAllRegistersAsConflictsExcept(ret_inst->VRegA_11x());
- }
- }
- }
+ target_line->CopyFromLine(merge_line);
} else {
UniquePtr<RegisterLine> copy(gDebugVerify ? new RegisterLine(target_line->NumRegs(), this) : NULL);
if (gDebugVerify) {
diff --git a/runtime/verifier/register_line.cc b/runtime/verifier/register_line.cc
index 7965c06..d2abaac 100644
--- a/runtime/verifier/register_line.cc
+++ b/runtime/verifier/register_line.cc
@@ -167,7 +167,7 @@
DCHECK(uninit_type.IsUninitializedTypes());
const RegType& init_type = verifier_->GetRegTypeCache()->FromUninitialized(uninit_type);
size_t changed = 0;
- for (uint32_t i = 0; i < num_regs_; i++) {
+ for (size_t i = 0; i < num_regs_; i++) {
if (GetRegisterType(i).Equals(uninit_type)) {
line_[i] = init_type.GetId();
changed++;
@@ -176,31 +176,6 @@
DCHECK_GT(changed, 0u);
}
-void RegisterLine::MarkAllRegistersAsConflicts() {
- uint16_t conflict_type_id = verifier_->GetRegTypeCache()->Conflict().GetId();
- for (uint32_t i = 0; i < num_regs_; i++) {
- line_[i] = conflict_type_id;
- }
-}
-
-void RegisterLine::MarkAllRegistersAsConflictsExcept(uint32_t vsrc) {
- uint16_t conflict_type_id = verifier_->GetRegTypeCache()->Conflict().GetId();
- for (uint32_t i = 0; i < num_regs_; i++) {
- if (i != vsrc) {
- line_[i] = conflict_type_id;
- }
- }
-}
-
-void RegisterLine::MarkAllRegistersAsConflictsExceptWide(uint32_t vsrc) {
- uint16_t conflict_type_id = verifier_->GetRegTypeCache()->Conflict().GetId();
- for (uint32_t i = 0; i < num_regs_; i++) {
- if ((i != vsrc) && (i != (vsrc + 1))) {
- line_[i] = conflict_type_id;
- }
- }
-}
-
std::string RegisterLine::Dump() const {
std::string result;
for (size_t i = 0; i < num_regs_; i++) {
diff --git a/runtime/verifier/register_line.h b/runtime/verifier/register_line.h
index f380877..cde7b9b 100644
--- a/runtime/verifier/register_line.h
+++ b/runtime/verifier/register_line.h
@@ -141,13 +141,6 @@
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
/*
- * Update all registers to be Conflict except vsrc.
- */
- void MarkAllRegistersAsConflicts();
- void MarkAllRegistersAsConflictsExcept(uint32_t vsrc);
- void MarkAllRegistersAsConflictsExceptWide(uint32_t vsrc);
-
- /*
* Check constraints on constructor return. Specifically, make sure that the "this" argument got
* initialized.
* The "this" argument to <init> uses code offset kUninitThisArgAddr, which puts it at the start
