diff options
| author | Ian Rogers <irogers@google.com> | 2013-07-25 23:52:52 +0000 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-07-25 17:35:15 -0700 |
| commit | b8c7859f21f5ae4c9b90f2ef2effc51967299737 (patch) | |
| tree | 7f7c06a648a8fe8b134cee82111935f27b1606b0 /test | |
| parent | be576f48e4bf5c2afcaadd6e3a6d0f6a3153f031 (diff) | |
| download | art-b8c7859f21f5ae4c9b90f2ef2effc51967299737.zip art-b8c7859f21f5ae4c9b90f2ef2effc51967299737.tar.gz art-b8c7859f21f5ae4c9b90f2ef2effc51967299737.tar.bz2 | |
Revert "Revert "Remove non-live vregs from GC map on return.""
This reverts commit 73dda0bc2adcd6a3a7d75f663a3559f8b527d485.
It also fixes the problematic line in the ReferenceMap test.
Change-Id: Ic3b62db7c040853a5ddfed589f6e0acff25d82b7
Diffstat (limited to 'test')
| -rw-r--r-- | test/ReferenceMap/stack_walk_refmap_jni.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/ReferenceMap/stack_walk_refmap_jni.cc b/test/ReferenceMap/stack_walk_refmap_jni.cc index 7b6483d..885a658 100644 --- a/test/ReferenceMap/stack_walk_refmap_jni.cc +++ b/test/ReferenceMap/stack_walk_refmap_jni.cc @@ -103,7 +103,9 @@ struct ReferenceMap2Visitor : public StackVisitor { // 0024: move-object v3, v2 // 0025: goto 0013 // Detaled dex instructions for ReferenceMap.java are at the end of this function. - CHECK_REGS_CONTAIN_REFS(8, 3, 2, 1); // v8: this, v3: y, v2: y, v1: x + //CHECK_REGS_CONTAIN_REFS(8, 3, 2, 1); // v8: this, v3: y, v2: y, v1: x + // We eliminate the non-live registers at a return, so only v3 is live: + CHECK_REGS_CONTAIN_REFS(3); // v3: y ref_bitmap = map.FindBitMap(m->NativePcOffset(m->ToFirstNativeSafepointPc(0x18U))); CHECK(ref_bitmap); @@ -188,7 +190,7 @@ struct ReferenceMap2Visitor : public StackVisitor { //0:[Unknown],1:[Reference: java.lang.Object[]],2:[Zero],3:[Reference: java.lang.Object],4:[32-bit Constant: 2],5:[Unknown],6:[32-bit Constant: 1],7:[Zero],8:[Reference: ReferenceMap], // |0010: +invoke-virtual-quick {v8, v7}, [000c] // vtable #000c -//0:[Conflict],1:[Reference: java.lang.Object[]],2:[Reference: java.lang.Object],3:[Reference: java.lang.Object],4:[32-bit Constant: 2],5:[Conflict],6:[32-bit Constant: 1],7:[Zero],8:[Reference: ReferenceMap], +//0:[Conflict],1:[Conflict],2:[Conflict],3:[Reference: java.lang.Object],4:[Conflict],5:[Conflict],6:[Conflict],7:[Conflict],8:[Conflict], // |0013: return-object v3 // |0014: move-exception v0 |