OSDN Git Service
Andreas Gampe [Tue, 8 Dec 2015 22:42:10 +0000 (22:42 +0000)]
Merge "ART: Check invoke-interface earlier in verifier"
am:
eb5ddd7b02
* commit '
eb5ddd7b02ce2d25d4f28f85a13aac628526e1c1':
ART: Check invoke-interface earlier in verifier
Andreas Gampe [Tue, 8 Dec 2015 22:33:23 +0000 (22:33 +0000)]
Merge "ART: Check invoke-interface earlier in verifier"
Andreas Gampe [Fri, 4 Dec 2015 01:27:32 +0000 (17:27 -0800)]
ART: Check invoke-interface earlier in verifier
Invoke-interface should only be called on an interface method.
Move the check earlier, as otherwise we'll try to resolve and
potentially inject a method into the dex cache.
Also templatize ResolveMethod with a version always checking
the invoke type, and on a cache miss check whether type target
type is an interface when an interface invoke type was given.
Bug:
21869691
Change-Id: Ica27158f675b5aa223d9229248189612f4706832
Vladimir Marko [Tue, 8 Dec 2015 16:22:45 +0000 (08:22 -0800)]
Merge "Allow initializing runtime with parsed options." am:
e0d25b156e
am:
2433d4e17c
* commit '
2433d4e17c3006b8262a0d9421e201fc84777208':
Allow initializing runtime with parsed options.
Vladimir Marko [Tue, 8 Dec 2015 16:19:20 +0000 (16:19 +0000)]
Merge "Allow initializing runtime with parsed options."
am:
e0d25b156e
* commit '
e0d25b156ef12b23afa2a6493ae703ec82e23475':
Allow initializing runtime with parsed options.
Vladimir Marko [Tue, 8 Dec 2015 16:15:24 +0000 (16:15 +0000)]
Merge "Allow initializing runtime with parsed options."
Roland Levillain [Tue, 8 Dec 2015 14:02:32 +0000 (14:02 +0000)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used." am:
763fd2d3d1
am:
74af075f11
* commit '
74af075f11e23918edc25c86fb2f1d8209cf94fc':
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
Roland Levillain [Tue, 8 Dec 2015 13:59:35 +0000 (13:59 +0000)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used."
am:
763fd2d3d1
* commit '
763fd2d3d131898cad6295a19ae9a30e22ce5f2a':
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
Roland Levillain [Tue, 8 Dec 2015 13:55:39 +0000 (13:55 +0000)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used."
Roland Levillain [Tue, 8 Dec 2015 11:23:02 +0000 (11:23 +0000)]
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
The semantics of "adb push" have changed since the time
system/core was pinned in the master-art manifest.
Bug:
26051370
Change-Id: I3ee6f2694168b0cdc8c8ac37f77fd443879275dc
Vladimir Marko [Tue, 8 Dec 2015 13:49:45 +0000 (13:49 +0000)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string" am:
8dd7165745
am:
436abf7c1b
* commit '
436abf7c1baad0ee38203cabd4f9deba71b949e5':
ART: Instruction dumper should handle out-of-bound index for const-string
Vladimir Marko [Tue, 8 Dec 2015 13:46:52 +0000 (05:46 -0800)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string"
am:
8dd7165745
* commit '
8dd7165745520e339b60d2ae5631894819790f7d':
ART: Instruction dumper should handle out-of-bound index for const-string
Vladimir Marko [Tue, 8 Dec 2015 13:42:52 +0000 (13:42 +0000)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string"
David Brazdil [Tue, 8 Dec 2015 13:13:05 +0000 (05:13 -0800)]
Merge "ART: Enable all optimizations except LSE under try/catch" am:
95f05a89a6
am:
17f715c0bd
* commit '
17f715c0bd89fe6565ba2e3a7270990488c7049e':
ART: Enable all optimizations except LSE under try/catch
David Brazdil [Tue, 8 Dec 2015 13:09:45 +0000 (13:09 +0000)]
Merge "ART: Enable all optimizations except LSE under try/catch"
am:
95f05a89a6
* commit '
95f05a89a682f40151cd843f2110b02c35434635':
ART: Enable all optimizations except LSE under try/catch
David Brazdil [Tue, 8 Dec 2015 13:05:22 +0000 (13:05 +0000)]
Merge "ART: Enable all optimizations except LSE under try/catch"
David Brazdil [Mon, 7 Dec 2015 10:04:40 +0000 (10:04 +0000)]
ART: Enable all optimizations except LSE under try/catch
Dynamic BCE now updates try/catch information during basic block
manipulation and can be enabled. The last missing optimization is LSE.
This patch removes all special-casing from optimizing_compiler.cc and
bails inside LSE instead.
Change-Id: Ie0c6fde7295880ea55d35571455a617fce2b7580
Serdjuk, Nikolay Y [Mon, 7 Dec 2015 08:45:44 +0000 (14:45 +0600)]
ART: Instruction dumper should handle out-of-bound index for const-string
If const-string refers to out-of-bound index then we should handle it
similarly to PrettyField, PrettyMethod and PrettyType.
Change-Id: Ib6b1e20169e4b47c1cdb7dda80320ed21d61cfe3
Signed-off-by: Serdjuk, Nikolay Y <nikolay.y.serdjuk@intel.com>
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:13:04 +0000 (02:13 +0000)]
Merge "Replace proxy class names with deterministic ones for test output." am:
e8be90a673
am:
6df522ec3d
* commit '
6df522ec3d4a2c7ff57d28d3802ec46263c3f2fa':
Replace proxy class names with deterministic ones for test output.
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:08:36 +0000 (02:08 +0000)]
Merge "Replace proxy class names with deterministic ones for test output."
am:
e8be90a673
* commit '
e8be90a673feb573d53277f42282955cbf7f58e9':
Replace proxy class names with deterministic ones for test output.
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:02:40 +0000 (02:02 +0000)]
Merge "Replace proxy class names with deterministic ones for test output."
Hiroshi Yamauchi [Sat, 5 Dec 2015 00:18:49 +0000 (16:18 -0800)]
Replace proxy class names with deterministic ones for test output.
This should avoid potentially flaky test failures in 005-annotations
and 044-proxy.
(cherrypick commit
bc7f8080d1f5d0138cb83cba73a747d43d62c23c)
Bug:
25838574
Bug:
12687968
Change-Id: I08765abd82e41258ce4d1d8bb9dffce70c8b6689
Andreas Gampe [Mon, 7 Dec 2015 23:34:47 +0000 (15:34 -0800)]
Merge "ART: Fix PACKED size of tls_ptr_size." am:
9f62af0e1c
am:
96c37a70b6
* commit '
96c37a70b61360ec0e4aeb9d67b6de08cf131021':
ART: Fix PACKED size of tls_ptr_size.
Mathieu Chartier [Mon, 7 Dec 2015 23:34:38 +0000 (15:34 -0800)]
Merge "Combine class sets when writing a class table" am:
3cf8583a2f
am:
781a197c45
* commit '
781a197c4585f1c61662066e7c937133bf7e0d07':
Combine class sets when writing a class table
Richard Uhler [Mon, 7 Dec 2015 23:34:24 +0000 (15:34 -0800)]
Merge "Annotate root objects and show their types." am:
0e72abfae7
am:
ec698a4bb9
* commit '
ec698a4bb94298aa5b6d0d66f31a42d1a5674abb':
Annotate root objects and show their types.
Roland Levillain [Mon, 7 Dec 2015 23:33:58 +0000 (23:33 +0000)]
Merge "Revert "Fix the ART Buildbots using the master-art manifest."" am:
526377fe8d
am:
867c60b2a1
* commit '
867c60b2a1c1470ba999207cd0ba426a1e28ceee':
Revert "Fix the ART Buildbots using the master-art manifest."
Roland Levillain [Mon, 7 Dec 2015 23:33:44 +0000 (23:33 +0000)]
Merge "Fix the ART Buildbots using the master-art manifest." am:
a2964d5ab5
am:
0be457fd49
* commit '
0be457fd498a47d34a2ad00d53b72898f497afa4':
Fix the ART Buildbots using the master-art manifest.
Roland Levillain [Mon, 7 Dec 2015 23:33:34 +0000 (23:33 +0000)]
Merge "Annotate Boolean literals more uniformly in Optimizing\'s intrinsics." am:
a6756069c4
am:
c78124a016
* commit '
c78124a016326f9d4bf98e0464df62ffbf8b1a0f':
Annotate Boolean literals more uniformly in Optimizing's intrinsics.
Roland Levillain [Mon, 7 Dec 2015 23:33:21 +0000 (23:33 +0000)]
Merge "Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong." am:
038f4f2f4d
am:
daff07a8ab
* commit '
daff07a8ab3fd3fc93db4865ac7eb7bbd7dcf282':
Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong.
Andreas Gampe [Mon, 7 Dec 2015 23:27:19 +0000 (15:27 -0800)]
Merge "ART: Fix PACKED size of tls_ptr_size."
am:
9f62af0e1c
* commit '
9f62af0e1cd770ec3e98f0d1a83a1193e2493cac':
ART: Fix PACKED size of tls_ptr_size.
Andreas Gampe [Mon, 7 Dec 2015 23:20:18 +0000 (23:20 +0000)]
Merge "ART: Fix PACKED size of tls_ptr_size."
Mathieu Chartier [Mon, 7 Dec 2015 23:19:19 +0000 (23:19 +0000)]
Merge "Combine class sets when writing a class table"
am:
3cf8583a2f
* commit '
3cf8583a2fe1a2793b4c67098df62f4362b47f0c':
Combine class sets when writing a class table
Richard Uhler [Mon, 7 Dec 2015 23:18:40 +0000 (23:18 +0000)]
Merge "Annotate root objects and show their types."
am:
0e72abfae7
* commit '
0e72abfae75e0072679c425b7a4fb6344e1de550':
Annotate root objects and show their types.
Roland Levillain [Mon, 7 Dec 2015 23:11:33 +0000 (23:11 +0000)]
Merge "Revert "Fix the ART Buildbots using the master-art manifest.""
am:
526377fe8d
* commit '
526377fe8d49803654966887be08140dbed2acd8':
Revert "Fix the ART Buildbots using the master-art manifest."
Roland Levillain [Mon, 7 Dec 2015 23:11:26 +0000 (23:11 +0000)]
Merge "Fix the ART Buildbots using the master-art manifest."
am:
a2964d5ab5
* commit '
a2964d5ab5c1a7158a15bb899bc99d59236b3ac5':
Fix the ART Buildbots using the master-art manifest.
Roland Levillain [Mon, 7 Dec 2015 23:11:17 +0000 (23:11 +0000)]
Merge "Annotate Boolean literals more uniformly in Optimizing\'s intrinsics."
am:
a6756069c4
* commit '
a6756069c4363a231928b040ff0c86c80acdb9b9':
Annotate Boolean literals more uniformly in Optimizing's intrinsics.
Roland Levillain [Mon, 7 Dec 2015 23:11:08 +0000 (23:11 +0000)]
Merge "Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong."
am:
038f4f2f4d
* commit '
038f4f2f4de2def9a1d59a6f1b0162b1c2200c32':
Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong.
Mathieu Chartier [Mon, 7 Dec 2015 21:08:49 +0000 (21:08 +0000)]
Merge "Combine class sets when writing a class table"
Richard Uhler [Mon, 7 Dec 2015 20:27:52 +0000 (20:27 +0000)]
Merge "Annotate root objects and show their types."
Roland Levillain [Mon, 7 Dec 2015 12:38:49 +0000 (12:38 +0000)]
Merge "Revert "Fix the ART Buildbots using the master-art manifest.""
Roland Levillain [Mon, 7 Dec 2015 12:38:24 +0000 (12:38 +0000)]
Revert "Fix the ART Buildbots using the master-art manifest."
Reverting as repo syncing later won't work, as this symlink is an untracked file.
Bug:
26051370
This reverts commit
f1389288c6f642e16b5d9a06ef43f982dfeeb30d.
Change-Id: Idd41955710b4d3d5809e4f6bf963ed3a4cead126
Vladimir Marko [Fri, 4 Dec 2015 14:19:04 +0000 (14:19 +0000)]
Allow initializing runtime with parsed options.
Needed by upcoming refactoring of dex2oat to allow
early writing of dex files to the oat file.
Change-Id: Ia13c26132846801522f181f51f64035d625e8416
Roland Levillain [Mon, 7 Dec 2015 12:19:07 +0000 (12:19 +0000)]
Merge "Fix the ART Buildbots using the master-art manifest."
Roland Levillain [Mon, 7 Dec 2015 12:04:03 +0000 (12:04 +0000)]
Fix the ART Buildbots using the master-art manifest.
When system/core/base/include/android-base is missing, create it as a
symlink to system/core/base/include/base.
This change is very brittle and is only to unblock the ART Buildbots.
It should be a temporary solution while we come up with something
better.
Bug:
26051370
Change-Id: Ie412fbf170e2cd260f77caaeb7af0b2e399ef3ab
Roland Levillain [Mon, 7 Dec 2015 11:15:14 +0000 (11:15 +0000)]
Merge "Annotate Boolean literals more uniformly in Optimizing's intrinsics."
Roland Levillain [Fri, 4 Dec 2015 14:33:02 +0000 (14:33 +0000)]
Annotate Boolean literals more uniformly in Optimizing's intrinsics.
Change-Id: Ida40309b4bc170a18b4e5db552b77f021a7b89df
Roland Levillain [Mon, 7 Dec 2015 10:19:40 +0000 (10:19 +0000)]
Merge "Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong."
Andreas Gampe [Sat, 5 Dec 2015 02:12:44 +0000 (02:12 +0000)]
Merge "MIPS32: Bit rotation intrinsics" am:
5bde68ff34
am:
03e6cb6628
* commit '
03e6cb662846c762d2d5c701752e8c4c6b1b204c':
MIPS32: Bit rotation intrinsics
Andreas Gampe [Sat, 5 Dec 2015 02:08:45 +0000 (18:08 -0800)]
Merge "MIPS32: int java.lang.*.numberOfTrailingZeros" am:
fdacff89f5
am:
1f1899a73d
* commit '
1f1899a73dc4ee7b521e760414a47e1723b566af':
MIPS32: int java.lang.*.numberOfTrailingZeros
Andreas Gampe [Sat, 5 Dec 2015 02:08:37 +0000 (18:08 -0800)]
Merge "MIPS32: Bit rotation intrinsics"
am:
5bde68ff34
* commit '
5bde68ff34aeb84a1fc84734bcd31471d9a9717c':
MIPS32: Bit rotation intrinsics
Andreas Gampe [Sat, 5 Dec 2015 02:08:35 +0000 (18:08 -0800)]
Merge "MIPS32: int java.lang.*.numberOfLeadingZeros" am:
e15f6e2d26
am:
203cab2091
* commit '
203cab2091f9ac1d0a472f9a453b22bbc8ca4103':
MIPS32: int java.lang.*.numberOfLeadingZeros
Andreas Gampe [Sat, 5 Dec 2015 02:08:06 +0000 (02:08 +0000)]
Merge "MIPS32: Bit rotation intrinsics"
Andreas Gampe [Sat, 5 Dec 2015 02:05:28 +0000 (18:05 -0800)]
Merge "MIPS32: int java.lang.*.numberOfTrailingZeros"
am:
fdacff89f5
* commit '
fdacff89f5b5c276254beb5643fda5df16ba7dd3':
MIPS32: int java.lang.*.numberOfTrailingZeros
Andreas Gampe [Sat, 5 Dec 2015 02:05:18 +0000 (18:05 -0800)]
Merge "MIPS32: int java.lang.*.numberOfLeadingZeros"
am:
e15f6e2d26
* commit '
e15f6e2d262c53ae616b70024a743604f21b7c42':
MIPS32: int java.lang.*.numberOfLeadingZeros
Andreas Gampe [Sat, 5 Dec 2015 02:04:14 +0000 (02:04 +0000)]
Merge "MIPS32: int java.lang.*.numberOfTrailingZeros"
Andreas Gampe [Sat, 5 Dec 2015 02:02:13 +0000 (02:02 +0000)]
Merge "MIPS32: int java.lang.*.numberOfLeadingZeros"
Mathieu Chartier [Fri, 4 Dec 2015 23:07:48 +0000 (15:07 -0800)]
Combine class sets when writing a class table
Reduces the boot.art size since we allocate a new class set with the
default load factor. The load factor in the combined class table is
higher to pruning classes, this reduces the size of the boot image.
Also fixes the hypothetical case where the class table being written
has multiple class sets.
Boot.art size
Before:
8122368
After:
8044544
Slight cleanup in patchoat.cc.
Bug:
22858531
Change-Id: I31b3ea2004ece6f6c853ee906074bb2792dee958
Alex Light [Fri, 4 Dec 2015 22:28:28 +0000 (14:28 -0800)]
Merge "Make test 100 not depend on undefined ordering." am:
bf0e73604f
am:
51394e2cf4
* commit '
51394e2cf47f5e8878849ce8a18da42a5a3d4182':
Make test 100 not depend on undefined ordering.
Alex Light [Fri, 4 Dec 2015 22:24:47 +0000 (22:24 +0000)]
Merge "Make test 100 not depend on undefined ordering."
am:
bf0e73604f
* commit '
bf0e73604f836e3b8f7d6481e83110c3426350b6':
Make test 100 not depend on undefined ordering.
Alex Light [Fri, 4 Dec 2015 22:21:23 +0000 (22:21 +0000)]
Merge "Make test 100 not depend on undefined ordering."
Alex Light [Fri, 4 Dec 2015 22:04:52 +0000 (14:04 -0800)]
Make test 100 not depend on undefined ordering.
Test 100 tested the officially unspecified ordering of the return
values of various reflection methods. This makes the test only check
the values contained in the array but not the order.
Change-Id: I775646321831f28f722d1db97335231df03ff923
Mathieu Chartier [Fri, 4 Dec 2015 22:01:50 +0000 (14:01 -0800)]
Merge "Store class tables in the image" am:
a616b4e086
am:
e8d71c13ad
* commit '
e8d71c13ad2e9660c9acf51bbe571f1ceaec7120':
Store class tables in the image
Mathieu Chartier [Fri, 4 Dec 2015 21:57:37 +0000 (21:57 +0000)]
Merge "Store class tables in the image"
am:
a616b4e086
* commit '
a616b4e086c93e609fb6ac160a4af39c3d0cdf07':
Store class tables in the image
Mathieu Chartier [Fri, 4 Dec 2015 21:53:40 +0000 (21:53 +0000)]
Merge "Store class tables in the image"
Vladimir Marko [Fri, 4 Dec 2015 18:06:39 +0000 (18:06 +0000)]
Merge "Add ElfWriter::GetStream()." am:
cf6bd55863
am:
e3ce7c04c7
* commit '
e3ce7c04c7bf152a7e2bbb3c861a2df9bdbff87d':
Add ElfWriter::GetStream().
Vladimir Marko [Fri, 4 Dec 2015 18:01:53 +0000 (10:01 -0800)]
Merge "Add ElfWriter::GetStream()."
am:
cf6bd55863
* commit '
cf6bd55863ded11e0533966657871aca444505a5':
Add ElfWriter::GetStream().
Vladimir Marko [Fri, 4 Dec 2015 17:53:27 +0000 (17:53 +0000)]
Merge "Add ElfWriter::GetStream()."
Aart Bik [Fri, 4 Dec 2015 16:51:01 +0000 (08:51 -0800)]
Merge "Step-wise improvement of range analysis with outer loop induction." am:
d382994228
am:
d77596bb5d
* commit '
d77596bb5d9da26bda27ab3db71e2f9f118d3b4e':
Step-wise improvement of range analysis with outer loop induction.
Aart Bik [Fri, 4 Dec 2015 16:48:08 +0000 (08:48 -0800)]
Merge "Step-wise improvement of range analysis with outer loop induction."
am:
d382994228
* commit '
d382994228e0f3eaba26af14393546bf7027cc2b':
Step-wise improvement of range analysis with outer loop induction.
Aart Bik [Fri, 4 Dec 2015 16:40:50 +0000 (16:40 +0000)]
Merge "Step-wise improvement of range analysis with outer loop induction."
Andreas Gampe [Fri, 4 Dec 2015 16:33:48 +0000 (16:33 +0000)]
Merge "MIPS32: java.lang.*.reverse" am:
eddbfb74ae
am:
9754484c2b
* commit '
9754484c2b25dffc6fd6c2727e9568253b6e0635':
MIPS32: java.lang.*.reverse
Andreas Gampe [Fri, 4 Dec 2015 16:31:00 +0000 (16:31 +0000)]
Merge "MIPS32: java.lang.*.reverse"
am:
eddbfb74ae
* commit '
eddbfb74ae5de6b42be9f47da386cd9507eb3e53':
MIPS32: java.lang.*.reverse
Andreas Gampe [Fri, 4 Dec 2015 16:28:11 +0000 (16:28 +0000)]
Merge "MIPS32: java.lang.*.reverse"
Vladimir Marko [Thu, 3 Dec 2015 18:29:23 +0000 (18:29 +0000)]
Add ElfWriter::GetStream().
This will be used for writing the OatHeader which is
currently oddly written through the .text stream.
Also move the error delaying output stream out of the
ElfBuilder<> to its own file and move all output stream
files to compiler/linker/.
Change-Id: I00db4e33ed80ac4757ec459946c7b5ae014a3a2e
Nicolas Geoffray [Fri, 4 Dec 2015 12:21:23 +0000 (12:21 +0000)]
Merge "Inline monomorphic calls." am:
099f2713ce
am:
f1493c5006
* commit '
f1493c5006b0e3fbbe14dc19dc6dffebe158f2c0':
Inline monomorphic calls.
Nicolas Geoffray [Fri, 4 Dec 2015 12:18:29 +0000 (12:18 +0000)]
Merge "Inline monomorphic calls."
am:
099f2713ce
* commit '
099f2713ce4ed284c94239cc22d3a8c8d9cfe868':
Inline monomorphic calls.
Nicolas Geoffray [Fri, 4 Dec 2015 12:14:38 +0000 (12:14 +0000)]
Merge "Inline monomorphic calls."
Nicolas Geoffray [Thu, 17 Sep 2015 14:22:56 +0000 (15:22 +0100)]
Inline monomorphic calls.
Change-Id: If38171c2dc7d4a4378df5d050afc4fff4499c98f
Roland Levillain [Thu, 3 Dec 2015 19:26:40 +0000 (19:26 +0000)]
Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong.
Change-Id: I7514a882ae73db53178f9ec00191619b871b77a6
Aart Bik [Thu, 3 Dec 2015 19:23:35 +0000 (11:23 -0800)]
Step-wise improvement of range analysis with outer loop induction.
Rationale: Using a step-wise approach (rather than expanding all ranges
at once) increases the opportunities for statically removing
bound checks, as demonstrated by the new checker tests.
Change-Id: Icbfd9406523a069e1fb7508546ea94f896e5a255
Mathieu Chartier [Wed, 2 Dec 2015 23:44:07 +0000 (15:44 -0800)]
Store class tables in the image
Reduces how long it takes to load an application image.
N5 boot.art size
Before:
8007680
After:
8122368
Also reduces boot time by how long AddImageClassesToClassTable
used to take (~20ms).
Changed class hashes to be uint32_t to fix cross compilation. We need
serialized hash tables to be valid with different pointer sizes.
Bug:
22858531
Change-Id: I463fc83f499ff75f509e80c253a55b9116ee5b89
Hiroshi Yamauchi [Thu, 3 Dec 2015 23:53:16 +0000 (23:53 +0000)]
Merge "No need merging bulk free list again when revoking thread local runs" am:
352c36e96e
am:
cf406066a5
* commit '
cf406066a560b137dad6d2e1b52c0294c9a1f516':
No need merging bulk free list again when revoking thread local runs
Hiroshi Yamauchi [Thu, 3 Dec 2015 23:48:53 +0000 (23:48 +0000)]
Merge "No need merging bulk free list again when revoking thread local runs"
am:
352c36e96e
* commit '
352c36e96e05d630aa3d570e66a4d9b645a96c37':
No need merging bulk free list again when revoking thread local runs
Hiroshi Yamauchi [Thu, 3 Dec 2015 23:43:27 +0000 (23:43 +0000)]
Merge "No need merging bulk free list again when revoking thread local runs"
Andreas Gampe [Thu, 3 Dec 2015 23:22:44 +0000 (23:22 +0000)]
Merge "ART: Add test for DetachCurrentThread monitor behavior" am:
06c86948b0
am:
2676897d23
* commit '
2676897d235225bb3be94aaeb76b0181d28628a5':
ART: Add test for DetachCurrentThread monitor behavior
Andreas Gampe [Thu, 3 Dec 2015 23:19:07 +0000 (23:19 +0000)]
Merge "ART: Add test for DetachCurrentThread monitor behavior"
am:
06c86948b0
* commit '
06c86948b013f575ca5db971d0f0bb42897dfeca':
ART: Add test for DetachCurrentThread monitor behavior
Andreas Gampe [Thu, 3 Dec 2015 23:12:26 +0000 (23:12 +0000)]
Merge "ART: Add test for DetachCurrentThread monitor behavior"
Igor Murashkin [Thu, 3 Dec 2015 19:37:55 +0000 (19:37 +0000)]
Merge "imgdiag: Fix rarely flaky imgdiag_test." am:
ef45113d01
am:
e5840157f0
* commit '
e5840157f09fb7a64af524d82335b5322390d68c':
imgdiag: Fix rarely flaky imgdiag_test.
Igor Murashkin [Thu, 3 Dec 2015 19:33:03 +0000 (19:33 +0000)]
Merge "imgdiag: Fix rarely flaky imgdiag_test."
am:
ef45113d01
* commit '
ef45113d01c16102538a8848d6979e772dad6225':
imgdiag: Fix rarely flaky imgdiag_test.
Igor Murashkin [Thu, 3 Dec 2015 19:24:51 +0000 (19:24 +0000)]
Merge "imgdiag: Fix rarely flaky imgdiag_test."
Igor Murashkin [Thu, 3 Dec 2015 18:47:08 +0000 (10:47 -0800)]
imgdiag: Fix rarely flaky imgdiag_test.
Don't hardcode pid as we could get unlucky and a real process
could have a pid of 12345.
This prevents false negatives by making the PID always be out-of-range
for valid kernel PIDs.
Change-Id: I8e8ae5c20a39e95b27b35905d5273c77dbf701f9
Andreas Gampe [Thu, 3 Dec 2015 18:56:18 +0000 (10:56 -0800)]
ART: Add test for DetachCurrentThread monitor behavior
DetachCurrentThread is supposed to release any locks acquired through
JNI. The functionality has been there, add a test.
Bug:
20453586
Change-Id: I537f38e3e4003fe0846d037dbb235f2ea6ff8716
Nicolas Geoffray [Wed, 2 Dec 2015 23:09:35 +0000 (23:09 +0000)]
Merge "Revert "Enable profiled guided compilation in dex2oat"" am:
68cebffee2
am:
e6527ffc11
* commit '
e6527ffc11b2cb6b47709ea445adf80fd85be052':
Revert "Enable profiled guided compilation in dex2oat"
Nicolas Geoffray [Wed, 2 Dec 2015 23:09:29 +0000 (23:09 +0000)]
Merge "Revert "Fix test path in libarttest.mk"" am:
57989d6f72
am:
d378028bea
* commit '
d378028bea92d43fb827308837f00737f0b3b701':
Revert "Fix test path in libarttest.mk"
Nicolas Geoffray [Wed, 2 Dec 2015 23:09:21 +0000 (23:09 +0000)]
Merge "Revert "Fix the order in which profiled methods are dumped."" am:
801c73c819
am:
9fb1588ff6
* commit '
9fb1588ff6c89d5e5da02acd4a64d4ce0827481b':
Revert "Fix the order in which profiled methods are dumped."
Nicolas Geoffray [Wed, 2 Dec 2015 23:09:14 +0000 (23:09 +0000)]
Merge "Revert "Disable 554-jit-profile-file for unsupported test modes"" am:
15b103f728
am:
67041ca144
* commit '
67041ca144bd417e4812e46603acb4f794f75851':
Revert "Disable 554-jit-profile-file for unsupported test modes"
Nicolas Geoffray [Wed, 2 Dec 2015 23:04:38 +0000 (23:04 +0000)]
Merge "Revert "Enable profiled guided compilation in dex2oat""
am:
68cebffee2
* commit '
68cebffee2f44f0345bd7be7e4cbad0f10e64082':
Revert "Enable profiled guided compilation in dex2oat"
Nicolas Geoffray [Wed, 2 Dec 2015 23:04:31 +0000 (23:04 +0000)]
Merge "Revert "Fix test path in libarttest.mk""
am:
57989d6f72
* commit '
57989d6f7292155f4d91ce423cede17d04dd9343':
Revert "Fix test path in libarttest.mk"
Nicolas Geoffray [Wed, 2 Dec 2015 23:04:25 +0000 (23:04 +0000)]
Merge "Revert "Fix the order in which profiled methods are dumped.""
am:
801c73c819
* commit '
801c73c819a4f03beb4af170fc80d9907ff4f2a4':
Revert "Fix the order in which profiled methods are dumped."
Nicolas Geoffray [Wed, 2 Dec 2015 23:04:18 +0000 (23:04 +0000)]
Merge "Revert "Disable 554-jit-profile-file for unsupported test modes""
am:
15b103f728
* commit '
15b103f728396473cb3b398a9bbe4452fa916299':
Revert "Disable 554-jit-profile-file for unsupported test modes"