commit 548250302e93570e2e65ac63b88bda7b39c8dc01
author TDYa127 <tdy@google.com> Wed Apr 11 10:45:23 2012 -0700
committer Shih-wei Liao <sliao@google.com> Wed Apr 11 12:05:33 2012 -0700
tree 8710a463542d4e9943c5e609f7fc874b7a729dbe
parent b4e331bd50dff797df2c9d00eb6bd6a3c3c01f58

Code cleanup, fix MicroTime.

Change-Id: I1bd265a85bf036dde9393c7e6a7fe2dbc67dd509

src/compiler_llvm/runtime_support_llvm.cc

diff --git a/src/compiler_llvm/runtime_support_llvm.cc b/src/compiler_llvm/runtime_support_llvm.cc
index d354bee..224b902 100644
--- a/src/compiler_llvm/runtime_support_llvm.cc
+++ b/src/compiler_llvm/runtime_support_llvm.cc
@@ -594,9 +594,7 @@
 // 3. The code address is 0.                       -> Link the code by ELFLoader
 // The item 3 will solved by in-place linking at image loading.
 const void* art_fix_stub_from_code(Method* called) {
-  if (UNLIKELY(called->IsResolutionMethod())) {
-    LOG(FATAL) << "is ResolutionMethod!!";
-  }
+  DCHECK(!called->IsResolutionMethod()) << PrettyMethod(called);
   Runtime* runtime = Runtime::Current();
   const void* code = called->GetCode();
 
@@ -647,7 +645,7 @@
   JNIEnvExt* env = thread->GetJniEnv();
   ScopedJniEnvLocalRefState env_state(env);
 
-  // Create local ref. copies of proxy method and the receiver
+  // Create local ref. copies of the receiver
   jobject rcvr_jobj = AddLocalReference<jobject>(env, receiver);
 
   // Convert proxy method into expected interface method

src/utils.cc

diff --git a/src/utils.cc b/src/utils.cc
index e80de5b..70d15bf 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -114,7 +114,7 @@
 #else
   struct timeval now;
   gettimeofday(&now, NULL);
-  return static_cast<uint64_t>(now.tv_sec) * 1000000LL + now.tv_usec * 1000LL;
+  return static_cast<uint64_t>(now.tv_sec) * 1000000LL + now.tv_usec;
 #endif
 }