OSDN Git Service
Vladimir Marko [Sat, 6 Jun 2015 00:35:28 +0000 (00:35 +0000)]
am
49f0ae85: am
b8154d5c: resolved conflicts for merge of
e8a4b652 to lmp-mr1-ub-dev
* commit '
49f0ae855b802c3f3500d583895587bd4344ee72':
Revert "Quick: Create GC map based on compiler data. DO NOT MERGE"
Vladimir Marko [Sat, 6 Jun 2015 00:35:27 +0000 (00:35 +0000)]
am
76e8509e: am
5d3acebd: resolved conflicts for merge of
c8d000a1 to lmp-mr1-ub-dev
* commit '
76e8509e457cbb361532b5ef64b5551f08843a3d':
Revert "Quick: Fix "select" pattern to update data used for GC maps. DO NOT MERGE"
Vladimir Marko [Sat, 6 Jun 2015 00:35:26 +0000 (00:35 +0000)]
am
6ff4f156: am
e279c0c4: resolved conflicts for merge of
fad2cbf9 to lmp-mr1-ub-dev
* commit '
6ff4f156f6f916e4fe70106788b992bfc474d117':
Quick: Fix "select" pattern to update data used for GC maps. DO NOT MERGE
Vladimir Marko [Sat, 6 Jun 2015 00:35:25 +0000 (00:35 +0000)]
am
8a221b6c: am
fb695b34: resolved conflicts for merge of
7cc8f9aa to lmp-mr1-ub-dev
* commit '
8a221b6c6e97944b00434ff7cfc94535dfb5dc2c':
Quick: Create GC map based on compiler data. DO NOT MERGE
Vladimir Marko [Sat, 6 Jun 2015 00:06:18 +0000 (00:06 +0000)]
am
b8154d5c: resolved conflicts for merge of
e8a4b652 to lmp-mr1-ub-dev
* commit '
b8154d5cc707921fadf92fedc65a66a3e8901126':
Revert "Quick: Create GC map based on compiler data. DO NOT MERGE"
Vladimir Marko [Sat, 6 Jun 2015 00:06:16 +0000 (00:06 +0000)]
am
5d3acebd: resolved conflicts for merge of
c8d000a1 to lmp-mr1-ub-dev
* commit '
5d3acebd1fe859cbf6fb3831815eb7f3c1f3e442':
Revert "Quick: Fix "select" pattern to update data used for GC maps. DO NOT MERGE"
Vladimir Marko [Sat, 6 Jun 2015 00:06:13 +0000 (00:06 +0000)]
am
e279c0c4: resolved conflicts for merge of
fad2cbf9 to lmp-mr1-ub-dev
* commit '
e279c0c4e9ecc464ab10c9d9cd3404c3b0ed6845':
Quick: Fix "select" pattern to update data used for GC maps. DO NOT MERGE
Mathieu Chartier [Sat, 6 Jun 2015 00:06:13 +0000 (00:06 +0000)]
am
997e4bc4: am
6d359184: Merge "Use runFinalizationWithTimeout for native allocations"
* commit '
997e4bc44ae7a0d3138b2138d54db9470254d3b8':
Use runFinalizationWithTimeout for native allocations
Vladimir Marko [Sat, 6 Jun 2015 00:06:12 +0000 (00:06 +0000)]
am
fb695b34: resolved conflicts for merge of
7cc8f9aa to lmp-mr1-ub-dev
* commit '
fb695b34268bb7f9270f07ecaac554e49b5b6a92':
Quick: Create GC map based on compiler data. DO NOT MERGE
Mathieu Chartier [Fri, 5 Jun 2015 23:52:48 +0000 (23:52 +0000)]
am
6d359184: Merge "Use runFinalizationWithTimeout for native allocations"
* commit '
6d3591845235b9effd2e7b0238443b94ecabf967':
Use runFinalizationWithTimeout for native allocations
Mathieu Chartier [Fri, 5 Jun 2015 23:44:27 +0000 (23:44 +0000)]
Merge "Use runFinalizationWithTimeout for native allocations"
Mathieu Chartier [Fri, 5 Jun 2015 23:39:09 +0000 (23:39 +0000)]
am
3b532d74: Use runFinalizationWithTimeout for native allocations
* commit '
3b532d744034b43ed329a3198f15846d80fec3f0':
Use runFinalizationWithTimeout for native allocations
Mathieu Chartier [Fri, 5 Jun 2015 20:21:05 +0000 (13:21 -0700)]
Use runFinalizationWithTimeout for native allocations
Prevents deadlocks by not waiting longer than 250ms for finalizers
to complete.
(cherry picked from commit
3b532d744034b43ed329a3198f15846d80fec3f0)
Bug:
21544853
Change-Id: I57b2f7ae8b74185922eb3c15ba0ab71a4d2348aa
Mathieu Chartier [Fri, 5 Jun 2015 20:21:05 +0000 (13:21 -0700)]
Use runFinalizationWithTimeout for native allocations
Prevents deadlocks by not waiting longer than 250ms for finalizers
to complete.
Bug:
21544853
Change-Id: I57b2f7ae8b74185922eb3c15ba0ab71a4d2348aa
Mathieu Chartier [Thu, 4 Jun 2015 23:41:22 +0000 (23:41 +0000)]
am
034e4dd1: am
38b66b6f: Merge "Add atrace calls to runtime start and heap create"
* commit '
034e4dd186af0f0674974b77fa3afd01df619a07':
Add atrace calls to runtime start and heap create
Richard Uhler [Thu, 4 Jun 2015 23:33:20 +0000 (23:33 +0000)]
am
7fabaa6b: Add atrace calls to runtime start and heap create
* commit '
7fabaa6ba1927d21a317c03499b705cbde4f6a47':
Add atrace calls to runtime start and heap create
Mathieu Chartier [Thu, 4 Jun 2015 23:28:56 +0000 (23:28 +0000)]
am
38b66b6f: Merge "Add atrace calls to runtime start and heap create"
* commit '
38b66b6fed1adcc1da4b931a32f78c5290a97c1e':
Add atrace calls to runtime start and heap create
Mathieu Chartier [Thu, 4 Jun 2015 23:19:26 +0000 (23:19 +0000)]
Merge "Add atrace calls to runtime start and heap create"
Richard Uhler [Tue, 7 Apr 2015 17:56:50 +0000 (10:56 -0700)]
Add atrace calls to runtime start and heap create
(cherry picked from commit
7fabaa6ba1927d21a317c03499b705cbde4f6a47)
Bug:
20727525
Change-Id: I91a74b793fb9eda8ed580244a6a5fd313ef2eb27
Mathieu Chartier [Thu, 4 Jun 2015 23:08:29 +0000 (23:08 +0000)]
am
1c8bef4a: Add optimization for LOW_4G allocator
* commit '
1c8bef4a71612f10b89b102434f70de5a127cc74':
Add optimization for LOW_4G allocator
Richard Uhler [Tue, 7 Apr 2015 17:56:50 +0000 (10:56 -0700)]
Add atrace calls to runtime start and heap create
Bug:
20727525
Change-Id: I91a74b793fb9eda8ed580244a6a5fd313ef2eb27
Hiroshi Yamauchi [Thu, 4 Jun 2015 22:56:44 +0000 (22:56 +0000)]
am
240475de: am
da2fd5aa: Merge "If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS."
* commit '
240475dec7ebf205744e6496f845b7f61040eb18':
If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS.
Hiroshi Yamauchi [Thu, 4 Jun 2015 22:50:01 +0000 (22:50 +0000)]
am
da2fd5aa: Merge "If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS."
* commit '
da2fd5aa2cbdab371f9a1c29ff4e4dfd09305fdc':
If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS.
Mathieu Chartier [Thu, 4 Jun 2015 22:44:49 +0000 (22:44 +0000)]
am
3f18d8bc: am
8c46e0d5: Merge "Add optimization for LOW_4G allocator"
* commit '
3f18d8bc7e18fa1036908777f156990b3490c4f3':
Add optimization for LOW_4G allocator
Hiroshi Yamauchi [Thu, 4 Jun 2015 22:38:10 +0000 (22:38 +0000)]
Merge "If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS."
Mathieu Chartier [Thu, 4 Jun 2015 22:32:39 +0000 (22:32 +0000)]
am
8c46e0d5: Merge "Add optimization for LOW_4G allocator"
* commit '
8c46e0d57e52d78196f981d41b9d0434abd6d592':
Add optimization for LOW_4G allocator
Mathieu Chartier [Thu, 4 Jun 2015 22:21:35 +0000 (22:21 +0000)]
Merge "Add optimization for LOW_4G allocator"
Mathieu Chartier [Thu, 4 Jun 2015 20:42:14 +0000 (13:42 -0700)]
Add optimization for LOW_4G allocator
The optimization uses the maps_ field to skip over regions which we
know wont be large enough for the request.
Reduces time to create heap from 500-700ms to 100ms on N9.
(cherry picked from commit
1c8bef4a71612f10b89b102434f70de5a127cc74)
Bug:
20727525
Change-Id: I4fa92d58c2e135ba31a03ababff46669089bb542
Mathieu Chartier [Thu, 4 Jun 2015 20:42:14 +0000 (13:42 -0700)]
Add optimization for LOW_4G allocator
The optimization uses the maps_ field to skip over regions which we
know wont be large enough for the request.
Reduces time to create heap from 500-700ms to 100ms on N9.
Bug:
20727525
Change-Id: I4fa92d58c2e135ba31a03ababff46669089bb542
Nicolas Geoffray [Thu, 4 Jun 2015 19:00:23 +0000 (19:00 +0000)]
am
d04eff5e: am
6a1c92f1: Merge "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
* commit '
d04eff5e4061e6b5d8100370d8f63812684c0778':
Revert "Use HCurrentMethod in HInvokeStaticOrDirect."
Nicolas Geoffray [Thu, 4 Jun 2015 19:00:22 +0000 (19:00 +0000)]
am
33337916: am
8a9fba91: Merge "Do a type check for knowing if we can inline."
* commit '
3333791643c5a33dcaace7e6a684649e4c49bbce':
Do a type check for knowing if we can inline.
Brian Carlstrom [Thu, 4 Jun 2015 19:00:06 +0000 (19:00 +0000)]
am
5428407d: am
fd0fb02c: Merge "Fix JNI GetSuperClasss"
* commit '
5428407d9d7d5e71cb798ecb702c341c65bf16bf':
Fix JNI GetSuperClasss
Roland Levillain [Thu, 4 Jun 2015 16:50:27 +0000 (17:50 +0100)]
If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS.
This change ensures assembly files honoring heap poisoning
(notably used by stub_test) are compiled with
-DART_HEAP_POISONING=1 when this feature is turned on.
Bug:
21621105
Change-Id: I13fe456cd2733a09bdfd3a9808cfd70513b14698
David Brazdil [Thu, 4 Jun 2015 17:33:47 +0000 (17:33 +0000)]
am
e81a1f03: am
962863b6: Merge "Cache stack map encoding"
* commit '
e81a1f0361a2b78c692243b9425baea96c00ea80':
Cache stack map encoding
Nicolas Geoffray [Thu, 4 Jun 2015 17:21:41 +0000 (17:21 +0000)]
am
6a1c92f1: Merge "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
* commit '
6a1c92f1e4a455d802ab0d0ac47504cdd7c12f0f':
Revert "Use HCurrentMethod in HInvokeStaticOrDirect."
Nicolas Geoffray [Thu, 4 Jun 2015 17:21:39 +0000 (17:21 +0000)]
am
8a9fba91: Merge "Do a type check for knowing if we can inline."
* commit '
8a9fba9154310ddc8024150ca8cd5a7c4b76b71b':
Do a type check for knowing if we can inline.
Nicolas Geoffray [Thu, 4 Jun 2015 17:17:45 +0000 (17:17 +0000)]
Merge "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
Nicolas Geoffray [Thu, 4 Jun 2015 17:17:32 +0000 (17:17 +0000)]
Revert "Use HCurrentMethod in HInvokeStaticOrDirect."
Fails on baseline/x86.
This reverts commit
38207af82afb6f99c687f64b15601ed20d82220a.
Change-Id: Ib71018367eb7c6046965494a7e996c22af3de403
Nicolas Geoffray [Thu, 4 Jun 2015 17:12:17 +0000 (17:12 +0000)]
Merge "Do a type check for knowing if we can inline."
Brian Carlstrom [Thu, 4 Jun 2015 17:04:24 +0000 (17:04 +0000)]
am
fd0fb02c: Merge "Fix JNI GetSuperClasss"
* commit '
fd0fb02c728689ca32a12476c707b96f6ca3e1fe':
Fix JNI GetSuperClasss
Nicolas Geoffray [Thu, 4 Jun 2015 17:02:34 +0000 (18:02 +0100)]
Do a type check for knowing if we can inline.
Otherwise, we might successfully inline:
((String)nonStringObject).charAt()
Because the lookup of the method is based on the index of charAt,
and not its name.
Change-Id: I72ce802fd50cfb71343197f0a32bb1ef56549097
Brian Carlstrom [Thu, 4 Jun 2015 16:54:46 +0000 (16:54 +0000)]
Merge "Fix JNI GetSuperClasss"
David Brazdil [Thu, 4 Jun 2015 16:39:32 +0000 (16:39 +0000)]
am
962863b6: Merge "Cache stack map encoding"
* commit '
962863b6481163eb00e7621ec6f854cb0b6f67bc':
Cache stack map encoding
David Brazdil [Thu, 4 Jun 2015 16:26:10 +0000 (16:26 +0000)]
Merge "Cache stack map encoding"
David Brazdil [Fri, 29 May 2015 15:29:43 +0000 (16:29 +0100)]
Cache stack map encoding
Operations on CodeInfo and StackMap objects repeatedly read encoding
information from the MemoryRegion. Since these are 3-bit-loads of
values that never change, caching them can measurably reduce compile
times.
According to benchmarks, this patch saves 1-3% on armv7, 2-4% on x86,
and 0-1% on x64.
Change-Id: I46b197513601325d8bab562cc80100c00ec28a3b
Brian Carlstrom [Fri, 22 May 2015 20:43:00 +0000 (13:43 -0700)]
Fix JNI GetSuperClasss
Change-Id: I005e9f84220dabfcea7cbc7b7b0ad422dd435a40
Nicolas Geoffray [Thu, 4 Jun 2015 16:10:34 +0000 (16:10 +0000)]
am
4b04f899: am
c47908e8: Merge "Support for inlining virtual and interface calls."
* commit '
4b04f89985da4ed5ca42257aedf6e20fe18db845':
Support for inlining virtual and interface calls.
Nicolas Geoffray [Thu, 4 Jun 2015 16:10:32 +0000 (16:10 +0000)]
am
b02b6b20: am
4c1ac208: Merge "Use HCurrentMethod in HInvokeStaticOrDirect."
* commit '
b02b6b20d79bfb9099f6159b7b54ecf67d87837a':
Use HCurrentMethod in HInvokeStaticOrDirect.
Nicolas Geoffray [Thu, 4 Jun 2015 15:56:34 +0000 (15:56 +0000)]
am
c47908e8: Merge "Support for inlining virtual and interface calls."
* commit '
c47908e8c32fd58bc4dc75998a80f706954db1dc':
Support for inlining virtual and interface calls.
Nicolas Geoffray [Thu, 4 Jun 2015 15:56:33 +0000 (15:56 +0000)]
am
4c1ac208: Merge "Use HCurrentMethod in HInvokeStaticOrDirect."
* commit '
4c1ac208673c677951502552cadc38ae64fe1580':
Use HCurrentMethod in HInvokeStaticOrDirect.
Neil Fuller [Thu, 4 Jun 2015 15:56:16 +0000 (15:56 +0000)]
am
19d02b82: am
73235820: Merge "Revert "Revert "Modification to the way boot classpath resources are loaded"""
* commit '
19d02b82dd6a2f78800b40dc80c07ee02822b776':
Revert "Revert "Modification to the way boot classpath resources are loaded""
Nicolas Geoffray [Thu, 4 Jun 2015 15:50:31 +0000 (15:50 +0000)]
Merge "Support for inlining virtual and interface calls."
Nicolas Geoffray [Thu, 4 Jun 2015 15:49:21 +0000 (15:49 +0000)]
Merge "Use HCurrentMethod in HInvokeStaticOrDirect."
Neil Fuller [Thu, 4 Jun 2015 15:44:53 +0000 (15:44 +0000)]
am
73235820: Merge "Revert "Revert "Modification to the way boot classpath resources are loaded"""
* commit '
732358201f5c319efe9119c2f61116ec85ad4187':
Revert "Revert "Modification to the way boot classpath resources are loaded""
Neil Fuller [Thu, 4 Jun 2015 15:38:05 +0000 (15:38 +0000)]
Merge "Revert "Revert "Modification to the way boot classpath resources are loaded"""
Nicolas Geoffray [Wed, 3 Jun 2015 14:04:32 +0000 (15:04 +0100)]
Support for inlining virtual and interface calls.
Also had to change the pass order to get reference type propagation
before the inliner.
Change-Id: I4bf3bbb2d17c7d9cab632cfdd96adad8368bdfea
Nicolas Geoffray [Mon, 1 Jun 2015 14:46:22 +0000 (15:46 +0100)]
Use HCurrentMethod in HInvokeStaticOrDirect.
Change-Id: I0d15244b6b44c8b10079398c55da5071a3e3af66
Calin Juravle [Thu, 4 Jun 2015 13:28:44 +0000 (13:28 +0000)]
am
1600f81f: am
6d8bd45e: Merge "Add $ tag to make sure a method has not been inlined."
* commit '
1600f81fb4960303d95b7a5cf6307d176b389ffe':
Add $noinline$ tag to make sure a method has not been inlined.
Calin Juravle [Thu, 4 Jun 2015 13:14:50 +0000 (13:14 +0000)]
am
6d8bd45e: Merge "Add $ tag to make sure a method has not been inlined."
* commit '
6d8bd45e585d549bda42da22ee96e7149cfd720d':
Add $noinline$ tag to make sure a method has not been inlined.
Calin Juravle [Thu, 4 Jun 2015 13:01:51 +0000 (13:01 +0000)]
Merge "Add $noinline$ tag to make sure a method has not been inlined."
Neil Fuller [Thu, 4 Jun 2015 12:24:08 +0000 (12:24 +0000)]
Revert "Revert "Modification to the way boot classpath resources are loaded""
This reverts commit
1e27c5bd372fbe55c46127c8f233a13d9994334c.
Change-Id: I8f45a890ae1d3c0b0497e4fea4fb5a4c7a07b59f
Guillaume "Vermeille" Sanchez [Wed, 3 Jun 2015 14:32:41 +0000 (15:32 +0100)]
Add $noinline$ tag to make sure a method has not been inlined.
Change-Id: Ic166cf43be566a0fa44c3c9e1939f647806fc500
Vladimir Marko [Thu, 4 Jun 2015 10:14:23 +0000 (11:14 +0100)]
resolved conflicts for merge of
e8a4b652 to lmp-mr1-ub-dev
Vladimir Marko [Thu, 4 Jun 2015 10:04:05 +0000 (11:04 +0100)]
resolved conflicts for merge of
c8d000a1 to lmp-mr1-ub-dev
Vladimir Marko [Thu, 4 Jun 2015 09:59:53 +0000 (10:59 +0100)]
resolved conflicts for merge of
fad2cbf9 to lmp-mr1-ub-dev
Vladimir Marko [Thu, 4 Jun 2015 09:53:59 +0000 (10:53 +0100)]
resolved conflicts for merge of
7cc8f9aa to lmp-mr1-ub-dev
Change-Id: I6203b6d8be029440f635b9575559ba6add9a46d6
Vladimir Marko [Thu, 4 Jun 2015 09:48:26 +0000 (09:48 +0000)]
Merge "Revert "Quick: Create GC map based on compiler data. DO NOT MERGE"" into cw-d-mr1-dev
Vladimir Marko [Thu, 4 Jun 2015 09:47:47 +0000 (09:47 +0000)]
Revert "Quick: Create GC map based on compiler data. DO NOT MERGE"
This reverts commit
7cc8f9aa1349fd6cb0814a653ee2d1164a7fb9f7.
Change-Id: Iadb4462bf8e834c6a847c01ee6eb332a325de22c
Vladimir Marko [Thu, 4 Jun 2015 09:47:21 +0000 (09:47 +0000)]
Revert "Quick: Fix "select" pattern to update data used for GC maps. DO NOT MERGE"
This reverts commit
fad2cbf97c71b9742ccd88cc1a5ba13fa918e677.
Change-Id: I175dd9e49014b71a300d987678032bd624a99cf1
Mathieu Chartier [Thu, 4 Jun 2015 02:04:28 +0000 (02:04 +0000)]
am
c991403c: Fix valgrind large_object_space_test
* commit '
c991403cd8b869e4a38c11c6a58223b82b89a1b2':
Fix valgrind large_object_space_test
Mathieu Chartier [Thu, 4 Jun 2015 01:58:42 +0000 (01:58 +0000)]
am
0a25821f: am
2029c632: Merge "Fix valgrind large_object_space_test"
* commit '
0a25821f70d9397d4d09cc4031fa77c58b9c9fec':
Fix valgrind large_object_space_test
Mathieu Chartier [Thu, 4 Jun 2015 01:46:51 +0000 (01:46 +0000)]
am
2029c632: Merge "Fix valgrind large_object_space_test"
* commit '
2029c6320a3ff996095b294534ba7236bc97c45f':
Fix valgrind large_object_space_test
Mathieu Chartier [Thu, 4 Jun 2015 01:35:44 +0000 (01:35 +0000)]
Merge "Fix valgrind large_object_space_test"
Mathieu Chartier [Thu, 4 Jun 2015 00:32:42 +0000 (17:32 -0700)]
Fix valgrind large_object_space_test
Also some cleanup.
(cherry picked from commit
c991403cd8b869e4a38c11c6a58223b82b89a1b2)
Change-Id: I9c1a8093e6356f1b52e332009429b77fa5c1d448
Mathieu Chartier [Thu, 4 Jun 2015 00:32:42 +0000 (17:32 -0700)]
Fix valgrind large_object_space_test
Also some cleanup.
Change-Id: I9c1a8093e6356f1b52e332009429b77fa5c1d448
Mathieu Chartier [Wed, 3 Jun 2015 23:38:10 +0000 (23:38 +0000)]
am
c1044dee: am
dc4a4e0f: Merge "Add a way to determine if a large object is a zygote object"
* commit '
c1044dee87d9752814444b55e113c403a8c283d5':
Add a way to determine if a large object is a zygote object
Andreas Gampe [Wed, 3 Jun 2015 23:38:09 +0000 (23:38 +0000)]
am
ea9ded0f: am
455f320d: Merge "ART: Refactor Thread::Init"
* commit '
ea9ded0f7052ca226ee01d71ad9458acebf9f13a':
ART: Refactor Thread::Init
Mathieu Chartier [Wed, 3 Jun 2015 23:24:01 +0000 (23:24 +0000)]
am
dc4a4e0f: Merge "Add a way to determine if a large object is a zygote object"
* commit '
dc4a4e0fa3af68d493fd49e7887cdcb748d64b6d':
Add a way to determine if a large object is a zygote object
Andreas Gampe [Wed, 3 Jun 2015 23:23:59 +0000 (23:23 +0000)]
am
455f320d: Merge "ART: Refactor Thread::Init"
* commit '
455f320d7238e1902b36553cddf4412ae7ee2e31':
ART: Refactor Thread::Init
Mathieu Chartier [Wed, 3 Jun 2015 23:12:44 +0000 (23:12 +0000)]
Merge "Add a way to determine if a large object is a zygote object"
Andreas Gampe [Wed, 3 Jun 2015 23:11:48 +0000 (23:11 +0000)]
Merge "ART: Refactor Thread::Init"
Andreas Gampe [Tue, 2 Jun 2015 05:29:51 +0000 (22:29 -0700)]
ART: Refactor Thread::Init
This refactor allows the parent thread to allocate the JNIEnvExt
for the child (with a fallback in place in Init). This allows to
throw an OOME in CreateNativeThread instead of aborting in the
child.
Bug:
21291279
(cherry picked from commit
520abbd0edcf333f07164539620ce65258c72383)
Change-Id: Iccc1a5c202999f5bfacec706d9833e53135ba2fa
Mathieu Chartier [Wed, 3 Jun 2015 20:32:15 +0000 (13:32 -0700)]
Add a way to determine if a large object is a zygote object
Also fix a slight memory leak in LargeObjectMapSpace.
Bug:
20674158
(cherry picked from commit
8f23620d45399286564986d2541cda761b3fe0ac)
Change-Id: I2416df484e5b84a8c5cc0b5664c8cb102dc235f6
Mathieu Chartier [Wed, 3 Jun 2015 23:04:18 +0000 (23:04 +0000)]
am
8f23620d: Add a way to determine if a large object is a zygote object
* commit '
8f23620d45399286564986d2541cda761b3fe0ac':
Add a way to determine if a large object is a zygote object
Mathieu Chartier [Wed, 3 Jun 2015 20:32:15 +0000 (13:32 -0700)]
Add a way to determine if a large object is a zygote object
Also fix a slight memory leak in LargeObjectMapSpace.
Bug:
20674158
Change-Id: I2416df484e5b84a8c5cc0b5664c8cb102dc235f6
Andreas Gampe [Wed, 3 Jun 2015 20:46:38 +0000 (20:46 +0000)]
am
99b4dcd1: Merge "ART: Refactor Thread::Init" into mnc-dev
* commit '
99b4dcd19af9343bde1f6fbdb24bb010a70144c9':
ART: Refactor Thread::Init
Andreas Gampe [Wed, 3 Jun 2015 20:27:44 +0000 (20:27 +0000)]
Merge "ART: Refactor Thread::Init" into mnc-dev
Andreas Gampe [Wed, 3 Jun 2015 20:16:07 +0000 (20:16 +0000)]
am
9938b671: am
2519fc40: Merge "ART: Prune FindArrayClass cache in image writer"
* commit '
9938b671caec0ffc89d3cbb675fc15535fe5247d':
ART: Prune FindArrayClass cache in image writer
Andreas Gampe [Wed, 3 Jun 2015 20:02:53 +0000 (20:02 +0000)]
am
2519fc40: Merge "ART: Prune FindArrayClass cache in image writer"
* commit '
2519fc40d4ae89322d28d1ff610fe81bb90fb564':
ART: Prune FindArrayClass cache in image writer
Andreas Gampe [Tue, 2 Jun 2015 05:29:51 +0000 (22:29 -0700)]
ART: Refactor Thread::Init
This refactor allows the parent thread to allocate the JNIEnvExt
for the child (with a fallback in place in Init). This allows to
throw an OOME in CreateNativeThread instead of aborting in the
child.
Bug:
21291279
Change-Id: Iccc1a5c202999f5bfacec706d9833e53135ba2fa
Andreas Gampe [Wed, 3 Jun 2015 19:54:30 +0000 (19:54 +0000)]
Merge "ART: Prune FindArrayClass cache in image writer"
Kenny Root [Wed, 3 Jun 2015 19:38:19 +0000 (19:38 +0000)]
am
bfb43dce: am
1710bf30: Merge "Tidy up spelling"
* commit '
bfb43dceb72d471ac00981cb7e1f84014453adce':
Tidy up spelling
Kenny Root [Wed, 3 Jun 2015 19:22:37 +0000 (19:22 +0000)]
am
1710bf30: Merge "Tidy up spelling"
* commit '
1710bf308c1465d2130547c0aa9066d28d57648b':
Tidy up spelling
Kenny Root [Wed, 3 Jun 2015 19:15:05 +0000 (19:15 +0000)]
Merge "Tidy up spelling"
Mathieu Chartier [Wed, 3 Jun 2015 19:14:51 +0000 (19:14 +0000)]
am
aa3a6732: am
ffbf83b6: Merge "Emit instance fields for java.lang.Object in hprof"
* commit '
aa3a6732119d4002f728d5b50eefebe97d169ccc':
Emit instance fields for java.lang.Object in hprof
Vladimir Marko [Wed, 25 Mar 2015 11:13:39 +0000 (11:13 +0000)]
Quick: Fix "select" pattern to update data used for GC maps. DO NOT MERGE
Follow-up to
https://android-review.googlesource.com/143222
(cherry picked from commit
6e07183e822a32856da9eb60006989496e06a9cc)
Change-Id: I916743c845d9568063cd6a4b2ef71e9cbc43dee8
Vladimir Marko [Fri, 20 Mar 2015 12:47:30 +0000 (12:47 +0000)]
Quick: Create GC map based on compiler data. DO NOT MERGE
The Quick compiler and verifier sometimes disagree on dalvik
register types (fp/core/ref) for 0/null constants and merged
registers involving 0/null constants. Since the verifier is
more lenient it can mark a register as a reference for GC
where Quick considers it a floating point register or a dead
register (which would have a ref/fp conflict if not dead).
If the compiler used an fp register to hold the zero value,
the core register or stack location used by GC based on the
verifier data can hold an invalid value.
Previously, as a workaround we stored the fp zero value also
in the stack location or core register where GC would look
for it. This wasn't precise and may have missed some cases.
To fix this properly, we now generate GC maps based on the
compiler's notion of references if register promotion is
enabled.
Bug: https://code.google.com/p/android/issues/detail?id=147187
(cherry picked from commit
767c752fddc64e280dba507457e4f06002b5f678)
Change-Id: Id75428fd0a2f6bdd2ccb20ce75cdeab01150e455
Mathieu Chartier [Wed, 3 Jun 2015 18:49:46 +0000 (18:49 +0000)]
am
9cfde7b2: Merge "Emit instance fields for java.lang.Object in hprof" into mnc-dev
* commit '
9cfde7b21eeb18040f3264f3b5f66baa34b0c568':
Emit instance fields for java.lang.Object in hprof
Andreas Gampe [Wed, 3 Jun 2015 18:46:04 +0000 (18:46 +0000)]
am
44905ce1: ART: Prune FindArrayClass cache in image writer
* commit '
44905ce1c97613a5cb44046049843fe1029a64cf':
ART: Prune FindArrayClass cache in image writer
Mathieu Chartier [Wed, 3 Jun 2015 18:36:42 +0000 (18:36 +0000)]
am
ffbf83b6: Merge "Emit instance fields for java.lang.Object in hprof"
* commit '
ffbf83b6e9ff4e3dd12a99cb607d4d3a6630d7bc':
Emit instance fields for java.lang.Object in hprof