commit 2a475e7b93d754e0a7525bb5c7059386307ea63a
author buzbee <buzbee@google.com> Wed Sep 07 17:19:17 2011 -0700
committer buzbee <buzbee@google.com> Thu Sep 08 07:57:25 2011 -0700
tree 000c5f4483de6c4e90ba5bcdee5f616c1e499b50
parent a475f392df7a66211056a8dc57a2aff92b0b8ceb

Check-cast, instance-of, misc fixes

Support for check-cast and instanceof (largely untested).  Added a bunch of
helper stubs, a debugging option to show the method name if we try to branch
to an uncompiled method, new tests and a missing call to reset the compiler's
arena storage.

Change-Id: I933ad1fbdbca110f92c9201cae2353bf4862a8ac

src/compiler_test.cc

diff --git a/src/compiler_test.cc b/src/compiler_test.cc
index 9d2bb30..e232858 100644
--- a/src/compiler_test.cc
+++ b/src/compiler_test.cc
@@ -103,6 +103,17 @@
                         10);
 }
 
+// TODO: need stub for InstanceofNonTrivialFromCode
+TEST_F(CompilerTest, InstanceTest) {
+  CompileDirectMethod(NULL, "java.lang.Object", "<init>", "()V");
+  const ClassLoader* class_loader = LoadDex("IntMath");
+  CompileDirectMethod(class_loader, "IntMath", "<init>", "()V");
+  CompileDirectMethod(class_loader, "IntMathBase", "<init>", "()V");
+  AssertStaticIntMethod(class_loader, "IntMath", "instanceTest", "(I)I", 1352, 10);
+}
+
+// TODO: need check-cast test (when stub complete & we can throw/catch
+
 // TODO: Need invoke-interface test
 
 TEST_F(CompilerTest, SuperTest) {
@@ -117,8 +128,14 @@
 }
 
 TEST_F(CompilerTest, ConstStringTest) {
+  CompileDirectMethod(NULL, "java.lang.String", "<clinit>", "()V");
+  CompileDirectMethod(NULL, "java.lang.String", "<init>", "(II[C)V");
+  CompileDirectMethod(NULL, "java.lang.String", "<init>", "([CII)V");
+  CompileVirtualMethod(NULL, "java.lang.String", "_getChars", "(II[CI)V");
+  CompileVirtualMethod(NULL, "java.lang.String", "charAt", "(I)C");
+  CompileVirtualMethod(NULL, "java.lang.String", "length", "()I");
   AssertStaticIntMethod(LoadDex("IntMath"), "IntMath", "constStringTest",
-                                "(I)I", 2468, 1234);
+                                "(I)I", 1246, 1234);
 }
 
 TEST_F(CompilerTest, ConstClassTest) {
@@ -126,9 +143,18 @@
                                 "(I)I", 2222, 1111);
 }
 
+// TODO: Need native nativeFillInStackTrace()
 TEST_F(CompilerTest, DISABLED_CatchTest) {
   CompileDirectMethod(NULL, "java.lang.Object", "<init>", "()V");
   CompileDirectMethod(NULL, "java.lang.NullPointerException", "<init>", "()V");
+  CompileDirectMethod(NULL, "java.lang.RuntimeException", "<init>", "()V");
+  CompileDirectMethod(NULL, "java.lang.Exception", "<init>", "()V");
+  CompileDirectMethod(NULL, "java.lang.Throwable","<init>", "()V");
+  CompileDirectMethod(NULL, "java.util.ArrayList","<init>","()V");
+  CompileDirectMethod(NULL, "java.util.AbstractList","<init>","()V");
+  CompileDirectMethod(NULL, "java.util.AbstractCollection","<init>","()V");
+  CompileVirtualMethod(NULL, "java.lang.Throwable","fillInStackTrace","()Ljava/lang/Throwable;");
+  CompileDirectMethod(NULL, "java.lang.Throwable","nativeFillInStackTrace","()Ljava/lang/Object;");
   const ClassLoader* class_loader = LoadDex("IntMath");
   CompileDirectMethod(class_loader, "IntMath", "throwNullPointerException", "()V");
   AssertStaticIntMethod(class_loader, "IntMath", "catchBlock", "(I)I", 1579,