commit 8e4b2fc0565d6222ba49a14d87624e3ac170b6c5
author Shih-wei Liao <sliao@google.com> Tue Oct 11 10:43:52 2011 -0700
committer Shih-wei Liao <sliao@google.com> Tue Oct 11 11:31:12 2011 -0700
tree f17c04d4c2583debd905755ddfca6311415a180f
parent 5e73f9c8990819054f8e0a60061ee8beff1e024a

Turn on StackWalk. It passes the test now.

Also fix line numbers (some were off by 2).

Change-Id: Ic209b0824c28c808f8e029147356b909b535ab48

build/Android.oattest.mk

diff --git a/build/Android.oattest.mk b/build/Android.oattest.mk
index 8e23112..40e0d40 100644
--- a/build/Android.oattest.mk
+++ b/build/Android.oattest.mk
@@ -78,9 +78,9 @@
 $(eval $(call declare-test-test-target,ExceptionTest,))
 $(eval $(call declare-test-test-target,SystemMethods,))
 $(eval $(call declare-test-test-target,MemUsage,))
+$(eval $(call declare-test-test-target,StackWalk,))
 
-# TODO: Enable when the StackWalk tests are passing
-# $(eval $(call declare-test-test-target,StackWalk,))
+# TODO: Enable when the StackWalk2 tests are passing
 # $(eval $(call declare-test-test-target,StackWalk2,))
 
 ########################################################################

src/stack_walk.cc

diff --git a/src/stack_walk.cc b/src/stack_walk.cc
index 25b2270..6671829 100644
--- a/src/stack_walk.cc
+++ b/src/stack_walk.cc
@@ -56,29 +56,29 @@
     // find is what is expected.
     if (m_name.compare("f") == 0) {
       if (gJava_StackWalk_refmap_calls == 1) {
-        EXPECT_EQ(0U, m->ToDexPC(pc));
+        EXPECT_EQ(1U, m->ToDexPC(pc));
         EXPECT_REGS(1);
       } else {
         CHECK_EQ(gJava_StackWalk_refmap_calls, 2);
-        EXPECT_EQ(4U, m->ToDexPC(pc));
+        EXPECT_EQ(5U, m->ToDexPC(pc));
         EXPECT_REGS(1);  // Note that v1 is not in the minimal root set
       }
     } else if (m_name.compare("g") == 0) {
       if (gJava_StackWalk_refmap_calls == 1) {
-        EXPECT_EQ(0xaU, m->ToDexPC(pc));
-        EXPECT_REGS(1, 2, 3);
+        EXPECT_EQ(0xcU, m->ToDexPC(pc));
+        EXPECT_REGS(2);
       } else {
         CHECK_EQ(gJava_StackWalk_refmap_calls, 2);
-        EXPECT_EQ(0xaU, m->ToDexPC(pc));
-          EXPECT_REGS(1, 2, 3);
+        EXPECT_EQ(0xcU, m->ToDexPC(pc));
+          EXPECT_REGS(2);
       }
     } else if (m_name.compare("shlemiel") == 0) {
       if (gJava_StackWalk_refmap_calls == 1) {
-        EXPECT_EQ(0x2d5U, m->ToDexPC(pc));
+        EXPECT_EQ(0x380U, m->ToDexPC(pc));
         EXPECT_REGS(2, 4, 5, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 21, 25);
       } else {
         CHECK_EQ(gJava_StackWalk_refmap_calls, 2);
-        EXPECT_EQ(0x2d5U, m->ToDexPC(pc));
+        EXPECT_EQ(0x380U, m->ToDexPC(pc));
         EXPECT_REGS(2, 4, 5, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 21, 25);
       }
     }