OSDN Git Service
Andreas Gampe [Mon, 22 Dec 2014 21:19:50 +0000 (21:19 +0000)]
am
ec1fa54f: am
06814c9a: Merge "ART: Mac build fix"
* commit '
ec1fa54fa4327cc4eefe99efa3fd198bc00a29c0':
ART: Mac build fix
Andreas Gampe [Mon, 22 Dec 2014 21:14:23 +0000 (21:14 +0000)]
am
06814c9a: Merge "ART: Mac build fix"
* commit '
06814c9a6e40e8a1e211cd40ebf6431ce4a9721d':
ART: Mac build fix
Andreas Gampe [Mon, 22 Dec 2014 21:07:46 +0000 (21:07 +0000)]
Merge "ART: Mac build fix"
Andreas Gampe [Mon, 22 Dec 2014 21:06:44 +0000 (13:06 -0800)]
ART: Mac build fix
Unused parameter on Mac.
Bug:
18596910
Change-Id: If0fab0b58173997d584fcdce195361d792f1098d
Andreas Gampe [Mon, 22 Dec 2014 19:42:16 +0000 (19:42 +0000)]
am
57536212: am
460bb2c6: Merge "ART: Do not compile swap file functionality on Mac"
* commit '
575362127d558cebdd8a092e65141e2b369f27fe':
ART: Do not compile swap file functionality on Mac
Andreas Gampe [Mon, 22 Dec 2014 19:36:46 +0000 (19:36 +0000)]
am
460bb2c6: Merge "ART: Do not compile swap file functionality on Mac"
* commit '
460bb2c6dad7ff9637f148177689598cc6f66486':
ART: Do not compile swap file functionality on Mac
Andreas Gampe [Mon, 22 Dec 2014 19:33:15 +0000 (19:33 +0000)]
Merge "ART: Do not compile swap file functionality on Mac"
Andreas Gampe [Fri, 19 Dec 2014 20:04:06 +0000 (12:04 -0800)]
ART: Do not compile swap file functionality on Mac
Bug:
18596910
(cherry picked from commit
8a9f0049821803051201edebc6d9a0f0639756c3)
Change-Id: Ic06429f41840ce318cfaa837efecc69c2076440e
Andreas Gampe [Mon, 22 Dec 2014 18:39:36 +0000 (18:39 +0000)]
am
be9badda: am
5c79aec9: Merge "ART: Swap-space in the compiler"
* commit '
be9badda80915565f718341f43bc0ec4cae80ca1':
ART: Swap-space in the compiler
Andreas Gampe [Mon, 22 Dec 2014 18:34:08 +0000 (18:34 +0000)]
am
5c79aec9: Merge "ART: Swap-space in the compiler"
* commit '
5c79aec9d53d1320041d5a52e5115d78d16035b7':
ART: Swap-space in the compiler
Andreas Gampe [Mon, 22 Dec 2014 18:30:07 +0000 (18:30 +0000)]
Merge "ART: Swap-space in the compiler"
Andreas Gampe [Tue, 9 Dec 2014 00:59:43 +0000 (16:59 -0800)]
ART: Swap-space in the compiler
Introduce a swap-space and corresponding allocator to transparently
switch native allocations to memory backed by a file.
Bug:
18596910
(cherry picked from commit
62746d8d9c4400e4764f162b22bfb1a32be287a9)
Change-Id: I131448f3907115054a592af73db86d2b9257ea33
Andreas Gampe [Mon, 22 Dec 2014 17:55:51 +0000 (17:55 +0000)]
am
2f9d7a5b: am
508d2665: Merge "ART: Do not JNI abort on nullptr GetObjectRefType"
* commit '
2f9d7a5bf28e26d2f92128cf420a1ce9f9be0ef6':
ART: Do not JNI abort on nullptr GetObjectRefType
Andreas Gampe [Mon, 22 Dec 2014 17:50:07 +0000 (17:50 +0000)]
am
508d2665: Merge "ART: Do not JNI abort on nullptr GetObjectRefType"
* commit '
508d2665febbb06c853bfab131c4dc7164fffabb':
ART: Do not JNI abort on nullptr GetObjectRefType
Andreas Gampe [Mon, 22 Dec 2014 17:43:36 +0000 (17:43 +0000)]
Merge "ART: Do not JNI abort on nullptr GetObjectRefType"
Andreas Gampe [Sat, 20 Dec 2014 08:08:35 +0000 (00:08 -0800)]
ART: Do not JNI abort on nullptr GetObjectRefType
A nullptr is a valid input, as it is different from a null reference.
Bug:
18820997
Change-Id: Ibda8907ba13b20d2055049492a356ffdf4ddc714
Andreas Gampe [Sat, 20 Dec 2014 07:38:20 +0000 (07:38 +0000)]
am
ac7cb841: am
094368ae: Merge "ART: Use interpret-only for vmSafeMode"
* commit '
ac7cb8410068317a6e310c6715a4aae92aa3d637':
ART: Use interpret-only for vmSafeMode
Andreas Gampe [Sat, 20 Dec 2014 07:31:59 +0000 (07:31 +0000)]
am
094368ae: Merge "ART: Use interpret-only for vmSafeMode"
* commit '
094368ae2fa7a4eeaafb44f6018e498c1054af60':
ART: Use interpret-only for vmSafeMode
Andreas Gampe [Sat, 20 Dec 2014 07:25:59 +0000 (07:25 +0000)]
Merge "ART: Use interpret-only for vmSafeMode"
Andreas Gampe [Fri, 19 Dec 2014 17:53:27 +0000 (09:53 -0800)]
ART: Use interpret-only for vmSafeMode
Set the compiler filter when the zygote tells us that the app is
in vmSafeMode. This ensures that secondary dex files will also be
compiled interpret-only.
Bug:
18812762
(cherry picked from commit
44893692bfb25ceb5c7c5b2e5c606948fbdea298)
Change-Id: Idb61870beebe2eeb5b11554f95ea6a725c77f16a
Mathieu Chartier [Sat, 20 Dec 2014 02:22:13 +0000 (02:22 +0000)]
am
779ad82f: am
48e7f337: Merge "Add heap task processor"
* commit '
779ad82fbb69338720c84af574a5f152297b1076':
Add heap task processor
Mathieu Chartier [Sat, 20 Dec 2014 02:12:09 +0000 (02:12 +0000)]
am
48e7f337: Merge "Add heap task processor"
* commit '
48e7f3374eb6f042c12cd540ce73c7cddc366bb4':
Add heap task processor
Mathieu Chartier [Sat, 20 Dec 2014 02:01:01 +0000 (02:01 +0000)]
Merge "Add heap task processor"
Mathieu Chartier [Thu, 18 Dec 2014 01:56:03 +0000 (17:56 -0800)]
Add heap task processor
The heap task processor processes async tasks which may be delayed.
The motivation for this change is preventing deadlocks which
can occur when the daemon threads get suspended by GetThreadStack.
Other improvements, reduces daemon thread count by one.
Cleaner pending transition VS heap trimming logic.
Bug:
18739541
Change-Id: Idab52b2d9661a6385cada74b93ff297ddc55fc78
Vladimir Marko [Fri, 19 Dec 2014 23:06:23 +0000 (23:06 +0000)]
am
45f28157: am
a02bd15a: Merge "Fix running out of temps when storing invoke-interface result."
* commit '
45f281572cb307604bf26d2d07f8f94e36f2f387':
Fix running out of temps when storing invoke-interface result.
Vladimir Marko [Fri, 19 Dec 2014 23:00:48 +0000 (23:00 +0000)]
am
a02bd15a: Merge "Fix running out of temps when storing invoke-interface result."
* commit '
a02bd15aa43d7583560ec81e57ae0d350ff9a3d5':
Fix running out of temps when storing invoke-interface result.
Vladimir Marko [Fri, 19 Dec 2014 22:54:57 +0000 (22:54 +0000)]
Merge "Fix running out of temps when storing invoke-interface result."
Vladimir Marko [Fri, 19 Dec 2014 22:16:47 +0000 (22:16 +0000)]
resolved conflicts for merge of
c123642c to lmp-mr1-dev-plus-aosp
Change-Id: I7441e91ee4865571258fd64b6a9b49c42523c252
Andreas Gampe [Fri, 19 Dec 2014 22:12:52 +0000 (22:12 +0000)]
am
9999ca45: (-s ours) am
8a9f0049: ART: Do not compile swap file functionality on Mac
* commit '
9999ca4532df87eadca93b034e7bb9bb491890b5':
ART: Do not compile swap file functionality on Mac
Vladimir Marko [Fri, 19 Dec 2014 21:32:25 +0000 (21:32 +0000)]
am
091f9543: Merge "Fix running out of temps when storing invoke-interface result." into lmp-mr1-dev
* commit '
091f954303f97bd280c4c7800c130bd198ff1165':
Fix running out of temps when storing invoke-interface result.
Andreas Gampe [Fri, 19 Dec 2014 21:32:24 +0000 (21:32 +0000)]
am
8a9f0049: ART: Do not compile swap file functionality on Mac
* commit '
8a9f0049821803051201edebc6d9a0f0639756c3':
ART: Do not compile swap file functionality on Mac
Vladimir Marko [Fri, 19 Dec 2014 19:27:26 +0000 (19:27 +0000)]
Fix running out of temps when storing invoke-interface result.
On ARM, after emitting invoke-interface we didn't have any
free temps to use for storing the result, so we would crash
if the result was an unpromoted dalvik register with stack
location too far from SP.
Bug:
18769895
(cherry picked from commit
d6bd06c713e8ec69de96510ef57bdf7adb4781ed)
Change-Id: Id88f6f3788eaf6ecbc7bd68880b445423f6e4f94
Vladimir Marko [Fri, 19 Dec 2014 21:27:35 +0000 (21:27 +0000)]
Merge "Fix running out of temps when storing invoke-interface result." into lmp-mr1-dev
Andreas Gampe [Fri, 19 Dec 2014 20:04:06 +0000 (12:04 -0800)]
ART: Do not compile swap file functionality on Mac
Bug:
18596910
Change-Id: Ic06429f41840ce318cfaa837efecc69c2076440e
Vladimir Marko [Fri, 19 Dec 2014 19:27:26 +0000 (19:27 +0000)]
Fix running out of temps when storing invoke-interface result.
On ARM, after emitting invoke-interface we didn't have any
free temps to use for storing the result, so we would crash
if the result was an unpromoted dalvik register with stack
location too far from SP.
Bug:
18769895
Change-Id: Ie6c131d68f1853a8317b305a22eab22faea80e90
Hiroshi Yamauchi [Fri, 19 Dec 2014 20:27:31 +0000 (20:27 +0000)]
am
8d973f3b: am
fa28ef01: Merge "Pass the real capacity to CreateRosAlloc."
* commit '
8d973f3b189bda2cafe8df7ac1c341ff83dc87df':
Pass the real capacity to CreateRosAlloc.
Hiroshi Yamauchi [Fri, 19 Dec 2014 20:21:31 +0000 (20:21 +0000)]
am
fa28ef01: Merge "Pass the real capacity to CreateRosAlloc."
* commit '
fa28ef0191e5f65bdf5932675f49d897bdc480b2':
Pass the real capacity to CreateRosAlloc.
Hiroshi Yamauchi [Fri, 19 Dec 2014 20:16:12 +0000 (20:16 +0000)]
Merge "Pass the real capacity to CreateRosAlloc."
Vladimir Marko [Fri, 19 Dec 2014 18:27:00 +0000 (18:27 +0000)]
am
03408bc9: am
e1cb3301: Merge "Move two members out of MIRGraph::temp_::ssa."
* commit '
03408bc9b4c19fc35fa3bb6b94ff5c1c39056b92':
Move two members out of MIRGraph::temp_::ssa.
Vladimir Marko [Fri, 19 Dec 2014 18:21:24 +0000 (18:21 +0000)]
am
e1cb3301: Merge "Move two members out of MIRGraph::temp_::ssa."
* commit '
e1cb3301b9d3afc488a916b6c75bf7e2885eec81':
Move two members out of MIRGraph::temp_::ssa.
Vladimir Marko [Fri, 19 Dec 2014 18:17:26 +0000 (18:17 +0000)]
Merge "Move two members out of MIRGraph::temp_::ssa."
Vladimir Marko [Fri, 19 Dec 2014 18:11:35 +0000 (18:11 +0000)]
Move two members out of MIRGraph::temp_::ssa.
It turns out they are used outside the SSA transformation
by the x86 back-end.
This is a partial revert of
https://android-review.googlesource.com/120571
Change-Id: Ia5cb2988ab0625d8519901124bd4fc184d5f0886
Bill Buzbee [Fri, 19 Dec 2014 18:09:26 +0000 (18:09 +0000)]
am
8bb4b5d0: am
a64d0142: Merge "ART: Implement FP packed reduce for x86"
* commit '
8bb4b5d0fcda8eb61b341dbcccf2c8a11b6cb944':
ART: Implement FP packed reduce for x86
Bill Buzbee [Fri, 19 Dec 2014 18:04:07 +0000 (18:04 +0000)]
am
a64d0142: Merge "ART: Implement FP packed reduce for x86"
* commit '
a64d0142edd7c325c0a59d170d8c82c8176faa03':
ART: Implement FP packed reduce for x86
Bill Buzbee [Fri, 19 Dec 2014 17:59:51 +0000 (17:59 +0000)]
Merge "ART: Implement FP packed reduce for x86"
Andreas Gampe [Fri, 19 Dec 2014 17:05:17 +0000 (17:05 +0000)]
am
e4541b66: (-s ours) am
d9ce7fc1: ART: Fix swap space free list
* commit '
e4541b662edd6fa8755665261eaf83430437a1aa':
ART: Fix swap space free list
Andreas Gampe [Fri, 19 Dec 2014 16:46:00 +0000 (16:46 +0000)]
am
d9ce7fc1: ART: Fix swap space free list
* commit '
d9ce7fc19b061be7745d8d8a32bc954a0c62d326':
ART: Fix swap space free list
Vladimir Marko [Fri, 19 Dec 2014 16:29:38 +0000 (16:29 +0000)]
am
7bf97f90: am
db75f3c7: Merge "Clean up dead loops before suspend check elimination."
* commit '
7bf97f90c3024d6b0d6cd5b402601a6cadda358a':
Clean up dead loops before suspend check elimination.
Vladimir Marko [Fri, 19 Dec 2014 16:24:13 +0000 (16:24 +0000)]
am
db75f3c7: Merge "Clean up dead loops before suspend check elimination."
* commit '
db75f3c7999395eeeded417e7db06194bf2dc608':
Clean up dead loops before suspend check elimination.
Vladimir Marko [Fri, 19 Dec 2014 16:21:08 +0000 (16:21 +0000)]
Merge "Clean up dead loops before suspend check elimination."
Vladimir Marko [Fri, 19 Dec 2014 15:47:50 +0000 (15:47 +0000)]
am
6507eeb4: am
202eaaf2: Merge "Clean up post-opt passes, perform only those we need."
* commit '
6507eeb4bce520294b72f6cb2f440d90c76acdbe':
Clean up post-opt passes, perform only those we need.
Vladimir Marko [Fri, 19 Dec 2014 15:42:16 +0000 (15:42 +0000)]
am
202eaaf2: Merge "Clean up post-opt passes, perform only those we need."
* commit '
202eaaf26ac4ec67fab479e181dbd2507737ff65':
Clean up post-opt passes, perform only those we need.
Vladimir Marko [Fri, 19 Dec 2014 15:34:09 +0000 (15:34 +0000)]
Merge "Clean up post-opt passes, perform only those we need."
Vladimir Marko [Fri, 19 Dec 2014 10:29:51 +0000 (10:29 +0000)]
Clean up dead loops before suspend check elimination.
Get rid of BasicBlock::KillUnreachable() and just Kill()
unreachable blocks from the DFS order calculation.
Bug:
18718277
Change-Id: Icaf7b9c2320530e950f87e1e2e2bd1fa5f53cb98
Vladimir Marko [Fri, 19 Dec 2014 14:43:15 +0000 (14:43 +0000)]
am
435dea07: am
c146d498: Merge "Clean up MIRGraph::CanThrow()."
* commit '
435dea0748bdff504e55dbb0d66d9703dd227781':
Clean up MIRGraph::CanThrow().
Vladimir Marko [Fri, 19 Dec 2014 14:37:44 +0000 (14:37 +0000)]
am
c146d498: Merge "Clean up MIRGraph::CanThrow()."
* commit '
c146d498a184243d9100e94861f519a7378bfa68':
Clean up MIRGraph::CanThrow().
Vladimir Marko [Fri, 19 Dec 2014 14:32:07 +0000 (14:32 +0000)]
Merge "Clean up MIRGraph::CanThrow()."
Vladimir Marko [Thu, 18 Dec 2014 17:01:02 +0000 (17:01 +0000)]
Clean up MIRGraph::CanThrow().
Merge with the code from CombineBlocks().
Change-Id: I73c71286acba1b6042f85f0bd19c525450ce9c05
Vladimir Marko [Thu, 18 Dec 2014 17:05:58 +0000 (17:05 +0000)]
Clean up post-opt passes, perform only those we need.
Change-Id: If802074d780d91151d236ef52236b6f33ca47258
Calin Juravle [Fri, 19 Dec 2014 11:03:37 +0000 (11:03 +0000)]
am
a11de882: am
363bd99a: Merge "Fixed CanBeMoved for field access"
* commit '
a11de882f2a43b5749223d2430ce5d4189661394':
Fixed CanBeMoved for field access
Calin Juravle [Fri, 19 Dec 2014 10:57:53 +0000 (10:57 +0000)]
am
363bd99a: Merge "Fixed CanBeMoved for field access"
* commit '
363bd99a72eba9be223e45e97d5c46dda2b81580':
Fixed CanBeMoved for field access
Calin Juravle [Fri, 19 Dec 2014 10:51:16 +0000 (10:51 +0000)]
Merge "Fixed CanBeMoved for field access"
Calin Juravle [Fri, 19 Dec 2014 10:50:19 +0000 (10:50 +0000)]
Fixed CanBeMoved for field access
Change-Id: I36a1f4a468f3701e0608d71f64d64049c54aec18
Calin Juravle [Fri, 19 Dec 2014 10:21:04 +0000 (10:21 +0000)]
am
fcd013e5: am
86632a79: Merge "[optimizing compiler] Add support for volatile"
* commit '
fcd013e515f13fef9881837b0084b89149ea6e6f':
[optimizing compiler] Add support for volatile
Calin Juravle [Fri, 19 Dec 2014 10:15:10 +0000 (10:15 +0000)]
am
86632a79: Merge "[optimizing compiler] Add support for volatile"
* commit '
86632a79ae3887bc07c7c07642c7044369837d90':
[optimizing compiler] Add support for volatile
Calin Juravle [Fri, 19 Dec 2014 10:11:25 +0000 (10:11 +0000)]
Merge "[optimizing compiler] Add support for volatile"
Calin Juravle [Tue, 16 Dec 2014 17:02:57 +0000 (17:02 +0000)]
[optimizing compiler] Add support for volatile
- for backends: arm, x86, x86_64
- added necessary instructions to assemblies
- clean up code gen for field set/get
- fixed InstructionDataEquals for some instructions
- fixed comments in compiler_enums
* 003-opcode test verifies basic volatile functionality
Change-Id: I144393efa312dfb2c332cb84056b00edffee338a
Andreas Gampe [Fri, 19 Dec 2014 08:14:38 +0000 (00:14 -0800)]
ART: Fix swap space free list
You should look for the element's size, not the freed size, when
coalescing nodes.
Bug:
18809642
Change-Id: I0c4396d52ef68f392f1e8c76a57e3fb5587b77fb
Hiroshi Yamauchi [Fri, 19 Dec 2014 05:19:24 +0000 (21:19 -0800)]
Pass the real capacity to CreateRosAlloc.
Bug:
18808732
Change-Id: Id563eb22e8d571c0ef032628b6ba2f3d357fd002
Andreas Gampe [Fri, 19 Dec 2014 04:08:05 +0000 (04:08 +0000)]
am
e3122d36: (-s ours) am
62746d8d: ART: Swap-space in the compiler
* commit '
e3122d3612ebc76ac3e9c501f3c913a6606335e9':
ART: Swap-space in the compiler
Mathieu Chartier [Fri, 19 Dec 2014 03:52:29 +0000 (03:52 +0000)]
am
14b491b2: am
6d1a047b: Merge "Only dump suspend all histogram if we have samples"
* commit '
14b491b2f19ad45cab77ace89df24a320e427ae6':
Only dump suspend all histogram if we have samples
Andreas Gampe [Fri, 19 Dec 2014 03:52:27 +0000 (03:52 +0000)]
am
2d51b09c: am
16b10882: Merge "ART: Fix oatdump"
* commit '
2d51b09c524a56b31cbb8a6f6f30e31992378e67':
ART: Fix oatdump
Mathieu Chartier [Fri, 19 Dec 2014 03:39:23 +0000 (03:39 +0000)]
am
6d1a047b: Merge "Only dump suspend all histogram if we have samples"
* commit '
6d1a047b4b3f9707d4ee1cc19e99717ee021ef48':
Only dump suspend all histogram if we have samples
Andreas Gampe [Fri, 19 Dec 2014 03:39:21 +0000 (03:39 +0000)]
am
16b10882: Merge "ART: Fix oatdump"
* commit '
16b10882f4ce9e5822b278ef0b0adf83afa1b334':
ART: Fix oatdump
Andreas Gampe [Fri, 19 Dec 2014 03:33:09 +0000 (03:33 +0000)]
am
62746d8d: ART: Swap-space in the compiler
* commit '
62746d8d9c4400e4764f162b22bfb1a32be287a9':
ART: Swap-space in the compiler
Mathieu Chartier [Fri, 19 Dec 2014 02:32:37 +0000 (02:32 +0000)]
Merge "Only dump suspend all histogram if we have samples"
Mathieu Chartier [Fri, 19 Dec 2014 02:24:39 +0000 (18:24 -0800)]
Only dump suspend all histogram if we have samples
Helps fix gcstress ThreadStress.
Bug:
18576985
Change-Id: Ibebc0fed8a21e7b149f4b6e5154fb86deddcc68f
Andreas Gampe [Fri, 19 Dec 2014 01:43:30 +0000 (01:43 +0000)]
Merge "ART: Fix oatdump"
Andreas Gampe [Tue, 9 Dec 2014 00:59:43 +0000 (16:59 -0800)]
ART: Swap-space in the compiler
Introduce a swap-space and corresponding allocator to transparently
switch native allocations to memory backed by a file.
Bug:
18596910
Change-Id: I131448f3907115054a592af73db86d2b9257ea33
Vladimir Marko [Thu, 18 Dec 2014 22:10:55 +0000 (22:10 +0000)]
am
464a49c3: am
193c7a94: Merge "Fix Thumb2 Emit16BitAddSub() to keep full immediate."
* commit '
464a49c3f3e1937b1d0fa6abbc1b2d87eac8b8da':
Fix Thumb2 Emit16BitAddSub() to keep full immediate.
Nicolas Geoffray [Thu, 18 Dec 2014 21:50:58 +0000 (21:50 +0000)]
am
05e99cb5: am
6048838a: Merge "Revert "Don\'t block quick callee saved registers for optimizing.""
* commit '
05e99cb5989c928b45f1fdcdf5dd71ec5415cc68':
Revert "Don't block quick callee saved registers for optimizing."
Vladimir Marko [Thu, 18 Dec 2014 21:50:33 +0000 (21:50 +0000)]
am
6e58cacf: am
ca747ea9: Merge "Fix Thumb2 assembler to emit 16-bit add/sub SP, #imm."
* commit '
6e58cacfd606b38647f81e61daa818a473f8c946':
Fix Thumb2 assembler to emit 16-bit add/sub SP, #imm.
Nicolas Geoffray [Thu, 18 Dec 2014 21:50:31 +0000 (21:50 +0000)]
am
dff1fc2d: am
aa94a95d: Merge "Explicitly compile core.oat with the Quick compiler."
* commit '
dff1fc2da1b9d856bd326b51042e8fa649901111':
Explicitly compile core.oat with the Quick compiler.
Nicolas Geoffray [Thu, 18 Dec 2014 21:50:30 +0000 (21:50 +0000)]
am
b1ed192d: am
e408f8c6: Merge "Don\'t block quick callee saved registers for optimizing."
* commit '
b1ed192dbd0cc83b18a2255b4e0b533c69da17b7':
Don't block quick callee saved registers for optimizing.
Nicolas Geoffray [Thu, 18 Dec 2014 21:50:28 +0000 (21:50 +0000)]
am
cadfa1ac: am
452a8bec: Merge "When inlining, also look whether we can allocate registers."
* commit '
cadfa1ac85c238101a5e01d96702dc0c79678da5':
When inlining, also look whether we can allocate registers.
Sebastien Hertz [Thu, 18 Dec 2014 21:50:22 +0000 (21:50 +0000)]
am
8bd39ca5: am
fcd3f33d: Merge "Use correct handle scope offset from StackVisitor"
* commit '
8bd39ca574c4427498b56948c9500d01aa59e5a4':
Use correct handle scope offset from StackVisitor
Sebastien Hertz [Thu, 18 Dec 2014 21:50:20 +0000 (21:50 +0000)]
am
6a48b85b: am
58a1c07b: Merge "Cleanup JDWP event matching"
* commit '
6a48b85b0ed6094230d69fb3f36a8b9fdf66b5bd':
Cleanup JDWP event matching
Hiroshi Yamauchi [Thu, 18 Dec 2014 21:50:16 +0000 (21:50 +0000)]
am
d8af5ce6: am
7c378e4b: Merge "Fix a race condition during the rosalloc verification."
* commit '
d8af5ce625126fc2ad297e81c36f88088d6c20fd':
Fix a race condition during the rosalloc verification.
Mathieu Chartier [Thu, 18 Dec 2014 21:50:13 +0000 (21:50 +0000)]
am
8ba6f851: am
bf7b41ff: Merge "Fix concurrent GC ergonomics"
* commit '
8ba6f851278edce46a6e834b1a6d8f4cdf1eadcf':
Fix concurrent GC ergonomics
Andreas Gampe [Thu, 18 Dec 2014 21:50:12 +0000 (21:50 +0000)]
am
a1c6288c: am
55b752a8: Merge "ART: Punt to the interpreter for VerifiedMethod errors"
* commit '
a1c6288cbffdc4564b39cfea91f5e172f7b141a1':
ART: Punt to the interpreter for VerifiedMethod errors
Vladimir Marko [Thu, 18 Dec 2014 21:37:14 +0000 (21:37 +0000)]
am
193c7a94: Merge "Fix Thumb2 Emit16BitAddSub() to keep full immediate."
* commit '
193c7a94822f765b0b6b0cecd54c9f08dfd26425':
Fix Thumb2 Emit16BitAddSub() to keep full immediate.
Vladimir Marko [Thu, 18 Dec 2014 20:02:38 +0000 (20:02 +0000)]
Merge "Fix Thumb2 Emit16BitAddSub() to keep full immediate."
Vladimir Marko [Thu, 18 Dec 2014 19:56:49 +0000 (19:56 +0000)]
Fix Thumb2 Emit16BitAddSub() to keep full immediate.
Change-Id: I2d4b44752150669119ead16e99f7d7a945d2e88f
Nicolas Geoffray [Thu, 18 Dec 2014 17:53:10 +0000 (17:53 +0000)]
am
6048838a: Merge "Revert "Don\'t block quick callee saved registers for optimizing.""
* commit '
6048838af46f41c08c4132ba242040dc49bd5f23':
Revert "Don't block quick callee saved registers for optimizing."
Nicolas Geoffray [Thu, 18 Dec 2014 17:46:12 +0000 (17:46 +0000)]
Merge "Revert "Don't block quick callee saved registers for optimizing.""
Nicolas Geoffray [Thu, 18 Dec 2014 17:45:56 +0000 (17:45 +0000)]
Revert "Don't block quick callee saved registers for optimizing."
X64 has one libcore test failing, and codegen_test on
arm is failing.
This reverts commit
6004796d6c630696127df2494dcd4f30d1367a34.
Change-Id: I20e00431fa18e11ce4c0cb6fffa91977fa8e9b4f
Vladimir Marko [Thu, 18 Dec 2014 15:58:36 +0000 (15:58 +0000)]
am
ca747ea9: Merge "Fix Thumb2 assembler to emit 16-bit add/sub SP, #imm."
* commit '
ca747ea9951188dbc6f5217d49aca34aeadcc2a6':
Fix Thumb2 assembler to emit 16-bit add/sub SP, #imm.
Nicolas Geoffray [Thu, 18 Dec 2014 15:53:26 +0000 (15:53 +0000)]
am
aa94a95d: Merge "Explicitly compile core.oat with the Quick compiler."
* commit '
aa94a95d6174014f0ee89d4ff49bd769f44ac636':
Explicitly compile core.oat with the Quick compiler.
Nicolas Geoffray [Thu, 18 Dec 2014 15:53:24 +0000 (15:53 +0000)]
am
e408f8c6: Merge "Don\'t block quick callee saved registers for optimizing."
* commit '
e408f8c6ac0ee80543ee1a695695e8917e45eaf3':
Don't block quick callee saved registers for optimizing.
Vladimir Marko [Thu, 18 Dec 2014 15:53:02 +0000 (15:53 +0000)]
Merge "Fix Thumb2 assembler to emit 16-bit add/sub SP, #imm."