OSDN Git Service
Hans Boehm [Mon, 8 Dec 2014 21:16:27 +0000 (13:16 -0800)]
resolved conflicts for merge of
5e05bb74 to lmp-mr1-dev-plus-aosp
Change-Id: Ida97aa5b695fd072ff354eeaa76c66cdef6995ef
Jean Christophe Beyler [Mon, 8 Dec 2014 19:15:11 +0000 (19:15 +0000)]
am
ee515016: am
eb1404a0: ART: Fix variable formatting and CodeLayout\'s multiple visits
* commit '
ee5150162f06fe63c39ab5152c4a2516dc254f11':
Brian Carlstrom [Mon, 8 Dec 2014 19:10:24 +0000 (19:10 +0000)]
Brian Carlstrom [Sat, 6 Dec 2014 00:42:38 +0000 (00:42 +0000)]
Merge "Merge remote-tracking branch 'goog/lmp-mr1-dev' into lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
Andreas Gampe [Sat, 6 Dec 2014 00:20:02 +0000 (00:20 +0000)]
am
9389a973: am
ab6572b5: Merge "ART: Fix string data leak in image writer"
* commit '
9389a97322d470ee951abf2271a3e76cf7569119':
ART: Fix string data leak in image writer
Andreas Gampe [Sat, 6 Dec 2014 00:14:50 +0000 (00:14 +0000)]
am
ab6572b5: Merge "ART: Fix string data leak in image writer"
* commit '
ab6572b564db69e2877456ca6fbd3a00f4cc4b6b':
ART: Fix string data leak in image writer
Andreas Gampe [Sat, 6 Dec 2014 00:08:38 +0000 (00:08 +0000)]
Merge "ART: Fix string data leak in image writer"
Mathieu Chartier [Fri, 5 Dec 2014 23:42:04 +0000 (23:42 +0000)]
am
6f0c470e: am
9d4c8dce: Merge "Add pointer size logic to InitFromImageInterpretOnly"
* commit '
6f0c470e39f64fff29f4925e6426f8507e162530':
Add pointer size logic to InitFromImageInterpretOnly
Mathieu Chartier [Fri, 5 Dec 2014 23:34:19 +0000 (23:34 +0000)]
am
9d4c8dce: Merge "Add pointer size logic to InitFromImageInterpretOnly"
* commit '
9d4c8dced5d7dc32cc4906bb320f066b82862159':
Add pointer size logic to InitFromImageInterpretOnly
Mathieu Chartier [Fri, 5 Dec 2014 23:28:08 +0000 (23:28 +0000)]
Merge "Add pointer size logic to InitFromImageInterpretOnly"
Christopher Ferris [Fri, 5 Dec 2014 23:22:56 +0000 (23:22 +0000)]
am
dcebcf17: am
c8b975f8: Merge "Fix arm unwind data for art code."
* commit '
dcebcf17753712b1f9184ca2def39e6eb692f8f8':
Fix arm unwind data for art code.
Christopher Ferris [Fri, 5 Dec 2014 23:16:12 +0000 (23:16 +0000)]
am
c8b975f8: Merge "Fix arm unwind data for art code."
* commit '
c8b975f8caceba001d64fa822f02390c929f2cd9':
Fix arm unwind data for art code.
Christopher Ferris [Fri, 5 Dec 2014 23:08:58 +0000 (23:08 +0000)]
Merge "Fix arm unwind data for art code."
Hans Boehm [Fri, 5 Dec 2014 22:33:57 +0000 (22:33 +0000)]
am
5f421f16: Merge "Make Barrier robust against spurious wakeups" into lmp-mr1-dev
* commit '
5f421f16b6f8866233eb5d7d40991c2b00ec1482':
Make Barrier robust against spurious wakeups
Hans Boehm [Fri, 5 Dec 2014 22:22:14 +0000 (22:22 +0000)]
Merge "Make Barrier robust against spurious wakeups" into lmp-mr1-dev
Nicolas Geoffray [Fri, 5 Dec 2014 21:53:41 +0000 (21:53 +0000)]
am
5a9e1f49: am
3a074e1c: Merge "Make dex2oat 32bits when HOST_PREFER_32_BIT=true."
* commit '
5a9e1f498b6c2e0eb5a84a5c93a523d265442d84':
Make dex2oat 32bits when HOST_PREFER_32_BIT=true.
Nicolas Geoffray [Fri, 5 Dec 2014 21:48:18 +0000 (21:48 +0000)]
am
3a074e1c: Merge "Make dex2oat 32bits when HOST_PREFER_32_BIT=true."
* commit '
3a074e1ca4faa1f1018e28d20f4d4e9f02034cf3':
Make dex2oat 32bits when HOST_PREFER_32_BIT=true.
Nicolas Geoffray [Fri, 5 Dec 2014 21:42:56 +0000 (21:42 +0000)]
Merge "Make dex2oat 32bits when HOST_PREFER_32_BIT=true."
Mathieu Chartier [Fri, 5 Dec 2014 18:57:13 +0000 (10:57 -0800)]
Add pointer size logic to InitFromImageInterpretOnly
Previously we didn't have this logic which broke dex2oat if passed
--runtime-option -Xint flag.
Also we now no longer call InitFromImageInterpretOnlyCallback if
we are the compiler.
Bug:
18631640
Change-Id: Ie84fceeb85cabeeec7a5fedefd73dd919cca8e5e
Brian Carlstrom [Fri, 5 Dec 2014 20:15:05 +0000 (12:15 -0800)]
Merge remote-tracking branch 'goog/lmp-mr1-dev' into lmp-mr1-dev-plus-aosp
Change-Id: I1ed30414440b65d1799c888183d8fe88dc689af9
Andreas Gampe [Fri, 5 Dec 2014 19:51:54 +0000 (19:51 +0000)]
am
7e3efaf0: am
d02bd695: Merge "ART: Fix typo"
* commit '
7e3efaf02997ed47a56661ab5aa05e6726f40d38':
ART: Fix typo
Andreas Gampe [Fri, 5 Dec 2014 19:43:47 +0000 (19:43 +0000)]
am
d02bd695: Merge "ART: Fix typo"
* commit '
d02bd695a024f98ea926db924a9bcb8c325c8c6b':
ART: Fix typo
Andreas Gampe [Fri, 5 Dec 2014 19:37:19 +0000 (19:37 +0000)]
Merge "ART: Fix typo"
Andreas Gampe [Fri, 5 Dec 2014 05:25:04 +0000 (21:25 -0800)]
ART: Fix string data leak in image writer
The string intern data is a large object, so it will be recognized
as leaking under valgrind.
Bug:
18628623
Change-Id: I9090db119a50eebd806a82369bd46527c4e7dbf0
Andreas Gampe [Fri, 5 Dec 2014 19:16:26 +0000 (11:16 -0800)]
ART: Fix typo
Change-Id: Ie9a242240511adae9fcdbaae8d6b5be61fb5075b
Jean Christophe Beyler [Fri, 5 Dec 2014 16:50:21 +0000 (16:50 +0000)]
am
eb1404a0: ART: Fix variable formatting and CodeLayout\'s multiple visits
* commit '
eb1404a0b59c4a981af61852c94129507efc331a':
ART: Fix variable formatting and CodeLayout's multiple visits
Ian Rogers [Fri, 5 Dec 2014 16:25:33 +0000 (16:25 +0000)]
am
6b104471: am
ab74d3ea: Merge "Revert "Re-enable one thread dumping the native stack of another.""
* commit '
6b104471f13003d193be2d2c34be0583490fa4e3':
Revert "Re-enable one thread dumping the native stack of another."
Vladimir Marko [Fri, 5 Dec 2014 16:18:45 +0000 (16:18 +0000)]
am
fd61cc08: am
15cdca8a: Merge "Quick: Fix code layout pass; don\'t terminate too early."
* commit '
fd61cc08720d149f95b270ea94ae0968d7c42128':
Quick: Fix code layout pass; don't terminate too early.
Ian Rogers [Fri, 5 Dec 2014 16:18:34 +0000 (16:18 +0000)]
am
ab74d3ea: Merge "Revert "Re-enable one thread dumping the native stack of another.""
* commit '
ab74d3eae37de79444edd1edd70400970d5e85ad':
Revert "Re-enable one thread dumping the native stack of another."
Ian Rogers [Fri, 5 Dec 2014 16:13:02 +0000 (16:13 +0000)]
Merge "Revert "Re-enable one thread dumping the native stack of another.""
Ian Rogers [Fri, 5 Dec 2014 16:12:21 +0000 (16:12 +0000)]
Revert "Re-enable one thread dumping the native stack of another."
This reverts commit
e652b62c581a3d68b1fc82e0b04e3a59dd633e52.
Change-Id: Ida56d2c23849c1ede82a22100df402877256e270
Vladimir Marko [Fri, 5 Dec 2014 16:11:59 +0000 (16:11 +0000)]
am
15cdca8a: Merge "Quick: Fix code layout pass; don\'t terminate too early."
* commit '
15cdca8a5397099d11a76ef4a4a035a291ed78d0':
Quick: Fix code layout pass; don't terminate too early.
Vladimir Marko [Fri, 5 Dec 2014 16:04:40 +0000 (16:04 +0000)]
Merge "Quick: Fix code layout pass; don't terminate too early."
Vladimir Marko [Fri, 5 Dec 2014 15:46:09 +0000 (15:46 +0000)]
am
d0b09be9: am
f551efff: Merge "Revert "Revert "Rewrite ImageWriter\'s merging of String char[]s."""
* commit '
d0b09be9243cc54e42788ae4c6f7fb71deb9e843':
Revert "Revert "Rewrite ImageWriter's merging of String char[]s.""
Vladimir Marko [Fri, 5 Dec 2014 15:39:24 +0000 (15:39 +0000)]
am
f551efff: Merge "Revert "Revert "Rewrite ImageWriter\'s merging of String char[]s."""
* commit '
f551efff34c20e2f0cf962c3fc267204d5e7611f':
Revert "Revert "Rewrite ImageWriter's merging of String char[]s.""
Vladimir Marko [Fri, 5 Dec 2014 15:34:50 +0000 (15:34 +0000)]
Merge "Revert "Revert "Rewrite ImageWriter's merging of String char[]s."""
Vladimir Marko [Fri, 5 Dec 2014 13:55:42 +0000 (13:55 +0000)]
Quick: Fix code layout pass; don't terminate too early.
Change-Id: I0c417fdc2ee8213672a7568fe228e5e2f1c1ab61
Jean Christophe Beyler [Thu, 4 Sep 2014 15:15:11 +0000 (08:15 -0700)]
ART: Fix variable formatting and CodeLayout's multiple visits
The CodeLayout pass visits multiple times the same BasicBlock. This patch
fixes that issue to reduce its overhead.
The patch also fixes cUnit to c_unit in the bb_optimization files.
Signed-off-by: Jean Christophe Beyler <jean.christophe.beyler@intel.com>
Bug:
18507840
(cherry picked from commit
75bcc3780bc40dd7c265e150aff5b891135ff6e3)
Change-Id: I4675ba0b4886c35f0093ac54e171dd87548f60c8
Nicolas Geoffray [Fri, 5 Dec 2014 12:18:26 +0000 (12:18 +0000)]
am
886bdf00: am
7f8f9489: Merge "Make script suitable for vogar use on device."
* commit '
886bdf000a364b1e94c88b6a86452b4d86ac5d7c':
Make script suitable for vogar use on device.
Roland Levillain [Fri, 5 Dec 2014 12:18:24 +0000 (12:18 +0000)]
am
7c820805: am
abb3977b: Merge "Add support for double-to-int & double-to-long in optimizing."
* commit '
7c8208059d3a43d6dd33b9218e65f58aee91c40e':
Add support for double-to-int & double-to-long in optimizing.
Nicolas Geoffray [Fri, 5 Dec 2014 12:14:23 +0000 (12:14 +0000)]
am
7f8f9489: Merge "Make script suitable for vogar use on device."
* commit '
7f8f9489c1803fd40f52aec3cda784fe02e78c95':
Make script suitable for vogar use on device.
Roland Levillain [Fri, 5 Dec 2014 12:14:22 +0000 (12:14 +0000)]
am
abb3977b: Merge "Add support for double-to-int & double-to-long in optimizing."
* commit '
abb3977bf924b923b45ae234a48be739035bbd32':
Add support for double-to-int & double-to-long in optimizing.
Nicolas Geoffray [Fri, 5 Dec 2014 12:12:48 +0000 (12:12 +0000)]
Merge "Make script suitable for vogar use on device."
Roland Levillain [Fri, 5 Dec 2014 12:08:39 +0000 (12:08 +0000)]
Merge "Add support for double-to-int & double-to-long in optimizing."
Nicolas Geoffray [Thu, 4 Dec 2014 17:05:22 +0000 (17:05 +0000)]
Make script suitable for vogar use on device.
Also update device expectations that need investigation.
Change-Id: I86a613f3f62c2f999296f8b7505646a96ab4adf8
Roland Levillain [Fri, 5 Dec 2014 12:06:01 +0000 (12:06 +0000)]
Add support for double-to-int & double-to-long in optimizing.
- Add support for the double-to-int and double-to-long Dex
instructions in the optimizing compiler.
- Add S1 to the list of ARM FPU parameter registers so that
a double value can be passed as parameter during a call
to the runtime through D0.
- Have art::x86_64::X86_64Assembler::cvttsd2si work with
64-bit operands.
- Generate x86, x86-64 and ARM (but not ARM64) code for
double to int and double to long HTypeConversion nodes.
- Add related tests to test/422-type-conversion.
Change-Id: Ic93b9ec6630c26e940f7966a3346ad3fd5a2ab3a
Nicolas Geoffray [Fri, 5 Dec 2014 11:55:41 +0000 (11:55 +0000)]
Make dex2oat 32bits when HOST_PREFER_32_BIT=true.
Change-Id: Id6465c697512f32402bdf71c75e52db47f1fb0a2
Ian Rogers [Fri, 5 Dec 2014 04:51:25 +0000 (04:51 +0000)]
am
2889ec21: am
355e3b1c: Merge "Re-enable one thread dumping the native stack of another."
* commit '
2889ec21151677fb971a798bec032ab8e79ec105':
Re-enable one thread dumping the native stack of another.
Ian Rogers [Fri, 5 Dec 2014 04:44:13 +0000 (04:44 +0000)]
am
355e3b1c: Merge "Re-enable one thread dumping the native stack of another."
* commit '
355e3b1cc67c263268289021268109ae5432537a':
Re-enable one thread dumping the native stack of another.
Ian Rogers [Fri, 5 Dec 2014 04:37:05 +0000 (04:37 +0000)]
Merge "Re-enable one thread dumping the native stack of another."
Ian Rogers [Fri, 5 Dec 2014 04:19:47 +0000 (04:19 +0000)]
am
83b9a8d9: am
c5454372: Merge "Tidy gAborting."
* commit '
83b9a8d9aaa1431dc04bf5f3e8056d49ff8c9b2c':
Tidy gAborting.
Ian Rogers [Fri, 5 Dec 2014 04:12:23 +0000 (04:12 +0000)]
am
c5454372: Merge "Tidy gAborting."
* commit '
c5454372f23da8248c84c29e251fb1b21c421a63':
Tidy gAborting.
Ian Rogers [Fri, 5 Dec 2014 04:11:48 +0000 (20:11 -0800)]
Re-enable one thread dumping the native stack of another.
Bug:
15446488
Change-Id: I49d4d283f7b7d04b9d8c940313d6c5107ba9f99d
Ian Rogers [Fri, 5 Dec 2014 04:05:51 +0000 (04:05 +0000)]
Merge "Tidy gAborting."
Ian Rogers [Fri, 5 Dec 2014 03:53:52 +0000 (19:53 -0800)]
Tidy gAborting.
Reduce scope to Runtime::Abort and short-cut recursive case earlier. gAborting
remains global to avoid two fatal errors in thread and the verifier.
Change-Id: Ibc893f891ffee9a763c65cde9507d99083d47b3f
Andreas Gampe [Fri, 5 Dec 2014 02:31:00 +0000 (02:31 +0000)]
am
273dfc38: am
aad9c076: Merge "ART: Fix linting errors"
* commit '
273dfc38dcd2023095f3d9ad49e02cc1b2f99093':
ART: Fix linting errors
Mingyao Yang [Fri, 5 Dec 2014 02:26:37 +0000 (02:26 +0000)]
am
77aa10f4: am
044ac4f4: Merge "Bounds check elimination."
* commit '
77aa10f4dcc0c845f47b5fc3f2e450fcdd2484d7':
Bounds check elimination.
Vladimir Marko [Thu, 4 Dec 2014 14:52:25 +0000 (14:52 +0000)]
Revert "Revert "Rewrite ImageWriter's merging of String char[]s.""
This reverts commit
4c964de8832551b701ce7b3162bc51cc6b22fc8a.
Change-Id: I940bdf48e2dbaef0f809beda32756507d18acb89
Andreas Gampe [Fri, 5 Dec 2014 01:31:54 +0000 (01:31 +0000)]
am
aad9c076: Merge "ART: Fix linting errors"
* commit '
aad9c0767a8f8ae6250a7b4edee52cfb6d598687':
ART: Fix linting errors
Andreas Gampe [Fri, 5 Dec 2014 01:25:34 +0000 (01:25 +0000)]
Merge "ART: Fix linting errors"
Andreas Gampe [Fri, 5 Dec 2014 01:24:50 +0000 (17:24 -0800)]
ART: Fix linting errors
Fix bounds_check_elimination linting errors.
Change-Id: I040433ecbc84d740bff331c37df0bfcc64dc244e
Mingyao Yang [Fri, 5 Dec 2014 01:19:25 +0000 (01:19 +0000)]
am
044ac4f4: Merge "Bounds check elimination."
* commit '
044ac4f4f6760eeef4ed96b5349a8a5c325c52f1':
Bounds check elimination.
Mingyao Yang [Fri, 5 Dec 2014 01:06:53 +0000 (01:06 +0000)]
Merge "Bounds check elimination."
Ian Rogers [Fri, 5 Dec 2014 00:49:40 +0000 (00:49 +0000)]
am
669cd72e: am
a21fdd04: Merge "X86_64 QBE: use RIP addressing"
* commit '
669cd72e7cedcd13b78f9d488de63a0dc053a7fd':
X86_64 QBE: use RIP addressing
Ian Rogers [Fri, 5 Dec 2014 00:41:47 +0000 (00:41 +0000)]
am
a21fdd04: Merge "X86_64 QBE: use RIP addressing"
* commit '
a21fdd0432aa38b63d144ee4b92b6a567aab61d2':
X86_64 QBE: use RIP addressing
Ian Rogers [Fri, 5 Dec 2014 00:34:38 +0000 (00:34 +0000)]
Merge "X86_64 QBE: use RIP addressing"
Andreas Gampe [Fri, 5 Dec 2014 00:14:15 +0000 (00:14 +0000)]
am
5536f923: am
7be36ae7: Merge "ART: Add SparseSwitch support to the optimizing compiler"
* commit '
5536f9238f2f8ace214212da981d7cc276587b10':
ART: Add SparseSwitch support to the optimizing compiler
Andreas Gampe [Fri, 5 Dec 2014 00:06:59 +0000 (00:06 +0000)]
am
7be36ae7: Merge "ART: Add SparseSwitch support to the optimizing compiler"
* commit '
7be36ae7979eb62dc34c59b18b0bb1202ffefa3f':
ART: Add SparseSwitch support to the optimizing compiler
Andreas Gampe [Thu, 4 Dec 2014 23:59:55 +0000 (23:59 +0000)]
Merge "ART: Add SparseSwitch support to the optimizing compiler"
Andreas Gampe [Thu, 4 Dec 2014 17:09:57 +0000 (09:09 -0800)]
ART: Add SparseSwitch support to the optimizing compiler
Add simple sparse-switch support through chained IFs. Refactor a
bit to better reuse code between switch types.
Now enables compiled versions of 015-switch and 095-switch-MAX_INT.
Bug:
18410979
Change-Id: Ib617e4b877f0b7fbc3bb289800f612f013480713
Hans Boehm [Wed, 3 Dec 2014 02:31:31 +0000 (18:31 -0800)]
Make Barrier robust against spurious wakeups
Fix Barrier implementation so that Wait cannot return prematurely
due to a spurious condition variable wakeup or interrupted futex call.
Document the resulting semantics of barrier.h, which are a bit surprising,
but appear to be exactly what current clients need.
Fix the test so that it actually passes with the fixed barrier.h,
and no longer tests for properties that can't be correctly satisfied.
Improve comment for InitTimeSpec, which we almost used.
(Differs from AOSP patch in that Increment returns void here,
as does cv TimedWait. In AOSP they return bool.)
Bug:
18509123
Change-Id: I0b25f33bcd22322ba04e3951cd484843788c2bf5
(cherry picked from commit
5567c11b9157eec110c0631aa2bff5836631e868)
Brian Carlstrom [Thu, 4 Dec 2014 23:18:25 +0000 (23:18 +0000)]
am
8775cc33: am
c1bfaa22: Remove dex2oat watchdog warning
* commit '
8775cc33f0cab1a9bd866be0df9dbe4541ecbe0d':
Remove dex2oat watchdog warning
Brian Carlstrom [Thu, 4 Dec 2014 23:06:44 +0000 (23:06 +0000)]
am
c1bfaa22: Remove dex2oat watchdog warning
* commit '
c1bfaa22570b4f771ae1cd832201b01ec84e32c1':
Remove dex2oat watchdog warning
Andreas Gampe [Thu, 4 Dec 2014 22:45:11 +0000 (22:45 +0000)]
am
bbfcec40: am
63130d07: Merge "ART: Wire up a valgrind-wrapped dex2oat run"
* commit '
bbfcec40850a39f99c2ff22c3ab6e2404ae42105':
ART: Wire up a valgrind-wrapped dex2oat run
Brian Carlstrom [Thu, 4 Dec 2014 22:45:10 +0000 (22:45 +0000)]
am
218fca64: am
d421eb47: Merge "Remove dex2oat watchdog warning"
* commit '
218fca64b1e053c62875c2c4c1603d8386dfa457':
Remove dex2oat watchdog warning
Hans Boehm [Thu, 4 Dec 2014 22:44:54 +0000 (22:44 +0000)]
am
8d27ad14: am
d4605cb8: Merge "Make Barrier robust against spurious wakeups"
* commit '
8d27ad146fcd4f3775675ccbca13808391550298':
Make Barrier robust against spurious wakeups
Andreas Gampe [Thu, 4 Dec 2014 22:12:56 +0000 (22:12 +0000)]
am
63130d07: Merge "ART: Wire up a valgrind-wrapped dex2oat run"
* commit '
63130d07713dc3eaa3ce156e3f7b8f0b0e06cd61':
ART: Wire up a valgrind-wrapped dex2oat run
Andreas Gampe [Thu, 4 Dec 2014 22:06:01 +0000 (22:06 +0000)]
Merge "ART: Wire up a valgrind-wrapped dex2oat run"
Brian Carlstrom [Thu, 4 Dec 2014 21:56:15 +0000 (21:56 +0000)]
am
d421eb47: Merge "Remove dex2oat watchdog warning"
* commit '
d421eb47fa27e8e11eaf2a3512ada9fd58b8a12b':
Remove dex2oat watchdog warning
Brian Carlstrom [Thu, 4 Dec 2014 21:51:05 +0000 (21:51 +0000)]
Merge "Remove dex2oat watchdog warning"
Mark Mendell [Tue, 2 Dec 2014 00:06:12 +0000 (19:06 -0500)]
X86_64 QBE: use RIP addressing
Take advantage of RIP addressing in 64 bit mode to improve the code
generation for accesses to the constant area as well as packed switches.
Avoid computing the address of the start of the method, which is needed
in 32 bit mode.
To do this, we add a new 'pseudo-register' kRIPReg to minimize the
changes needed to get the new addressing mode to be generated.
Change-Id: Ia28c93f98b09939806d91ff0bd7392e58996d108
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Mathieu Chartier [Thu, 4 Dec 2014 21:17:30 +0000 (21:17 +0000)]
am
2f93d60a: (-s ours) am
25fda920: Remove method verification results right after compiling a method
* commit '
2f93d60a05724b7fc9c9a2f9ebf3016ce99484ea':
Remove method verification results right after compiling a method
Andreas Gampe [Thu, 4 Dec 2014 21:11:35 +0000 (21:11 +0000)]
am
37f461f7: (-s ours) am
d97465c3: ART: Fix unclosed files in dex2oat
* commit '
37f461f737faf2081a346552c68ccce48804ec71':
ART: Fix unclosed files in dex2oat
Christopher Ferris [Fri, 31 Oct 2014 02:04:13 +0000 (19:04 -0700)]
Fix arm unwind data for art code.
Bug:
17392751
Change-Id: Ic85d4468b0f931aa9e38dee12d466a1e04ebf944
Hans Boehm [Thu, 4 Dec 2014 20:03:17 +0000 (20:03 +0000)]
am
d4605cb8: Merge "Make Barrier robust against spurious wakeups"
* commit '
d4605cb8e8260fdec8a05f675788b154f486baa4':
Make Barrier robust against spurious wakeups
Hans Boehm [Thu, 4 Dec 2014 19:57:01 +0000 (19:57 +0000)]
Merge "Make Barrier robust against spurious wakeups"
Ian Rogers [Thu, 4 Dec 2014 19:52:33 +0000 (19:52 +0000)]
am
fb1b5883: am
b510c82e: Merge "Remove unused headers."
* commit '
fb1b5883c67b34a2e321184d4bdf27643e279a46':
Remove unused headers.
Nicolas Geoffray [Thu, 4 Dec 2014 19:52:29 +0000 (19:52 +0000)]
am
c1a0595c: am
283e2d60: Merge "On arm64/optimizing, compile the boot image with interpreter."
* commit '
c1a0595c8305f105f70eb3bec6aaf5a82c6d09e4':
On arm64/optimizing, compile the boot image with interpreter.
Andreas Gampe [Thu, 4 Dec 2014 19:52:24 +0000 (19:52 +0000)]
am
52afd65e: am
7c8ce29e: Merge "ART: Add PackedSwitch support to the optimizing compiler"
* commit '
52afd65eeed8e20a3a52b173d2abd3852cf080ce':
ART: Add PackedSwitch support to the optimizing compiler
Nicolas Geoffray [Thu, 4 Dec 2014 19:52:23 +0000 (19:52 +0000)]
am
0f9db3f1: am
8a717bc1: Merge "Temporary disable the test."
* commit '
0f9db3f143abfb7ecbff10ad3ca5145de81a5c0a':
Temporary disable the test.
Nicolas Geoffray [Thu, 4 Dec 2014 19:52:17 +0000 (19:52 +0000)]
am
d448808e: am
c1222615: Merge "Build core.oat without flags."
* commit '
d448808e52be42259bfcbbeee3b1f835636c4843':
Build core.oat without flags.
Vladimir Marko [Thu, 4 Dec 2014 19:51:06 +0000 (19:51 +0000)]
am
508dc7ad: am
875ca0fb: Merge "Revert "Rewrite ImageWriter\'s merging of String char[]s.""
* commit '
508dc7adbdd17fd758cdceb898d1d5bfa40f01a8':
Revert "Rewrite ImageWriter's merging of String char[]s."
Roland Levillain [Thu, 4 Dec 2014 19:51:04 +0000 (19:51 +0000)]
am
ec9d45db: am
0540330d: Merge "Add support for float-to-double & double-to-float in optimizing."
* commit '
ec9d45db729658d843ab1fa0533389c073fd7b00':
Add support for float-to-double & double-to-float in optimizing.
Roland Levillain [Thu, 4 Dec 2014 19:51:02 +0000 (19:51 +0000)]
am
bdedbbf7: am
833e903b: Merge "Add support for float-to-long in the optimizing compiler."
* commit '
bdedbbf7f25f172ca32b1ce55856f355a8f5232e':
Add support for float-to-long in the optimizing compiler.
Vladimir Marko [Thu, 4 Dec 2014 19:51:01 +0000 (19:51 +0000)]
am
bfbd2a31: am
3947000d: Merge "Rewrite ImageWriter\'s merging of String char[]s."
* commit '
bfbd2a31504438081215f41173449926180a887b':
Rewrite ImageWriter's merging of String char[]s.
Sebastien Hertz [Thu, 4 Dec 2014 19:50:59 +0000 (19:50 +0000)]
am
6bf2bde8: am
baede348: Merge "JDWP: fix breakpoint for method in the image"
* commit '
6bf2bde8fbc81d3f55d508a1bc7dc4bb7d660839':
JDWP: fix breakpoint for method in the image
Vladimir Marko [Thu, 4 Dec 2014 19:50:57 +0000 (19:50 +0000)]
am
a480ca73: am
989210eb: Merge "Quick: Use fewer insns for ARM LDR/STR with large offsets."
* commit '
a480ca73ec641c1af65b090253c4971873279ee8':
Quick: Use fewer insns for ARM LDR/STR with large offsets.
Vladimir Marko [Thu, 4 Dec 2014 19:50:56 +0000 (19:50 +0000)]
am
eb46bd8e: am
4334f957: Merge "Call ProcessStrings() in ImageWriter, fix prefix check."
* commit '
eb46bd8e4c31498e19d9ec0870a99fd6828181f5':
Call ProcessStrings() in ImageWriter, fix prefix check.
Mathieu Chartier [Thu, 4 Dec 2014 19:50:54 +0000 (19:50 +0000)]
am
bbf9c871: am
31bacb9d: Merge "Remove method verification results right after compiling a method"
* commit '
bbf9c871af300dfa03e8384cf1e82071aca3e184':
Remove method verification results right after compiling a method
Andreas Gampe [Thu, 4 Dec 2014 19:50:53 +0000 (19:50 +0000)]
am
00e5083d: am
8b9a97e8: Merge "ART: Fix unclosed files in dex2oat"
* commit '
00e5083d98810c2ca0cda5032b11c4559d03ad0a':
ART: Fix unclosed files in dex2oat