OSDN Git Service
Mathieu Chartier [Tue, 26 Aug 2014 18:24:00 +0000 (18:24 +0000)]
am
652e3a16: am
f59b605f: Merge "Fix race condition in TransitionCollector." into lmp-dev
* commit '
652e3a164fe1348de573dcdb4d79926592117bcd':
Fix race condition in TransitionCollector.
Stephen Kyle [Tue, 26 Aug 2014 18:23:59 +0000 (18:23 +0000)]
am
d6a4d7d8: am
ccb1a5d4: ART: Reject field accesses to non-reference vregs.
* commit '
d6a4d7d8856785c79ba24426abcc0c684dc901f1':
ART: Reject field accesses to non-reference vregs.
Andreas Gampe [Tue, 26 Aug 2014 18:14:02 +0000 (18:14 +0000)]
am
0b05ec67: Merge "ART: Improve error message on oat writer failure"
* commit '
0b05ec674139c2b2e0914b0bb0e1898f93a9c852':
ART: Improve error message on oat writer failure
Mathieu Chartier [Tue, 26 Aug 2014 18:12:29 +0000 (18:12 +0000)]
am
f59b605f: Merge "Fix race condition in TransitionCollector." into lmp-dev
* commit '
f59b605f82c0e2b7bfc6019ee7bd650628f50d3a':
Fix race condition in TransitionCollector.
Stephen Kyle [Tue, 26 Aug 2014 18:12:28 +0000 (18:12 +0000)]
am
ccb1a5d4: ART: Reject field accesses to non-reference vregs.
* commit '
ccb1a5d46bc1b4ee888e74775f5c1291d600ff54':
ART: Reject field accesses to non-reference vregs.
Mathieu Chartier [Tue, 26 Aug 2014 18:01:37 +0000 (18:01 +0000)]
Merge "Fix race condition in TransitionCollector." into lmp-dev
Andreas Gampe [Tue, 26 Aug 2014 17:55:56 +0000 (17:55 +0000)]
Merge "ART: Improve error message on oat writer failure"
Andreas Gampe [Tue, 22 Jul 2014 05:56:08 +0000 (22:56 -0700)]
ART: Improve error message on oat writer failure
Try to log the pending exception to help resolve issues.
Bug:
16406811
Change-Id: I035ae9e59a5ee02b9e90c35c0644ec088d3c7d12
Ian Rogers [Tue, 26 Aug 2014 17:49:14 +0000 (17:49 +0000)]
am
3b6711fa: Merge "Fix usage of literals within a macro."
* commit '
3b6711faf7b0b10eaa6c48ba854160bcecd00166':
Fix usage of literals within a macro.
Ian Rogers [Tue, 26 Aug 2014 17:36:09 +0000 (17:36 +0000)]
Merge "Fix usage of literals within a macro."
Mathieu Chartier [Sat, 23 Aug 2014 20:56:03 +0000 (13:56 -0700)]
Fix race condition in TransitionCollector.
There was a minor race condition that could happen if multiple
threads called TransitionCollector at the same time. Starting out
in CMS:
Thread 1: TransitionCollector(SS).
Thread 2: TransitionCollector(CMS) sees that it is already CMS so
has copying_transition == false. But then thread 2 changes to SS.
Thread 1 resumes but incorrectly doesn't check the
disable_moving_gc_count_ possibly resulting in errors if
disable_moving_gc_count_ != 0 due to JNI since we are going from
SS -> CMS and are goign to move objects.
Bug:
17189964
Change-Id: I4f0d002717516b81355d66f26e0e8ebe3958348d
Stephen Kyle [Fri, 22 Aug 2014 14:03:07 +0000 (15:03 +0100)]
ART: Reject field accesses to non-reference vregs.
The verifier will now reject any iget/iput insts
that do not have a reference object in vB.
Bug:
17207857
Signed-off-by: Stuart Monteith <stuart.monteith@arm.com>
(cherry picked from commit
695c5982eeddee18c643cc2f94c9d78fa75599ab)
Change-Id: I3790b8687673643bb142549d74f36a3e2978bf13
Ian Rogers [Tue, 26 Aug 2014 17:34:09 +0000 (10:34 -0700)]
Fix usage of literals within a macro.
Macs handle arguments in macros as $num meaning literals must be $$num.
Change-Id: Ia30c7ef4e089561e9f23f353d7080e800b117d70
Mathieu Chartier [Tue, 26 Aug 2014 17:29:19 +0000 (17:29 +0000)]
am
2f1f3b26: Merge "Map heap maps at a lower address."
* commit '
2f1f3b26e360ed5362a3e6655ed0acdccea3a6a7':
Map heap maps at a lower address.
Andreas Gampe [Tue, 26 Aug 2014 17:29:18 +0000 (17:29 +0000)]
am
b7fbafda: Merge "ART: kSuper also has IncompatibleClassChangeError"
* commit '
b7fbafdac8cf0ff8f860e6e85646d6c88d3914ed':
ART: kSuper also has IncompatibleClassChangeError
Andreas Gampe [Tue, 26 Aug 2014 17:29:17 +0000 (17:29 +0000)]
am
654881ff: Merge "ART: Fix IncompatibleClassChange check for ArtMethod"
* commit '
654881ffd780066fe1160320059ae629416b4652':
ART: Fix IncompatibleClassChange check for ArtMethod
Mathieu Chartier [Tue, 26 Aug 2014 17:28:59 +0000 (17:28 +0000)]
am
f35ffc5a: am
506bcfc6: Merge "Map heap maps at a lower address." into lmp-dev
* commit '
f35ffc5ab4e7e51878745e6fa1ce03feb5fd188f':
Map heap maps at a lower address.
Andreas Gampe [Tue, 26 Aug 2014 17:23:30 +0000 (17:23 +0000)]
am
847adc4f: am
b2634e97: Merge "ART: kSuper also has IncompatibleClassChangeError" into lmp-dev
* commit '
847adc4f5eeef1b64569905ad7f1c65505fd3bc1':
ART: kSuper also has IncompatibleClassChangeError
Andreas Gampe [Tue, 26 Aug 2014 17:23:29 +0000 (17:23 +0000)]
am
4110847a: am
7f28597b: Merge "ART: Fix IncompatibleClassChange check for ArtMethod" into lmp-dev
* commit '
4110847a3074d38fe206f071fcf5b856008ccbbd':
ART: Fix IncompatibleClassChange check for ArtMethod
Mathieu Chartier [Tue, 26 Aug 2014 17:23:17 +0000 (17:23 +0000)]
am
506bcfc6: Merge "Map heap maps at a lower address." into lmp-dev
* commit '
506bcfc66454555f792fbc7893ff3b2877c9b288':
Map heap maps at a lower address.
Mathieu Chartier [Tue, 26 Aug 2014 17:17:09 +0000 (17:17 +0000)]
Merge "Map heap maps at a lower address."
Mathieu Chartier [Mon, 25 Aug 2014 23:32:41 +0000 (16:32 -0700)]
Map heap maps at a lower address.
We now map the heap mmaps at a lower address in case the app needs
larger continuous address space.
Bug:
16502380
(cherry picked from commit
18bacb60e09fa8aa20ae0a1d7a4a8968d4913fb0)
Change-Id: I66447f853e439448c72923e2d1c657c94c5f1543
Mathieu Chartier [Tue, 26 Aug 2014 17:15:20 +0000 (17:15 +0000)]
Merge "Map heap maps at a lower address." into lmp-dev
Andreas Gampe [Tue, 26 Aug 2014 17:14:50 +0000 (17:14 +0000)]
am
b2634e97: Merge "ART: kSuper also has IncompatibleClassChangeError" into lmp-dev
* commit '
b2634e9790a7099cf84d3509afe7af18f4349f11':
ART: kSuper also has IncompatibleClassChangeError
Andreas Gampe [Tue, 26 Aug 2014 17:14:49 +0000 (17:14 +0000)]
am
7f28597b: Merge "ART: Fix IncompatibleClassChange check for ArtMethod" into lmp-dev
* commit '
7f28597bfa4b5e11911e4d4caa13fe2ab234a53e':
ART: Fix IncompatibleClassChange check for ArtMethod
Andreas Gampe [Tue, 26 Aug 2014 17:11:38 +0000 (17:11 +0000)]
Merge "ART: kSuper also has IncompatibleClassChangeError"
Andreas Gampe [Tue, 26 Aug 2014 03:55:01 +0000 (20:55 -0700)]
ART: kSuper also has IncompatibleClassChangeError
When resolving methods, kSuper can also have
IncompatibleClassChangeError.
Bug:
17266767
(cherry picked from commit
9cb8d7a9a5013dd1e6734d9643573a4750d869e2)
Change-Id: I5fafe03ad578f605825a3d0c89f1254a4a385b76
Andreas Gampe [Tue, 26 Aug 2014 17:10:28 +0000 (17:10 +0000)]
Merge "ART: kSuper also has IncompatibleClassChangeError" into lmp-dev
Andreas Gampe [Tue, 26 Aug 2014 17:09:59 +0000 (17:09 +0000)]
Merge "ART: Fix IncompatibleClassChange check for ArtMethod"
Andreas Gampe [Tue, 26 Aug 2014 03:46:31 +0000 (20:46 -0700)]
ART: Fix IncompatibleClassChange check for ArtMethod
In case of kSuper we should complain sometimes.
Bug:
17265201
(cherry picked from commit
249907fe09afd9243c9675a67b157b98378fa3cf)
Change-Id: Ifad903a750495963c7128296713fbd7c4add71cd
Andreas Gampe [Tue, 26 Aug 2014 17:04:14 +0000 (17:04 +0000)]
Merge "ART: Fix IncompatibleClassChange check for ArtMethod" into lmp-dev
buzbee [Tue, 26 Aug 2014 15:01:10 +0000 (15:01 +0000)]
am
3531973c: Merge "Quick compiler: fix DCHECK"
* commit '
3531973c770269d82ea36a65b5738b1587c4d513':
Quick compiler: fix DCHECK
buzbee [Tue, 26 Aug 2014 14:42:32 +0000 (14:42 +0000)]
Merge "Quick compiler: fix DCHECK"
Sebastien Hertz [Tue, 26 Aug 2014 14:42:28 +0000 (16:42 +0200)]
resolved conflicts for merge of
052c87cd to lmp-dev-plus-aosp
Change-Id: I8dcfe972e209996d26f9ac9c2028a0d6146fec1b
buzbee [Mon, 25 Aug 2014 16:34:03 +0000 (09:34 -0700)]
Quick compiler: fix DCHECK
Cherry-pick from internal 532582
A DCHECK intended to verify the soundness of the mapping between
a wide Dalvik value and a pair of temp registers incorrectly fired
when the temp register pair was associated with a wide temporary
(i.e. - when (SReg() == INVALID_SREG)).
In this particular situation, the wideness flag is meaningful only when
there is an associated valid vreg. Code rearranged to only perform
the DCHECK and reset the partner's wideness bit when we're dealing with
a live wide value.
b/
16484538
Change-Id: I3b8a7bebc5d918c65ea56ae8db0a8a5cd8003386
Sebastien Hertz [Tue, 26 Aug 2014 13:50:57 +0000 (13:50 +0000)]
am
83182ed4: Merge "Reduce lock contention when debugging" into lmp-dev
* commit '
83182ed48c55729cd34780fc598f269cc98af739':
Reduce lock contention when debugging
Sebastien Hertz [Tue, 26 Aug 2014 13:43:17 +0000 (13:43 +0000)]
Merge "Reduce lock contention when debugging" into lmp-dev
buzbee [Tue, 26 Aug 2014 13:15:57 +0000 (13:15 +0000)]
am
5c36e461: am
cb50ed40: Merge "Quick compiler: fix DCHECK" into lmp-dev
* commit '
5c36e4619c88ce059211f69638c4d690905b7995':
Quick compiler: fix DCHECK
buzbee [Tue, 26 Aug 2014 13:09:04 +0000 (13:09 +0000)]
am
cb50ed40: Merge "Quick compiler: fix DCHECK" into lmp-dev
* commit '
cb50ed40fc39a1c1786e57f5c839a3cd230e1744':
Quick compiler: fix DCHECK
buzbee [Tue, 26 Aug 2014 12:58:44 +0000 (12:58 +0000)]
Merge "Quick compiler: fix DCHECK" into lmp-dev
Ang Li [Tue, 26 Aug 2014 11:30:30 +0000 (11:30 +0000)]
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-dev-plus-aosp
Brian Carlstrom [Tue, 26 Aug 2014 11:29:42 +0000 (11:29 +0000)]
am
b7326b50: Merge "CheckAndClearResolveException should allow LinkageError"
* commit '
b7326b502dd5afe6d8eae60d5f85bde0a94c6956':
CheckAndClearResolveException should allow LinkageError
Mathieu Chartier [Tue, 26 Aug 2014 11:29:41 +0000 (11:29 +0000)]
am
5a1a39a6: Merge "Reduce GC log spam."
* commit '
5a1a39a67260704fbc76c9a6a58b330a2df6827a':
Reduce GC log spam.
Brian Carlstrom [Tue, 26 Aug 2014 11:29:26 +0000 (11:29 +0000)]
am
bd8921ca: am
118785c6: CheckAndClearResolveException should allow LinkageError
* commit '
bd8921ca0cdf5716d0ffe5d8b298d25bf46dcb89':
CheckAndClearResolveException should allow LinkageError
Brian Carlstrom [Tue, 26 Aug 2014 11:18:28 +0000 (11:18 +0000)]
am
118785c6: CheckAndClearResolveException should allow LinkageError
* commit '
118785c6f82ac1ec7074b5efe367b3dafd904940':
CheckAndClearResolveException should allow LinkageError
Brian Carlstrom [Tue, 26 Aug 2014 06:40:32 +0000 (06:40 +0000)]
Merge "CheckAndClearResolveException should allow LinkageError"
Brian Carlstrom [Tue, 26 Aug 2014 06:07:30 +0000 (23:07 -0700)]
CheckAndClearResolveException should allow LinkageError
Bug:
16565964
(cherry picked from commit
118785c6f82ac1ec7074b5efe367b3dafd904940)
Change-Id: I7bc170e7a9ee9bd19defdd20187ee36a2381bf5d
Brian Carlstrom [Tue, 26 Aug 2014 06:07:30 +0000 (23:07 -0700)]
CheckAndClearResolveException should allow LinkageError
Bug:
16565964
Change-Id: Ibf236c627519a5cdef9479b7bc21e931d5474abf
Mathieu Chartier [Tue, 26 Aug 2014 04:57:15 +0000 (04:57 +0000)]
am
213a5434: am
eac98d7c: Merge "Reduce GC log spam." into lmp-dev
* commit '
213a543484ad437389ba325b62567f95d273d8d2':
Reduce GC log spam.
Alex Light [Tue, 26 Aug 2014 04:52:24 +0000 (04:52 +0000)]
am
6b33bed4: am
0699fbf7: Reduce log spam by changing a LOG(INFO) to VLOG(startup)
* commit '
6b33bed442b9152e3a707792d633c3b4d316ebc0':
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Alex Light [Tue, 26 Aug 2014 04:52:23 +0000 (04:52 +0000)]
am
0e73bdac: (-s ours) am
507e6180: Support running without a boot image.
* commit '
0e73bdac10d1d5aa27351a90a01d516c101f36b1':
Support running without a boot image.
Mathieu Chartier [Tue, 26 Aug 2014 04:17:42 +0000 (04:17 +0000)]
am
0b50629a: Merge "Fixed typo in entrypoint stub."
* commit '
0b50629a79a387b4ab2066610c4803aae046ab30':
Fixed typo in entrypoint stub.
Hiroshi Yamauchi [Tue, 26 Aug 2014 04:17:40 +0000 (04:17 +0000)]
am
32b49871: Merge "Remove an intermediate field array in ClassLinker::InitializeClass."
* commit '
32b498713a11958bac2af0f51b2b49ef88f4bd07':
Remove an intermediate field array in ClassLinker::InitializeClass.
Andreas Gampe [Tue, 26 Aug 2014 03:55:01 +0000 (20:55 -0700)]
ART: kSuper also has IncompatibleClassChangeError
When resolving methods, kSuper can also have
IncompatibleClassChangeError.
Bug:
17266767
Change-Id: I5fafe03ad578f605825a3d0c89f1254a4a385b76
Andreas Gampe [Tue, 26 Aug 2014 03:46:31 +0000 (20:46 -0700)]
ART: Fix IncompatibleClassChange check for ArtMethod
In case of kSuper we should complain sometimes.
Bug:
17265201
Change-Id: Ifad903a750495963c7128296713fbd7c4add71cd
Mathieu Chartier [Tue, 26 Aug 2014 03:42:19 +0000 (03:42 +0000)]
am
eac98d7c: Merge "Reduce GC log spam." into lmp-dev
* commit '
eac98d7cb0f84c664d22deebf1ae5062730d7a31':
Reduce GC log spam.
Mathieu Chartier [Tue, 26 Aug 2014 03:31:59 +0000 (03:31 +0000)]
Merge "Reduce GC log spam."
Mathieu Chartier [Tue, 26 Aug 2014 02:46:57 +0000 (19:46 -0700)]
Reduce GC log spam.
Homogeneous compaction and collector transitions now print to
VLOG(gc) instead of LOG(INFO).
Bug:
17166556
(cherry picked from commit
0ab56e95e203806dae347056d3331a3e6037457d)
Change-Id: I33157ca27da86cbb741759bb0bda6d38d1f5bfcd
Mathieu Chartier [Tue, 26 Aug 2014 03:30:33 +0000 (03:30 +0000)]
Merge "Reduce GC log spam." into lmp-dev
Mathieu Chartier [Tue, 26 Aug 2014 02:46:57 +0000 (19:46 -0700)]
Reduce GC log spam.
Homogeneous compaction and collector transitions now print to
VLOG(gc) instead of LOG(INFO).
Bug:
17166556
Change-Id: I5d54acf36a9b2763922e6329596a2f191d45535c
Mathieu Chartier [Tue, 26 Aug 2014 01:30:04 +0000 (01:30 +0000)]
Merge "Fixed typo in entrypoint stub."
Fred Shih [Tue, 26 Aug 2014 01:19:50 +0000 (18:19 -0700)]
Fixed typo in entrypoint stub.
Fixed typo for x86 stub causing mac build failure.
Change-Id: I5e063fb87c598c2d9beb22f6d5b97b7fd4df9b84
Hiroshi Yamauchi [Tue, 26 Aug 2014 00:27:55 +0000 (00:27 +0000)]
Merge "Remove an intermediate field array in ClassLinker::InitializeClass."
Ian Rogers [Tue, 26 Aug 2014 00:13:11 +0000 (00:13 +0000)]
am
1ff1747e: Merge "ART: Extending FlagsOf"
* commit '
1ff1747e71f0e1b3dbb181b52c2b4880bfa019fc':
ART: Extending FlagsOf
Mathieu Chartier [Mon, 25 Aug 2014 23:32:41 +0000 (16:32 -0700)]
Map heap maps at a lower address.
We now map the heap mmaps at a lower address in case the app needs
larger continuous address space.
Bug:
16502380
Change-Id: I2cc11d0c207c0eae8db0c5025a48b11119c5a802
Hiroshi Yamauchi [Fri, 22 Aug 2014 19:12:56 +0000 (12:12 -0700)]
Remove an intermediate field array in ClassLinker::InitializeClass.
This improves on CL 105090 by removing the need for the intermediate
field array by iterating two iterators in parallel.
Bug:
12687968
Change-Id: I32d4570948a9d39ccb1c20a02e18b48f15ed0738
Ian Rogers [Mon, 25 Aug 2014 22:52:34 +0000 (22:52 +0000)]
Merge "ART: Extending FlagsOf"
buzbee [Mon, 25 Aug 2014 16:34:03 +0000 (09:34 -0700)]
Quick compiler: fix DCHECK
A DCHECK intended to verify the soundness of the mapping between
a wide Dalvik value and a pair of temp registers incorrectly fired
when the temp register pair was associated with a wide temporary
(i.e. - when (SReg() == INVALID_SREG)).
In this particular situation, the wideness flag is meaningful only when
there is an associated valid vreg. Code rearranged to only perform
the DCHECK and reset the partner's wideness bit when we're dealing with
a live wide value.
b/
16484538
Change-Id: I3b8a7bebc5d918c65ea56ae8db0a8a5cd8003386
Mathieu Chartier [Mon, 25 Aug 2014 21:48:57 +0000 (21:48 +0000)]
am
7713d104: Merge "Reduced memory usage of primitive fields smaller than 4-bytes"
* commit '
7713d104f34606161fbf36497be2e2aa76d87ca9':
Reduced memory usage of primitive fields smaller than 4-bytes
Mathieu Chartier [Mon, 25 Aug 2014 21:23:50 +0000 (21:23 +0000)]
Merge "Reduced memory usage of primitive fields smaller than 4-bytes"
Jean Christophe Beyler [Tue, 29 Jul 2014 20:20:42 +0000 (13:20 -0700)]
ART: Extending FlagsOf
Modified FlagsOf to handle extended flags.
Change-Id: I9e47e0c42816136b2b53512c914200dd9dd11376
Signed-off-by: Jean Christophe Beyler <jean.christophe.beyler@intel.com>
Alex Light [Mon, 25 Aug 2014 18:57:06 +0000 (18:57 +0000)]
am
0699fbf7: Reduce log spam by changing a LOG(INFO) to VLOG(startup)
* commit '
0699fbf769befd3a850005790b26941c38fa2fb4':
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Alex Light [Mon, 25 Aug 2014 18:57:05 +0000 (18:57 +0000)]
am
507e6180: Support running without a boot image.
* commit '
507e6180ad271eb719c67ce7394852c731d975a5':
Support running without a boot image.
Brian Carlstrom [Mon, 25 Aug 2014 18:40:35 +0000 (18:40 +0000)]
am
072a8bf6: Merge "Reduce log spam by changing a LOG(INFO) to VLOG(startup)"
* commit '
072a8bf6883b6f6f178200ff9f03aa8d56a83c40':
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Alex Light [Thu, 21 Aug 2014 16:45:00 +0000 (09:45 -0700)]
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Bug:
17166556
(cherry picked from commit
b6cabc1345ec307559a6e85141fb69b7caa9413c)
Change-Id: I9975ba07ad8f119a6e367e2770a60040a462149b
Fred Shih [Thu, 17 Jul 2014 01:38:08 +0000 (18:38 -0700)]
Reduced memory usage of primitive fields smaller than 4-bytes
Reduced memory used by byte and boolean fields from 4 bytes down to a
single byte and shorts and chars down to two bytes. Fields are now
arranged as Reference followed by decreasing component sizes, with
fields shuffled forward as needed.
Bug:
8135266
Change-Id: I65eaf31ed27e5bd5ba0c7d4606454b720b074752
Brian Carlstrom [Mon, 25 Aug 2014 18:12:06 +0000 (18:12 +0000)]
Merge "Reduce log spam by changing a LOG(INFO) to VLOG(startup)"
Alex Light [Tue, 19 Aug 2014 21:23:13 +0000 (14:23 -0700)]
Support running without a boot image.
Bug:
17000769
(cherry picked from commit
64ad14dbe2225441fb7734bf6d89358d96692eea)
Change-Id: I6404d5050c8a2f4ee6e70d58532eb25ee9de248e
Brian Carlstrom [Mon, 25 Aug 2014 18:07:43 +0000 (18:07 +0000)]
am
e25826e2: Merge "Support running without a boot image."
* commit '
e25826e28ea65d9c1aa23f84788a091c677b20c7':
Support running without a boot image.
Mathieu Chartier [Mon, 25 Aug 2014 18:07:42 +0000 (18:07 +0000)]
am
21259fed: Merge "Fix GC memory overhead accounting."
* commit '
21259fedf4fd0f786c71f69493ebfbb9affe3a8d':
Fix GC memory overhead accounting.
Mathieu Chartier [Mon, 25 Aug 2014 18:06:05 +0000 (18:06 +0000)]
am
6e384ed1: am
73aa0b03: Merge "Fix GC memory overhead accounting." into lmp-dev
* commit '
6e384ed176ed197887013387c9ddd455cf76594e':
Fix GC memory overhead accounting.
Alex Light [Thu, 21 Aug 2014 16:45:00 +0000 (09:45 -0700)]
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Bug:
17166556
Change-Id: I9975ba07ad8f119a6e367e2770a60040a462149b
Mathieu Chartier [Mon, 25 Aug 2014 18:03:26 +0000 (18:03 +0000)]
am
9177f20c: Merge "Clean up Handle usage."
* commit '
9177f20c8c090a94c3558abdafececf51e5417d1':
Clean up Handle usage.
Mathieu Chartier [Mon, 25 Aug 2014 17:54:06 +0000 (17:54 +0000)]
am
73aa0b03: Merge "Fix GC memory overhead accounting." into lmp-dev
* commit '
73aa0b03a56a19b73c51136c32624bc5069782e0':
Fix GC memory overhead accounting.
Brian Carlstrom [Mon, 25 Aug 2014 17:51:38 +0000 (17:51 +0000)]
Merge "Support running without a boot image."
Mathieu Chartier [Mon, 25 Aug 2014 17:47:37 +0000 (17:47 +0000)]
Merge "Fix GC memory overhead accounting."
Mathieu Chartier [Mon, 25 Aug 2014 17:43:17 +0000 (17:43 +0000)]
Merge "Fix GC memory overhead accounting." into lmp-dev
Mathieu Chartier [Thu, 21 Aug 2014 19:21:48 +0000 (12:21 -0700)]
Fix GC memory overhead accounting.
There was some missing null checks.
Bug:
16238192
(cherry picked from commit
2e290fb35ba1959e5a0ac85e87591ab9623808c1)
Change-Id: I4220272ac9c194e30fc307fca9918a4bb725e261
Alex Light [Tue, 19 Aug 2014 21:23:13 +0000 (14:23 -0700)]
Support running without a boot image.
Bug:
17000769
Change-Id: I6404d5050c8a2f4ee6e70d58532eb25ee9de248e
Mathieu Chartier [Mon, 25 Aug 2014 16:50:39 +0000 (16:50 +0000)]
Merge "Clean up Handle usage."
Mathieu Chartier [Sat, 23 Aug 2014 23:37:27 +0000 (16:37 -0700)]
Clean up Handle usage.
Prefer using ConstHandle instead of Handle as function arguments
since you can't assign new references to ConstHandle which helps
prevent bugs.
Changed NullHandle to be a ConstHandle so that you can never modify
it to be a non null reference.
Change-Id: I81cb979f6f8d5b49e5614966a2caf28c3701dd4f
Andreas Gampe [Sat, 23 Aug 2014 06:13:45 +0000 (23:13 -0700)]
resolved conflicts for merge of
495541b1 to lmp-dev-plus-aosp
Change-Id: I2cd82b1a6976983f5042d846e92dd03b2de66203
Andreas Gampe [Sat, 23 Aug 2014 06:05:48 +0000 (06:05 +0000)]
am
762f0a5b: Merge "ART: Clean up compiler"
* commit '
762f0a5bdd238458bbb463a9565388f2047a98d4':
ART: Clean up compiler
Andreas Gampe [Sat, 23 Aug 2014 05:47:17 +0000 (05:47 +0000)]
Merge "ART: Clean up compiler"
Andreas Gampe [Wed, 13 Aug 2014 06:19:23 +0000 (23:19 -0700)]
ART: Clean up compiler
Clean up the compiler: less extern functions, dis-entangle
compilers, hide some compiler specifics, lower global includes.
Change-Id: Ibaf88d02505d86994d7845cf0075be5041cc8438
Mathieu Chartier [Sat, 23 Aug 2014 01:36:04 +0000 (01:36 +0000)]
am
e6916c42: Merge "Add fallback for non moving space being full."
* commit '
e6916c429c16ae8ae3b8cd641d662742c23d1fb5':
Add fallback for non moving space being full.
Mathieu Chartier [Sat, 23 Aug 2014 01:20:59 +0000 (01:20 +0000)]
am
83a2192d: Merge "Add fallback for non moving space being full." into lmp-dev
* commit '
83a2192d360cdf678c9d4422b5f1bc73d5df602b':
Add fallback for non moving space being full.
Mathieu Chartier [Sat, 23 Aug 2014 01:09:34 +0000 (01:09 +0000)]
Merge "Add fallback for non moving space being full."
Mathieu Chartier [Fri, 22 Aug 2014 21:53:04 +0000 (14:53 -0700)]
Add fallback for non moving space being full.
When the non moving space becomes full, we disable moving GC and
make the main space the new non moving space.
Also added a runtime option for changing the non moving space size:
-XX:NonMovingSpaceCapacity.
Bug:
17189964
(cherry picked from commit
4c5a469683e433f126c9863cd393747d2e7c4a29)
Change-Id: If82e3c6f8a0f389e37e14a0b1e6d5126d571fd7a
Mathieu Chartier [Sat, 23 Aug 2014 01:01:19 +0000 (01:01 +0000)]
Merge "Add fallback for non moving space being full." into lmp-dev