commit eead4ac17ec9d5e750269a7d36bf6c36a6fd60c6
author TDYa127 <tdy@google.com> Sun Jun 03 07:15:25 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sun Jun 03 09:12:30 2012 -0700
tree 911602ed79cde974cba5b6a18d57fc27987436ef
parent de479be99328d2113bf483e082c9ecf235a34d69

Implement proxy stub for compiler_llvm.

Change-Id: Id8ba59c62795d885a18b3cc634e7ef370a2d2f97

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 43f1b42..000e2a5 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1344,6 +1344,9 @@
     }
     if (method->GetInvokeStub() == NULL) {
       method->SetInvokeStub(oat_method.GetInvokeStub());
+#if defined(ART_USE_LLVM_COMPILER)
+      method->SetProxyStub(oat_method.GetProxyStub());
+#endif
     }
   }
 }
@@ -2297,8 +2300,7 @@
 #if !defined(ART_USE_LLVM_COMPILER)
   method->SetCode(reinterpret_cast<void*>(art_proxy_invoke_handler));
 #else
-  method->SetCode(reinterpret_cast<const void*>(
-      static_cast<uintptr_t>(compiler_llvm::special_stub::kProxyStub)));
+  method->SetCode(prototype->GetProxyStub());
 #endif
 
   return method;