OSDN Git Service

am 30febfdf: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-gingerbread
authorBrian Carlstrom <bdc@google.com>
Fri, 20 Aug 2010 20:52:14 +0000 (13:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Aug 2010 20:52:14 +0000 (13:52 -0700)
commit39796a6aa79f687ac0b1254f6a8be048ad1243d8
tree0cbdfbbb9291bf7b06e9ab0f93f45ea3816e8388
parent1310319f0f89c1fc2890657aaa1f0b0ac30e099f
parent30febfdf4abe39f99dec100de968cb831b555b27
am 30febfdf: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-gingerbread

Merge commit '30febfdf4abe39f99dec100de968cb831b555b27' into gingerbread-plus-aosp

* commit '30febfdf4abe39f99dec100de968cb831b555b27': (34 commits)
  Remove an assertion that cannot be guaranteed.
  Always support debugging and profiling.
  Fix a critical space leak introduced by concurrent sweeping.
  Add a little bit of paranoia to the odex data reader.
  Nudge a couple of log messages.
  Fix build breakage caused by the countInstancesOfClass change.
  Add a method for counting the extant instances of a class.
  Added fsync call to dexopt.
  JIT: Fix for armv5te-VFP bug [Issue 2916682]
  Cast to a byte pointer before performing arithmetic.
  Limit scanning to cards within the committed region of the heap.
  Remove a malfunctioning predicate used only in assertions.
  Remove debugging code and stale comments from the sweep callback.
  Fix build breakage caused by a bad merge from master.
  JIT: Correct conversion of cb[n]z to cmp/cond_br pair
  Sweep concurrently.
  Implement card table verification.
  Fix the ordering of lock acquisition in the heap worker.
  Print callee information in the JIT profile outout
  JIT: Fix for lightweight assembler retry mechanism.
  ...