commit 99bc2176824556730c948f17cbdb7993b17fcb6e
author Logan Chien <loganchien@google.com> Thu Oct 18 10:03:36 2012 +0800
committer Logan Chien <loganchien@google.com> Thu Oct 18 10:06:31 2012 +0800
tree 6eb1fa22662397a9fadd23feb5afdae1250503ab
parent 4202b7484dab71ca4dfc2109ebb3fd04b87badfb

Fix 044-proxy bug in oat_write.cc.

We should prepare proxy stub for NON-static function
instead.

Change-Id: I210896b1e40de996f4a83abbe6e108efb9f5d56b

src/oat_writer.cc

diff --git a/src/oat_writer.cc b/src/oat_writer.cc
index 5e12299..72ac6e6 100644
--- a/src/oat_writer.cc
+++ b/src/oat_writer.cc
@@ -353,7 +353,7 @@
   }
 
 #if defined(ART_USE_LLVM_COMPILER)
-  if (type == kStatic) {
+  if (type != kStatic) {
     const CompiledInvokeStub* compiled_proxy_stub = compiler_->FindProxyStub(shorty);
     if (compiled_proxy_stub != NULL) {
       offset = CompiledMethod::AlignCode(offset, compiler_->GetInstructionSet());
@@ -733,7 +733,7 @@
   }
 
 #if defined(ART_USE_LLVM_COMPILER)
-  if (is_static) {
+  if (!is_static) {
     const CompiledInvokeStub* compiled_proxy_stub = compiler_->FindProxyStub(shorty);
     if (compiled_proxy_stub != NULL) {
       uint32_t aligned_code_offset = CompiledMethod::AlignCode(code_offset,