commit 05fe3b630e9ae50837ae88ba09581bd281aa184a
author TDYa127 <tdy@google.com> Sat Apr 21 00:28:54 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sat Apr 21 15:11:36 2012 -0700
tree 22064a582abbd4aa491c0b43a499cd0470b74ec9
parent 706e9b62e1bac8a774466937ab32fcd655f5b723

Implement X86 trampoline for llvm compiler.

Change-Id: I0c6ec3a59eaebd5e28ca8e95f2711a31b79b9279

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 1edfe1a..5bd214a 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1401,7 +1401,13 @@
     // back.
 
     // TODO: Remove this workaround.
-    GetOatMethodFor(method).LinkMethodPointers(method);
+    OatFile::OatMethod oat_method = GetOatMethodFor(method);
+    if (method->GetCode() == NULL) {
+      method->SetCode(oat_method.GetCode());
+    }
+    if (method->GetInvokeStub() == NULL) {
+      method->SetInvokeStub(oat_method.GetInvokeStub());
+    }
   }
 }