OSDN Git Service

android-x86/art.git
10 years agoUse sched_yield in Monitor::MonitorEnter.
Mathieu Chartier [Wed, 16 Jul 2014 01:10:25 +0000 (18:10 -0700)]
Use sched_yield in Monitor::MonitorEnter.

Previously we used NanoSleep(1000), but this was unreliable. It could
result in waiting for >= 40ms instead of 1us. Since this was in a loop
it was especially bad if the GC was trying to suspend all the
threads when we were sleeping. This resulted in thread suspension
occasionally taking longer than a second.
Results on the provided picasso-sample app on Nexus 5:
Longest GC pause before: ~1.5s.
Longest GC pause after: <5ms.

Also added a warning if thread suspension takes longer than a
threshold (currently 5ms).

Bug: 16307460
External bug: https://code.google.com/p/android-developer-preview/issues/detail?id=367

(cherry picked from commit 251755cd511463260e60be98bf138b6aa1c14bf3)

Change-Id: I491c0799cc23ee6e68abc1bf77d1f0f4263e8ef5

10 years agoFix infinite loop when calling SetStatus after OOM.
Mathieu Chartier [Mon, 14 Jul 2014 17:16:05 +0000 (10:16 -0700)]
Fix infinite loop when calling SetStatus after OOM.

There was a problem where we would call SetStatus when we had an OOM
error. This results in attempting to find the ExceptionInInitializer
class which if not loaded does more allocations resulting in an
infinite loop.

Also some cleanup addressing other comments.

Bug: 16082350

(cherry picked from commit fd22d5bada15d95b5ea8ab5a4dda39077e1a54ee)

Change-Id: Ie291eb0f52ba9c63f24591fae691dd9f393e6ccb

10 years agoam 0b316726: am cf90ba7e: Merge "ART: Add another special case to GenSelect for ARM64"
Andreas Gampe [Sat, 12 Jul 2014 21:15:15 +0000 (21:15 +0000)]
am 0b316726: am cf90ba7e: Merge "ART: Add another special case to GenSelect for ARM64"

* commit '0b3167265ee9d75daca62f0014c47cb962b443f3':
  ART: Add another special case to GenSelect for ARM64

10 years agoam cf90ba7e: Merge "ART: Add another special case to GenSelect for ARM64"
Andreas Gampe [Sat, 12 Jul 2014 21:10:53 +0000 (21:10 +0000)]
am cf90ba7e: Merge "ART: Add another special case to GenSelect for ARM64"

* commit 'cf90ba7ebe00346651f3b7ce1e5b1f785f7caabd':
  ART: Add another special case to GenSelect for ARM64

10 years agoam ccdaa5ea: am 6ef2aa67: Merge "ART: Rework TargetReg(symbolic_reg, wide)"
Andreas Gampe [Sat, 12 Jul 2014 20:45:59 +0000 (20:45 +0000)]
am ccdaa5ea: am 6ef2aa67: Merge "ART: Rework TargetReg(symbolic_reg, wide)"

* commit 'ccdaa5eac1165ac06c6414db8dac961c4b6444fe':
  ART: Rework TargetReg(symbolic_reg, wide)

10 years agoam 6ef2aa67: Merge "ART: Rework TargetReg(symbolic_reg, wide)"
Andreas Gampe [Sat, 12 Jul 2014 20:42:11 +0000 (20:42 +0000)]
am 6ef2aa67: Merge "ART: Rework TargetReg(symbolic_reg, wide)"

* commit '6ef2aa67656cf8e67bbd6f0f4aec0402d7158297':
  ART: Rework TargetReg(symbolic_reg, wide)

10 years agoam 87354a55: am 3b7da819: Merge "ART: Correct disassembling of regs from opcodes"
Ian Rogers [Sat, 12 Jul 2014 19:47:49 +0000 (19:47 +0000)]
am 87354a55: am 3b7da819: Merge "ART: Correct disassembling of regs from opcodes"

* commit '87354a55df2ec985e1e4d27ac69868ec0c102c0b':
  ART: Correct disassembling of regs from opcodes

10 years agoam 3b7da819: Merge "ART: Correct disassembling of regs from opcodes"
Ian Rogers [Sat, 12 Jul 2014 19:44:47 +0000 (19:44 +0000)]
am 3b7da819: Merge "ART: Correct disassembling of regs from opcodes"

* commit '3b7da819adb3b3f166e5970b6f5778415c84c3e9':
  ART: Correct disassembling of regs from opcodes

10 years agoam 949e5980: am b7e78cb6: Merge "AArch64: Fix and enable reverseBytes intrinsic."
Andreas Gampe [Sat, 12 Jul 2014 13:08:43 +0000 (13:08 +0000)]
am 949e5980: am b7e78cb6: Merge "AArch64: Fix and enable reverseBytes intrinsic."

* commit '949e598017d57c4ba3bd4470b0bd27fc5ca18a17':
  AArch64: Fix and enable reverseBytes intrinsic.

10 years agoam c8cd6926: am 5727339f: Merge "Aarch64: easy division and remainder for long ints."
Andreas Gampe [Sat, 12 Jul 2014 13:08:42 +0000 (13:08 +0000)]
am c8cd6926: am 5727339f: Merge "Aarch64: easy division and remainder for long ints."

* commit 'c8cd6926b4ac64e10b6a630491da3f6206a1e192':
  Aarch64: easy division and remainder for long ints.

10 years agoam c76192c5: am 7aab9879: Merge "ART: Fuse compare-with-0-and-branch in Arm64 utils...
Andreas Gampe [Sat, 12 Jul 2014 13:08:42 +0000 (13:08 +0000)]
am c76192c5: am 7aab9879: Merge "ART: Fuse compare-with-0-and-branch in Arm64 utils-assembler"

* commit 'c76192c58903d80f45feac65c186a314a5aeaf10':
  ART: Fuse compare-with-0-and-branch in Arm64 utils-assembler

10 years agoam 7d76f600: am 0f73aa8f: Merge "Update counting VR for promotion"
Andreas Gampe [Sat, 12 Jul 2014 13:08:41 +0000 (13:08 +0000)]
am 7d76f600: am 0f73aa8f: Merge "Update counting VR for promotion"

* commit '7d76f6001cfc8877eebf122ca3c58b4203754715':
  Update counting VR for promotion

10 years agoam b7e78cb6: Merge "AArch64: Fix and enable reverseBytes intrinsic."
Andreas Gampe [Sat, 12 Jul 2014 12:59:31 +0000 (12:59 +0000)]
am b7e78cb6: Merge "AArch64: Fix and enable reverseBytes intrinsic."

* commit 'b7e78cb6bdc57f2beaa8bccf383289ebdd53e552':
  AArch64: Fix and enable reverseBytes intrinsic.

10 years agoam 5727339f: Merge "Aarch64: easy division and remainder for long ints."
Andreas Gampe [Sat, 12 Jul 2014 12:59:30 +0000 (12:59 +0000)]
am 5727339f: Merge "Aarch64: easy division and remainder for long ints."

* commit '5727339f61b016d012fc91c5df3eb8eb3f3e0066':
  Aarch64: easy division and remainder for long ints.

10 years agoam 7aab9879: Merge "ART: Fuse compare-with-0-and-branch in Arm64 utils-assembler"
Andreas Gampe [Sat, 12 Jul 2014 12:59:30 +0000 (12:59 +0000)]
am 7aab9879: Merge "ART: Fuse compare-with-0-and-branch in Arm64 utils-assembler"

* commit '7aab98798ad676d7ede05b25bcff946a6550868c':
  ART: Fuse compare-with-0-and-branch in Arm64 utils-assembler

10 years agoam 0f73aa8f: Merge "Update counting VR for promotion"
Andreas Gampe [Sat, 12 Jul 2014 12:59:29 +0000 (12:59 +0000)]
am 0f73aa8f: Merge "Update counting VR for promotion"

* commit '0f73aa8f64417232e3f3d09e53f49084d2783fe0':
  Update counting VR for promotion

10 years agoam c9ffb3d2: am bc9127a5: Merge "AArch64: Fix def use."
Andreas Gampe [Sat, 12 Jul 2014 03:28:48 +0000 (03:28 +0000)]
am c9ffb3d2: am bc9127a5: Merge "AArch64: Fix def use."

* commit 'c9ffb3d225b14d1932c45d58abacd7fa3b43e612':
  AArch64: Fix def use.

10 years agoam bc9127a5: Merge "AArch64: Fix def use."
Andreas Gampe [Sat, 12 Jul 2014 03:24:32 +0000 (03:24 +0000)]
am bc9127a5: Merge "AArch64: Fix def use."

* commit 'bc9127a5d451058aede5562e2b015caec618d008':
  AArch64: Fix def use.

10 years agoam 0c96b613: am 0ee33c32: Merge "Revert "Revert "ART: Key-Value Store in Oat header"""
Andreas Gampe [Sat, 12 Jul 2014 03:22:40 +0000 (03:22 +0000)]
am 0c96b613: am 0ee33c32: Merge "Revert "Revert "ART: Key-Value Store in Oat header"""

* commit '0c96b6132a2837c584827d7a46ba4775f6480a6d':
  Revert "Revert "ART: Key-Value Store in Oat header""

10 years agoam 0ee33c32: Merge "Revert "Revert "ART: Key-Value Store in Oat header"""
Andreas Gampe [Sat, 12 Jul 2014 03:18:36 +0000 (03:18 +0000)]
am 0ee33c32: Merge "Revert "Revert "ART: Key-Value Store in Oat header"""

* commit '0ee33c32388f49853b7f7003047047d7f9e9cb75':
  Revert "Revert "ART: Key-Value Store in Oat header""

10 years agoam 3ad68036: am 8c472818: Merge "ART: Compacting ROS/DlMalloc spaces with semispace...
Mathieu Chartier [Sat, 12 Jul 2014 02:06:23 +0000 (02:06 +0000)]
am 3ad68036: am 8c472818: Merge "ART: Compacting ROS/DlMalloc spaces with semispace copy GC"

* commit '3ad680365a725aa092e9920f43ffd07807d12d09':
  ART: Compacting ROS/DlMalloc spaces with semispace copy GC

10 years agoam d8bb797b: am 9531f62e: Merge "Call strong CAS from unsafe. Add more CAS versions."
Hans Boehm [Sat, 12 Jul 2014 02:06:22 +0000 (02:06 +0000)]
am d8bb797b: am 9531f62e: Merge "Call strong CAS from unsafe. Add more CAS versions."

* commit 'd8bb797bbcbe12c330d86109d8747ecb1f89341a':
  Call strong CAS from unsafe. Add more CAS versions.

10 years agoam f42f7cf6: am f08f0ca4: Merge "Improve performance of invokevirtual/invokeinterface...
Ian Rogers [Sat, 12 Jul 2014 02:06:21 +0000 (02:06 +0000)]
am f42f7cf6: am f08f0ca4: Merge "Improve performance of invokevirtual/invokeinterface with embedded imt/vtable"

* commit 'f42f7cf641e82fd37442c84fa2672eddd4024f0b':
  Improve performance of invokevirtual/invokeinterface with embedded imt/vtable

10 years agoam e47725d4: am 3d71f321: Merge "ART: Change GenPCUseDefEncoding(), turn on Load...
Andreas Gampe [Sat, 12 Jul 2014 02:06:20 +0000 (02:06 +0000)]
am e47725d4: am 3d71f321: Merge "ART: Change GenPCUseDefEncoding(), turn on Load Hoisting for ARM64"

* commit 'e47725d4359d9ee14d3392f4d490cc9a95a3f203':
  ART: Change GenPCUseDefEncoding(), turn on Load Hoisting for ARM64

10 years agoam 6a4d88c2: am aebf3cda: Merge "Replace memory barriers to better reflect Java needs."
Hans Boehm [Sat, 12 Jul 2014 02:06:20 +0000 (02:06 +0000)]
am 6a4d88c2: am aebf3cda: Merge "Replace memory barriers to better reflect Java needs."

* commit '6a4d88c23bfbe3a6584476cd5a5111978c1dccca':
  Replace memory barriers to better reflect Java needs.

10 years agoam 9cc96ba8: am 2751ffbe: Merge "Faster TLAB allocator."
Mathieu Chartier [Sat, 12 Jul 2014 02:06:19 +0000 (02:06 +0000)]
am 9cc96ba8: am 2751ffbe: Merge "Faster TLAB allocator."

* commit '9cc96ba87893540fd58bc5085591f524a706a8b3':
  Faster TLAB allocator.

10 years agoam 7f0ec9ac: am bfe9d08e: Merge "Fix mac build."
Christopher Ferris [Sat, 12 Jul 2014 02:06:18 +0000 (02:06 +0000)]
am 7f0ec9ac: am bfe9d08e: Merge "Fix mac build."

* commit '7f0ec9ac316a06b6c0b0a3966973affc92fcaafd':
  Fix mac build.

10 years agoam 8630388d: am 438b9039: Merge "Make jemalloc the default choice."
Christopher Ferris [Sat, 12 Jul 2014 02:06:17 +0000 (02:06 +0000)]
am 8630388d: am 438b9039: Merge "Make jemalloc the default choice."

* commit '8630388d9526ae08e003626be4a62f0e9d9485cc':
  Make jemalloc the default choice.

10 years agoam ddfeb3f4: am 946a55fa: Merge "ART: Fix GenSelect for ARM64"
Andreas Gampe [Sat, 12 Jul 2014 02:06:16 +0000 (02:06 +0000)]
am ddfeb3f4: am 946a55fa: Merge "ART: Fix GenSelect for ARM64"

* commit 'ddfeb3f4af968cdb8ad201fe87f6a74b605b5fca':
  ART: Fix GenSelect for ARM64

10 years agoam b514670d: am 3641ac7d: Merge "Add missing class initialization during compilation...
Sebastien Hertz [Sat, 12 Jul 2014 02:06:16 +0000 (02:06 +0000)]
am b514670d: am 3641ac7d: Merge "Add missing class initialization during compilation and tests"

* commit 'b514670d10bc67eb01f2409488b1037334fa12c3':
  Add missing class initialization during compilation and tests

10 years agoam 84de722d: am eab674a8: Merge "Fix missing single-step event"
Sebastien Hertz [Sat, 12 Jul 2014 02:06:15 +0000 (02:06 +0000)]
am 84de722d: am eab674a8: Merge "Fix missing single-step event"

* commit '84de722d553dc6e63d61980bfcf1fd1bab1e5892':
  Fix missing single-step event

10 years agoam 236975a9: am 49ab79da: Merge "Revert "Revert "Revert "Add intrinsic for Reference...
Sebastien Hertz [Sat, 12 Jul 2014 02:06:14 +0000 (02:06 +0000)]
am 236975a9: am 49ab79da: Merge "Revert "Revert "Revert "Add intrinsic for Reference.get()""""

* commit '236975a92c464d6f631b37adef8101e371295525':
  Revert "Revert "Revert "Add intrinsic for Reference.get()"""

10 years agoam 2475b9d8: am 6a1f4ad1: Merge "Revert "Revert "Revert "Add implicit null and stack...
Nicolas Geoffray [Sat, 12 Jul 2014 02:06:13 +0000 (02:06 +0000)]
am 2475b9d8: am 6a1f4ad1: Merge "Revert "Revert "Revert "Add implicit null and stack checks for x86""""

* commit '2475b9d817692b7af5c76416a2fdb70d19d8d3ff':
  Revert "Revert "Revert "Add implicit null and stack checks for x86"""

10 years agoam 05eb2b37: am bd6b5dd3: Merge "Revert "Fix mac build""
Nicolas Geoffray [Sat, 12 Jul 2014 02:06:13 +0000 (02:06 +0000)]
am 05eb2b37: am bd6b5dd3: Merge "Revert "Fix mac build""

* commit '05eb2b372a910bf684b71c5e8da254e22706d420':
  Revert "Fix mac build"

10 years agoam 7be0369a: am 03c672f1: Merge "Revert "Revert "Add intrinsic for Reference.get...
Christopher Ferris [Sat, 12 Jul 2014 02:06:12 +0000 (02:06 +0000)]
am 7be0369a: am 03c672f1: Merge "Revert "Revert "Add intrinsic for Reference.get()"""

* commit '7be0369aad794bce916ed0737814c9a2587f1eb7':
  Revert "Revert "Add intrinsic for Reference.get()""

10 years agoam d20194c7: am 75cb5a24: Merge "ART: Fix GenSelect and GenFusedLongCmpBranch for...
Andreas Gampe [Sat, 12 Jul 2014 02:06:11 +0000 (02:06 +0000)]
am d20194c7: am 75cb5a24: Merge "ART: Fix GenSelect and GenFusedLongCmpBranch for ARM64"

* commit 'd20194c7fc2ca3e8227fc3a2064c0ee80bbe92c2':
  ART: Fix GenSelect and GenFusedLongCmpBranch for ARM64

10 years agoam df53b3eb: am 7ee5cd17: Merge "Revert "Add intrinsic for Reference.get()""
Christopher Ferris [Sat, 12 Jul 2014 02:06:10 +0000 (02:06 +0000)]
am df53b3eb: am 7ee5cd17: Merge "Revert "Add intrinsic for Reference.get()""

* commit 'df53b3eb601a524766d7189102f0cf1a918b5253':
  Revert "Add intrinsic for Reference.get()"

10 years agoam 026658d5: am 1190e0e4: Merge "Fix mac build"
Dave Allison [Sat, 12 Jul 2014 02:06:09 +0000 (02:06 +0000)]
am 026658d5: am 1190e0e4: Merge "Fix mac build"

* commit '026658d5da328108761a1586cabc339917e565ba':
  Fix mac build

10 years agoam 5731206b: am e2ebfb4c: Merge "Add intrinsic for Reference.get()"
Mathieu Chartier [Sat, 12 Jul 2014 02:06:09 +0000 (02:06 +0000)]
am 5731206b: am e2ebfb4c: Merge "Add intrinsic for Reference.get()"

* commit '5731206b6443eb90b6b16573c4592393e7ceb0db':
  Add intrinsic for Reference.get()

10 years agoam 5087b2ea: am 9e5f302b: Merge "Change default heap maximum size to be 256m."
Mathieu Chartier [Sat, 12 Jul 2014 02:06:08 +0000 (02:06 +0000)]
am 5087b2ea: am 9e5f302b: Merge "Change default heap maximum size to be 256m."

* commit '5087b2ea16e2104b164493e243c79df85b3e3a54':
  Change default heap maximum size to be 256m.

10 years agoam 2dbe40ba: am 9245c392: Merge "Fix race condition in release pages."
Mathieu Chartier [Sat, 12 Jul 2014 02:06:07 +0000 (02:06 +0000)]
am 2dbe40ba: am 9245c392: Merge "Fix race condition in release pages."

* commit '2dbe40ba5f28734106df7f6339f40809cadcdfb8':
  Fix race condition in release pages.

10 years agoam 8bacfcbe: am 18363662: Merge "Updates to help classes derived from X86Mir2Lir"
Ian Rogers [Sat, 12 Jul 2014 02:06:05 +0000 (02:06 +0000)]
am 8bacfcbe: am 18363662: Merge "Updates to help classes derived from X86Mir2Lir"

* commit '8bacfcbef85ef4c9ca6c091f295bff9da22446a1':
  Updates to help classes derived from X86Mir2Lir

10 years agoam 5ef96966: am da8a6975: Merge "Revert "Revert "Add implicit null and stack checks...
Dave Allison [Sat, 12 Jul 2014 02:06:04 +0000 (02:06 +0000)]
am 5ef96966: am da8a6975: Merge "Revert "Revert "Add implicit null and stack checks for x86"""

* commit '5ef96966e247a055e05394f38f2b53726cd26b8f':
  Revert "Revert "Add implicit null and stack checks for x86""

10 years agoam d084c68b: am 93279da4: Merge "ART: Do not dump hidden basic blocks and add a count...
Ian Rogers [Sat, 12 Jul 2014 02:06:03 +0000 (02:06 +0000)]
am d084c68b: am 93279da4: Merge "ART: Do not dump hidden basic blocks and add a counter to file naming"

* commit 'd084c68b455a42de310fbb08c7d86c752ff51bbb':
  ART: Do not dump hidden basic blocks and add a counter to file naming

10 years agoam b251d751: am 5a8ecafb: Merge "x86_64: Enable fp-reg promotion"
Andreas Gampe [Sat, 12 Jul 2014 02:06:02 +0000 (02:06 +0000)]
am b251d751: am 5a8ecafb: Merge "x86_64: Enable fp-reg promotion"

* commit 'b251d751404b776a3d5789e003e9481ed7225306':
  x86_64: Enable fp-reg promotion

10 years agoam 7a101553: am 0d2d031c: Merge "Improve the OOME fragmentation message."
Hiroshi Yamauchi [Sat, 12 Jul 2014 02:06:01 +0000 (02:06 +0000)]
am 7a101553: am 0d2d031c: Merge "Improve the OOME fragmentation message."

* commit '7a101553afe596d8c9942b18105f7696f50c6c6d':
  Improve the OOME fragmentation message.

10 years agoam 868d3213: am 477eea4f: Merge "ART: Add Invokes to DecodedInstruction"
Ian Rogers [Sat, 12 Jul 2014 02:06:00 +0000 (02:06 +0000)]
am 868d3213: am 477eea4f: Merge "ART: Add Invokes to DecodedInstruction"

* commit '868d32139c83df89e9a781b65c7c23f8426c341c':
  ART: Add Invokes to DecodedInstruction

10 years agoam 6bc6fa94: am fe12035e: Merge "ART: Handle Extended MIRs in a uniform manner"
Ian Rogers [Sat, 12 Jul 2014 02:05:59 +0000 (02:05 +0000)]
am 6bc6fa94: am fe12035e: Merge "ART: Handle Extended MIRs in a uniform manner"

* commit '6bc6fa94f311feb6dc6297d90d4743144701df0a':
  ART: Handle Extended MIRs in a uniform manner

10 years agoam 34344502: am 49b874b6: Merge "ART: Detached blocks should not be processed by...
Ian Rogers [Sat, 12 Jul 2014 02:05:58 +0000 (02:05 +0000)]
am 34344502: am 49b874b6: Merge "ART: Detached blocks should not be processed by compiler"

* commit '3434450273d5a1466586ed3c05dba0fada279ba1':
  ART: Detached blocks should not be processed by compiler

10 years agoam 33103084: am f894f639: Merge "ART: Rename CallInlining to SpecialMethodInliner"
Vladimir Marko [Sat, 12 Jul 2014 02:05:57 +0000 (02:05 +0000)]
am 33103084: am f894f639: Merge "ART: Rename CallInlining to SpecialMethodInliner"

* commit '33103084699cd1522f5c4f572944dc12c785e317':
  ART: Rename CallInlining to SpecialMethodInliner

10 years agoam bb15384e: am adce33da: Merge "Make CAS operations in Object use art::Atomic."
Ian Rogers [Sat, 12 Jul 2014 02:05:56 +0000 (02:05 +0000)]
am bb15384e: am adce33da: Merge "Make CAS operations in Object use art::Atomic."

* commit 'bb15384e41f4c0f28207bb02c8a84df0de29b1e7':
  Make CAS operations in Object use art::Atomic.

10 years agoam 0ae44744: am cba6b1fc: Merge "ART: Enable some ARM64 optimizations."
Andreas Gampe [Sat, 12 Jul 2014 02:05:55 +0000 (02:05 +0000)]
am 0ae44744: am cba6b1fc: Merge "ART: Enable some ARM64 optimizations."

* commit '0ae447446b5aca19cd1596657c846a265ab27d5b':

10 years agoam 3c5f5d7e: am 5fa647d5: Merge "Slow path for iget should expect return in core...
Andreas Gampe [Sat, 12 Jul 2014 02:05:54 +0000 (02:05 +0000)]
am 3c5f5d7e: am 5fa647d5: Merge "Slow path for iget should expect return in core reg"

* commit '3c5f5d7ef9402f831324f18dd9d27f7101d065e9':

10 years agoam 02c127af: am fb16129c: Merge "Global Value Numbering."
Vladimir Marko [Sat, 12 Jul 2014 02:05:52 +0000 (02:05 +0000)]
am 02c127af: am fb16129c: Merge "Global Value Numbering."

* commit '02c127af6d4b10b1ef62e2fe29f360e49faab8df':

10 years agoam 43eb9ea4: am b26d1905: Merge "ART: Refactor frontend.cc"
Andreas Gampe [Sat, 12 Jul 2014 02:05:51 +0000 (02:05 +0000)]
am 43eb9ea4: am b26d1905: Merge "ART: Refactor frontend.cc"

* commit '43eb9ea488995d5f38c3ed43c2059d4c89808811':

10 years agoam eef893a5: am 50fb2436: Merge "Handle potential <clinit>() correctly in LVN."
Vladimir Marko [Sat, 12 Jul 2014 02:05:50 +0000 (02:05 +0000)]
am eef893a5: am 50fb2436: Merge "Handle potential <clinit>() correctly in LVN."

* commit 'eef893a5dc10eb0514ed24fe7c196a31a49baccb':

10 years agoam b6c6be75: am 723b2fc3: Merge "Faster deduplication in OatWriter."
Vladimir Marko [Sat, 12 Jul 2014 02:05:49 +0000 (02:05 +0000)]
am b6c6be75: am 723b2fc3: Merge "Faster deduplication in OatWriter."

* commit 'b6c6be75fe68c823b5f4a82cad1c1b84362517e1':

10 years agoam bfb67693: am b2bc3c97: Merge "Fix GC to use art::Atomic rather than compiler intri...
Ian Rogers [Sat, 12 Jul 2014 02:05:48 +0000 (02:05 +0000)]
am bfb67693: am b2bc3c97: Merge "Fix GC to use art::Atomic rather than compiler intrinsics."

* commit 'bfb676939a206abc96d04bb023b1ac28be50f51f':

10 years agoam b982fd26: am c4f72ec4: Merge "Use memory chunks for monitors on LP64"
Andreas Gampe [Sat, 12 Jul 2014 02:05:47 +0000 (02:05 +0000)]
am b982fd26: am c4f72ec4: Merge "Use memory chunks for monitors on LP64"

* commit 'b982fd260289a3ddcbae1a41437dfbdccdf673aa':

10 years agoam 0fd207a3: am af4cf5d7: Merge "Missed use of android_atomic and thread state_."
Ian Rogers [Sat, 12 Jul 2014 02:05:46 +0000 (02:05 +0000)]
am 0fd207a3: am af4cf5d7: Merge "Missed use of android_atomic and thread state_."

* commit '0fd207a3d6a54b753951d5a80e56f39eefe146be':

10 years agoam eb97d87d: am 070dfc4c: Merge "Fix tracing."
Ian Rogers [Sat, 12 Jul 2014 02:05:45 +0000 (02:05 +0000)]
am eb97d87d: am 070dfc4c: Merge "Fix tracing."

* commit 'eb97d87d62ee3c4e9f8f396dd05912178be35d58':

10 years agoam 169b5860: am d8079288: Merge "art: fix host dex2oat runtime args"
Colin Cross [Sat, 12 Jul 2014 02:05:44 +0000 (02:05 +0000)]
am 169b5860: am d8079288: Merge "art: fix host dex2oat runtime args"

* commit '169b586058d4f8d7e32522fdafdfb0fb55b945a9':

10 years agoam f7d44f20: am 62526c37: Merge "Move thread state to art::Atomic."
Ian Rogers [Sat, 12 Jul 2014 02:05:43 +0000 (02:05 +0000)]
am f7d44f20: am 62526c37: Merge "Move thread state to art::Atomic."

* commit 'f7d44f209532aaa9252b397dfec90cabb4baeb6b':

10 years agoam 064b7838: am 43b6fe02: Merge "Move another field away from android_atomic_cas."
Ian Rogers [Sat, 12 Jul 2014 02:05:42 +0000 (02:05 +0000)]
am 064b7838: am 43b6fe02: Merge "Move another field away from android_atomic_cas."

* commit '064b78385fa24d8d0c942a25625db67dd338ce25':

10 years agoam 46d8f384: am 672f8367: Merge "Revert "Add implicit null and stack checks for x86""
Dave Allison [Sat, 12 Jul 2014 02:05:41 +0000 (02:05 +0000)]
am 46d8f384: am 672f8367: Merge "Revert "Add implicit null and stack checks for x86""

* commit '46d8f384241a8401d99e8e921a6b98c26684ebfa':

10 years agoam da3e7b4c: am 4770a2e6: Merge "Remove legacy CAS implementations from mutex."
Ian Rogers [Sat, 12 Jul 2014 02:05:40 +0000 (02:05 +0000)]
am da3e7b4c: am 4770a2e6: Merge "Remove legacy CAS implementations from mutex."

* commit 'da3e7b4c3468bd278f4f2dd203d281b3b4819bd3':

10 years agoam 1acde32d: am bcb3b290: Merge "Add notion of released vs empty pages to ROSAlloc."
Mathieu Chartier [Sat, 12 Jul 2014 02:05:39 +0000 (02:05 +0000)]
am 1acde32d: am bcb3b290: Merge "Add notion of released vs empty pages to ROSAlloc."

* commit '1acde32d8c3f02aca763fd944945222011612d15':

10 years agoam bc8c613d: am 5de52242: Merge "Add implicit null and stack checks for x86"
Dave Allison [Sat, 12 Jul 2014 02:05:38 +0000 (02:05 +0000)]
am bc8c613d: am 5de52242: Merge "Add implicit null and stack checks for x86"

* commit 'bc8c613d2b8a276646827d51f839ad5d71fbedf1':

10 years agoam 82001c65: am 2929490d: Merge "Move card table away from android_atomic_cas."
Ian Rogers [Sat, 12 Jul 2014 02:05:37 +0000 (02:05 +0000)]
am 82001c65: am 2929490d: Merge "Move card table away from android_atomic_cas."

* commit '82001c65e2ceee6b4c6b2289632a33924b6f074c':

10 years agoam 967ba5f0: am 5472edce: Merge "CW on Master: Propagate or throw exception when...
Brian Carlstrom [Sat, 12 Jul 2014 02:05:36 +0000 (02:05 +0000)]
am 967ba5f0: am 5472edce: Merge "CW on Master: Propagate or throw exception when no class found happens in interpreter."

* commit '967ba5f0127cc8965d796d707e1318ec435ffaf0':

10 years agoam ed7d47c5: am b288a5ad: Merge "Use the icu4c headers from the new location."
Elliott Hughes [Sat, 12 Jul 2014 02:05:35 +0000 (02:05 +0000)]
am ed7d47c5: am b288a5ad: Merge "Use the icu4c headers from the new location."

* commit 'ed7d47c5901e32da3f7595cd6f4a25cae95d5f69':

10 years agoam 68fa0918: am 91db19b5: Merge "ART: Add simple tests for inlining of CAS"
Andreas Gampe [Sat, 12 Jul 2014 02:05:35 +0000 (02:05 +0000)]
am 68fa0918: am 91db19b5: Merge "ART: Add simple tests for inlining of CAS"

* commit '68fa0918e05c3f9bc54b89d07552a3e0b007b91c':

10 years agoam f2f3bd26: am ef9b94cc: Merge "Add easy way to ensure the next allocation does...
Mathieu Chartier [Sat, 12 Jul 2014 02:05:33 +0000 (02:05 +0000)]
am f2f3bd26: am ef9b94cc: Merge "Add easy way to ensure the next allocation does GC."

* commit 'f2f3bd268d41835ea3be37b9c285b77e5ab32823':

10 years agoam e5526e76: am b796d1bf: Merge "Remove incorrect check for sa_mask in signal chaining"
Dave Allison [Sat, 12 Jul 2014 02:05:33 +0000 (02:05 +0000)]
am e5526e76: am b796d1bf: Merge "Remove incorrect check for sa_mask in signal chaining"

* commit 'e5526e76c6180989914b2fbe9062a8b5d7bddf5b':

10 years agoam d19bab58: am c21dc06a: Merge "ART: Check slow_paths_.Size() every time"
Ian Rogers [Sat, 12 Jul 2014 02:05:32 +0000 (02:05 +0000)]
am d19bab58: am c21dc06a: Merge "ART: Check slow_paths_.Size() every time"

* commit 'd19bab58e186aaa6564473c6d49061aba1032a79':

10 years agoam 206f94b5: am 68e5f442: Merge "x86_64: GenInlinedCas must use wide rl_src_offset...
Ian Rogers [Sat, 12 Jul 2014 02:05:31 +0000 (02:05 +0000)]
am 206f94b5: am 68e5f442: Merge "x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets"

* commit '206f94b5f2f585f0af1bbefff44e834d9a776d00':

10 years agoam 7fde2076: am a76dc41f: Merge "Allow method tracing for run-test"
Ian Rogers [Sat, 12 Jul 2014 02:05:30 +0000 (02:05 +0000)]
am 7fde2076: am a76dc41f: Merge "Allow method tracing for run-test"

* commit '7fde2076d8f44ee0e05ceee3f7953113a9d308a6':

10 years agoam c860df11: am 0f635b10: Merge "Fix method tracing from command-line"
Ian Rogers [Sat, 12 Jul 2014 02:05:29 +0000 (02:05 +0000)]
am c860df11: am 0f635b10: Merge "Fix method tracing from command-line"

* commit 'c860df11e6ed9d4af599a28c484ecf692db9b541':

10 years agoam a892b0e0: am 32710dd4: Merge "x86_64: enable Peek and Poke intrinsics"
Ian Rogers [Sat, 12 Jul 2014 02:05:28 +0000 (02:05 +0000)]
am a892b0e0: am 32710dd4: Merge "x86_64: enable Peek and Poke intrinsics"

* commit 'a892b0e0b0c9e5c95adb6151e11d68cedb033c39':

10 years agoam 3af030b4: am 62f28f94: Merge "Fix a compile assert name with inverted meaning."
Vladimir Marko [Sat, 12 Jul 2014 02:05:28 +0000 (02:05 +0000)]
am 3af030b4: am 62f28f94: Merge "Fix a compile assert name with inverted meaning."

* commit '3af030b499e6a0f7b91a1fd365aaf96d30bc476f':

10 years agoam 7e001a86: am 665f6810: Merge "Workaround for invalid monitor-exit catch ranges."
Vladimir Marko [Sat, 12 Jul 2014 02:05:27 +0000 (02:05 +0000)]
am 7e001a86: am 665f6810: Merge "Workaround for invalid monitor-exit catch ranges."

* commit '7e001a86a201a8e463b260b01eb339fa1d54c69c':

10 years agoam 2596abd8: am 8078b294: Merge "Revert "ART: Key-Value Store in Oat header""
Nicolas Geoffray [Sat, 12 Jul 2014 02:05:26 +0000 (02:05 +0000)]
am 2596abd8: am 8078b294: Merge "Revert "ART: Key-Value Store in Oat header""

* commit '2596abd85166880bc5b4613880aac5960fad2ef5':

10 years agoam 34ef0b10: am 608520c8: Merge "Adds PGO_GEN and PGO_USE for libart and libart-compi...
Ian Rogers [Sat, 12 Jul 2014 02:05:25 +0000 (02:05 +0000)]
am 34ef0b10: am 608520c8: Merge "Adds PGO_GEN and PGO_USE for libart and libart-compiler."

* commit '34ef0b1098fd3df0e12a656a5eab83ee77c8ad80':

10 years agoam 4aabec65: am 2cfe30bd: Merge "X86 Backend support for vectorized float and byte...
Ian Rogers [Sat, 12 Jul 2014 02:05:24 +0000 (02:05 +0000)]
am 4aabec65: am 2cfe30bd: Merge "X86 Backend support for vectorized float and byte 16x16 operations"

* commit '4aabec657b8072ab9588939931608b5e2a026269':

10 years agoam 4298bb21: am 7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"
Ian Rogers [Sat, 12 Jul 2014 02:05:24 +0000 (02:05 +0000)]
am 4298bb21: am 7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"

* commit '4298bb219db34a83e18d7a8432fc473238a089de':

10 years agoam 76abd810: am dfc56e68: Merge "Clean-up call_x86.cc"
Ian Rogers [Sat, 12 Jul 2014 02:05:23 +0000 (02:05 +0000)]
am 76abd810: am dfc56e68: Merge "Clean-up call_x86.cc"

* commit '76abd810f2a55f32e16648b13a22dd8e26cc85dc':

10 years agoam 10eddabd: am 251a057f: Merge "ART: Fix FP promotion"
Andreas Gampe [Sat, 12 Jul 2014 02:05:22 +0000 (02:05 +0000)]
am 10eddabd: am 251a057f: Merge "ART: Fix FP promotion"

* commit '10eddabde056f8b4a132902508a7f6b03d4bb34b':

10 years agoam cf16ca16: am dac3f4af: Merge "Whitelist another exception during dex2oat resolving."
Brian Carlstrom [Sat, 12 Jul 2014 02:05:21 +0000 (02:05 +0000)]
am cf16ca16: am dac3f4af: Merge "Whitelist another exception during dex2oat resolving."

* commit 'cf16ca1635df0d04668b09e47563b872f513c6fe':

10 years agoam a01ea93d: am 6e524ddc: Merge "Make dex2oat heap size product configurable [art]"
Brian Carlstrom [Sat, 12 Jul 2014 02:05:21 +0000 (02:05 +0000)]
am a01ea93d: am 6e524ddc: Merge "Make dex2oat heap size product configurable [art]"

* commit 'a01ea93dc0c11050733d23c6e308aa9b7fa5f622':

10 years agoam 180c2a6d: am 3d30b073: Merge "ART: Do not emit load when inlining unused Thread...
Andreas Gampe [Sat, 12 Jul 2014 02:05:20 +0000 (02:05 +0000)]
am 180c2a6d: am 3d30b073: Merge "ART: Do not emit load when inlining unused Thread.currentThread()"

* commit '180c2a6db74754975bcce008f49b45a6c9dc2e33':

10 years agoam 69f915f9: am 8746860d: Merge "Only allow instance-of to improve knowledge of a...
Ian Rogers [Sat, 12 Jul 2014 02:05:19 +0000 (02:05 +0000)]
am 69f915f9: am 8746860d: Merge "Only allow instance-of to improve knowledge of a type for downcasts."

* commit '69f915f9d7b83f342fcda28f68729eebcc557940':

10 years agoam 8c472818: Merge "ART: Compacting ROS/DlMalloc spaces with semispace copy GC"
Mathieu Chartier [Sat, 12 Jul 2014 01:42:18 +0000 (01:42 +0000)]
am 8c472818: Merge "ART: Compacting ROS/DlMalloc spaces with semispace copy GC"

* commit '8c4728186f038e2ae09e74cbdcef5e5ca598ba64':
  ART: Compacting ROS/DlMalloc spaces with semispace copy GC

10 years agoam 9531f62e: Merge "Call strong CAS from unsafe. Add more CAS versions."
Hans Boehm [Sat, 12 Jul 2014 01:42:18 +0000 (01:42 +0000)]
am 9531f62e: Merge "Call strong CAS from unsafe. Add more CAS versions."

* commit '9531f62ef260cbd0d0512e4c96f5d5dd2f4fdbb2':
  Call strong CAS from unsafe. Add more CAS versions.

10 years agoam f08f0ca4: Merge "Improve performance of invokevirtual/invokeinterface with embedde...
Ian Rogers [Sat, 12 Jul 2014 01:42:17 +0000 (01:42 +0000)]
am f08f0ca4: Merge "Improve performance of invokevirtual/invokeinterface with embedded imt/vtable"

* commit 'f08f0ca4b9538bff516f354532ced57cf077da66':
  Improve performance of invokevirtual/invokeinterface with embedded imt/vtable

10 years agoam 3d71f321: Merge "ART: Change GenPCUseDefEncoding(), turn on Load Hoisting for...
Andreas Gampe [Sat, 12 Jul 2014 01:42:16 +0000 (01:42 +0000)]
am 3d71f321: Merge "ART: Change GenPCUseDefEncoding(), turn on Load Hoisting for ARM64"

* commit '3d71f321f4b87ba13113dc0457fd9c3470a2b380':
  ART: Change GenPCUseDefEncoding(), turn on Load Hoisting for ARM64

10 years agoam aebf3cda: Merge "Replace memory barriers to better reflect Java needs."
Hans Boehm [Sat, 12 Jul 2014 01:42:16 +0000 (01:42 +0000)]
am aebf3cda: Merge "Replace memory barriers to better reflect Java needs."

* commit 'aebf3cda094f34cf846d19a7724bdc8005267c95':
  Replace memory barriers to better reflect Java needs.

10 years agoam 2751ffbe: Merge "Faster TLAB allocator."
Mathieu Chartier [Sat, 12 Jul 2014 01:42:16 +0000 (01:42 +0000)]
am 2751ffbe: Merge "Faster TLAB allocator."

* commit '2751ffbe4e3192395e7402f93b597a397f01f889':
  Faster TLAB allocator.

10 years agoam bfe9d08e: Merge "Fix mac build."
Christopher Ferris [Sat, 12 Jul 2014 01:42:16 +0000 (01:42 +0000)]
am bfe9d08e: Merge "Fix mac build."

* commit 'bfe9d08e93f6b866e7ecc63f32083e3fc868e606':
  Fix mac build.

10 years agoam 438b9039: Merge "Make jemalloc the default choice."
Christopher Ferris [Sat, 12 Jul 2014 01:42:15 +0000 (01:42 +0000)]
am 438b9039: Merge "Make jemalloc the default choice."

* commit '438b9039c77b2c9556f362e8cbbefcf21c55b527':
  Make jemalloc the default choice.

10 years agoam 946a55fa: Merge "ART: Fix GenSelect for ARM64"
Andreas Gampe [Sat, 12 Jul 2014 01:42:15 +0000 (01:42 +0000)]
am 946a55fa: Merge "ART: Fix GenSelect for ARM64"

* commit '946a55fa7aec5058d357b601ac3554e242cd1afa':
  ART: Fix GenSelect for ARM64