OSDN Git Service
Nicolas Geoffray [Wed, 24 Feb 2016 18:07:09 +0000 (18:07 +0000)]
Merge "Don\'t make this script fail a buildbot run."
am:
8ff01690eb
* commit '
8ff01690eb2796604b8927076fdde7452b4c8a60':
Don't make this script fail a buildbot run.
Nicolas Geoffray [Wed, 24 Feb 2016 17:59:37 +0000 (17:59 +0000)]
Merge "Don't make this script fail a buildbot run."
Nicolas Geoffray [Wed, 24 Feb 2016 17:52:08 +0000 (17:52 +0000)]
Don't make this script fail a buildbot run.
Change-Id: I000d69c1a33eca6ca98f7fd1096bc9af7d22b4e8
Vladimir Marko [Wed, 24 Feb 2016 17:41:45 +0000 (17:41 +0000)]
Merge "ARM: Implement Reverse bits and bytes intrinsic."
am:
cc544f3b3a
* commit '
cc544f3b3ad69449354a8596a1df5d2623e8c7d8':
ARM: Implement Reverse bits and bytes intrinsic.
Vladimir Marko [Wed, 24 Feb 2016 17:34:41 +0000 (17:34 +0000)]
Merge "ARM: Implement Reverse bits and bytes intrinsic."
Roland Levillain [Wed, 24 Feb 2016 16:10:10 +0000 (16:10 +0000)]
Merge "MIPS32: Implement intrinsics from java.lang.Math:"
am:
a6be605d83
* commit '
a6be605d83473c8c97245f823f3da2596cb63817':
MIPS32: Implement intrinsics from java.lang.Math:
Roland Levillain [Wed, 24 Feb 2016 16:05:37 +0000 (16:05 +0000)]
Merge "MIPS32: Implement intrinsics from java.lang.Math:"
Roland Levillain [Wed, 24 Feb 2016 15:52:18 +0000 (15:52 +0000)]
Merge "Remove unreachable code paths in constant folding."
am:
d9ad7463ed
* commit '
d9ad7463eda39d9b8bee204f91a3b7b7fa6b0a1a':
Remove unreachable code paths in constant folding.
Roland Levillain [Wed, 24 Feb 2016 15:48:06 +0000 (15:48 +0000)]
Merge "Fix indentation of copyright headers in some ART run-tests."
am:
8b2c636a28
* commit '
8b2c636a28148c09a64b8fbbd9afe7ea11cfe59b':
Fix indentation of copyright headers in some ART run-tests.
Roland Levillain [Wed, 24 Feb 2016 15:46:01 +0000 (15:46 +0000)]
Merge "Remove unreachable code paths in constant folding."
Roland Levillain [Wed, 24 Feb 2016 15:45:01 +0000 (15:45 +0000)]
Merge "Fix indentation of copyright headers in some ART run-tests."
Roland Levillain [Wed, 24 Feb 2016 15:41:20 +0000 (15:41 +0000)]
Fix indentation of copyright headers in some ART run-tests.
Reported by Kevin Brodsky <kevin.brodsky@linaro.org>.
Change-Id: Iec3d69aa33d3b6a31f1298607e0ee6bc4cb6d9c0
Bill Buzbee [Wed, 24 Feb 2016 15:01:50 +0000 (15:01 +0000)]
Merge "ART: Enable JitProfiling for x86 Mterp"
am:
29c612299d
* commit '
29c612299d50b52a1a4b2716a07232a1dad67bc1':
ART: Enable JitProfiling for x86 Mterp
Bill Buzbee [Wed, 24 Feb 2016 14:59:07 +0000 (14:59 +0000)]
Merge "ART: Enable JitProfiling for x86 Mterp"
Roland Levillain [Wed, 24 Feb 2016 14:54:18 +0000 (14:54 +0000)]
Remove unreachable code paths in constant folding.
Change-Id: I7ffb361711c87f6b1b98d172d2cfdf9b2ba65607
Artem Serov [Tue, 2 Feb 2016 13:49:43 +0000 (13:49 +0000)]
ARM: Implement Reverse bits and bytes intrinsic.
- IntegerReverse
- LongReverse
- IntegerReverseBytes
- LongReverseBytes
- ShortReverseBytes
Change-Id: I3ec202696b245148a0237ff6e46ac3f1a3f8402a
Nicolas Geoffray [Wed, 24 Feb 2016 12:15:56 +0000 (12:15 +0000)]
Merge "Add a script to symbolize buildbot crashes."
am:
d15ede2df7
* commit '
d15ede2df7d157ea5480614fd18c2bf0d37a6c2a':
Add a script to symbolize buildbot crashes.
Nicolas Geoffray [Wed, 24 Feb 2016 12:14:35 +0000 (12:14 +0000)]
Merge "Add a script to symbolize buildbot crashes."
Nicolas Geoffray [Wed, 24 Feb 2016 12:04:23 +0000 (12:04 +0000)]
Add a script to symbolize buildbot crashes.
Change-Id: I6e85a2f37db84a8d06c7258de1c60eaffc78e44b
Vladimir Marko [Wed, 24 Feb 2016 11:54:19 +0000 (11:54 +0000)]
Merge "ART: Allow method references across oat files for multi-image, 2nd attempt."
am:
bf63303f8a
* commit '
bf63303f8a98c88fb8f0a726ab9431660f26df5a':
ART: Allow method references across oat files for multi-image, 2nd attempt.
Vladimir Marko [Wed, 24 Feb 2016 11:52:14 +0000 (11:52 +0000)]
Merge "ART: Allow method references across oat files for multi-image, 2nd attempt."
Vladimir Marko [Fri, 19 Feb 2016 12:27:55 +0000 (12:27 +0000)]
ART: Allow method references across oat files for multi-image, 2nd attempt.
These were disabled because we didn't have sufficient
information about the multi-image layout when processing
link-time patches in OatWriter. This CL refactors the
ELF file creation so that the information is available.
Also clean up ImageWriter to use oat file indexes instead
of filenames and avoid reopening the oat file to retrieve
the checksum.
Change-Id: Icc7b528deca29da1e473c8f079521a36d6c4892f
Roland Levillain [Wed, 24 Feb 2016 10:54:38 +0000 (10:54 +0000)]
Merge "Please Clang with respect to stack frame limits in dex2oat."
am:
9baccdc75e
* commit '
9baccdc75ee01dd96ac4e57e17965635f96def27':
Please Clang with respect to stack frame limits in dex2oat.
Roland Levillain [Wed, 24 Feb 2016 10:53:24 +0000 (10:53 +0000)]
Merge "Please Clang with respect to stack frame limits in dex2oat."
Nicolas Geoffray [Wed, 24 Feb 2016 10:37:28 +0000 (10:37 +0000)]
Merge "Introduce partial code cache collection."
am:
dddfaa5ec5
* commit '
dddfaa5ec5eee11b6ca8c489ed5e92f10a334b22':
Introduce partial code cache collection.
Nicolas Geoffray [Wed, 24 Feb 2016 10:35:01 +0000 (10:35 +0000)]
Merge "Introduce partial code cache collection."
David Srbecky [Wed, 24 Feb 2016 10:32:05 +0000 (10:32 +0000)]
Merge "Associate slow paths with the instruction that they belong to."
am:
21ce0dae31
* commit '
21ce0dae31a72cee459dba352b4aa1ccb5157a5d':
Associate slow paths with the instruction that they belong to.
David Srbecky [Wed, 24 Feb 2016 10:30:04 +0000 (10:30 +0000)]
Merge "Associate slow paths with the instruction that they belong to."
David Srbecky [Wed, 24 Feb 2016 10:26:46 +0000 (10:26 +0000)]
Merge "Remove HNativeDebugInfo from start of basic blocks."
am:
0e02ee9efb
* commit '
0e02ee9efbf1dbdde05d2b10f7307bbe191c52f5':
Remove HNativeDebugInfo from start of basic blocks.
David Srbecky [Tue, 9 Feb 2016 15:24:47 +0000 (15:24 +0000)]
Associate slow paths with the instruction that they belong to.
Almost all slow paths already know the instruction they belong to,
this CL just moves the knowledge to the base class as well.
This is needed to be be able to get the corresponding dex pc for
slow path, which allows us generate better native line numbers,
which in turn fixes some native debugging stepping issues.
Change-Id: I568dbe78a7cea6a43a4a71a014b3ad135782c270
David Srbecky [Wed, 24 Feb 2016 10:23:50 +0000 (10:23 +0000)]
Merge "Remove HNativeDebugInfo from start of basic blocks."
David Srbecky [Tue, 9 Feb 2016 14:30:11 +0000 (14:30 +0000)]
Remove HNativeDebugInfo from start of basic blocks.
We do not require full environment at the start of basic block.
The dex pc contained in basic block is sufficient for line mapping.
Change-Id: I5ba9e5f5acbc4a783ad544769f9a73bb33e2bafa
Nicolas Geoffray [Wed, 24 Feb 2016 10:15:59 +0000 (10:15 +0000)]
Merge "Show battery level fo devices on buildbot."
am:
72ca09cc2d
* commit '
72ca09cc2dd350adb932ef4a50eff668cca99c5e':
Show battery level fo devices on buildbot.
Nicolas Geoffray [Wed, 24 Feb 2016 10:12:30 +0000 (10:12 +0000)]
Merge "Show battery level fo devices on buildbot."
buzbee [Tue, 23 Feb 2016 21:25:00 +0000 (13:25 -0800)]
ART: Enable JitProfiling for x86 Mterp
Adds branch profiling and enables for x86.
Change-Id: I875034d5bc6b639df08a0236e415195521994238
Nicolas Geoffray [Wed, 24 Feb 2016 09:53:09 +0000 (09:53 +0000)]
Show battery level fo devices on buildbot.
Change-Id: Ic8279d1905c8a6efe08ca190f1bb7332842e1904
Alex Light [Tue, 23 Feb 2016 22:42:48 +0000 (22:42 +0000)]
Merge "Make JNI work correctly with default methods."
am:
028d1027f9
* commit '
028d1027f9b6ea6c80982407984171204458ff9b':
Make JNI work correctly with default methods.
Alex Light [Tue, 23 Feb 2016 22:33:55 +0000 (22:33 +0000)]
Merge "Make JNI work correctly with default methods."
Alex Light [Mon, 22 Feb 2016 21:43:29 +0000 (13:43 -0800)]
Make JNI work correctly with default methods.
Also adds some tests for JNI and DefaultMethods.
Bug:
27259142
Bug:
24618811
Change-Id: I31222e3e41059d803be1dbb0f40e1144ac4bf457
Aart Bik [Tue, 23 Feb 2016 19:46:32 +0000 (19:46 +0000)]
Merge "Improved instruction + offset hunting."
am:
b4982aab07
* commit '
b4982aab07ae4cdaba13b4cb99306459d92e52d5':
Improved instruction + offset hunting.
Aart Bik [Tue, 23 Feb 2016 19:42:27 +0000 (19:42 +0000)]
Merge "Improved instruction + offset hunting."
Aart Bik [Tue, 23 Feb 2016 00:22:33 +0000 (16:22 -0800)]
Improved instruction + offset hunting.
Rationale:
This is generally useful for anything using this method
but in particular for deopting something like
bs[ off] = (byte)(n >>> 24);
bs[++off] = (byte)(n >>> 16);
bs[++off] = (byte)(n >>> 8);
bs[++off] = (byte)(n );
where the base + offset is hidden in the increments.
Occurs quite often in real-life code.
Change-Id: I3fa7d285a7368a179a26e590e8eee37f3b64c25d
Mathieu Chartier [Tue, 23 Feb 2016 18:51:03 +0000 (18:51 +0000)]
Merge "Fix allocation tracking race"
am:
072cbe0ca5
* commit '
072cbe0ca5ce75bdb448955aa82257cc05dac610':
Fix allocation tracking race
Mathieu Chartier [Tue, 23 Feb 2016 18:49:08 +0000 (18:49 +0000)]
Merge "Fix allocation tracking race"
Mathieu Chartier [Tue, 23 Feb 2016 18:37:32 +0000 (10:37 -0800)]
Fix allocation tracking race
Need to instrument the stubs before calling
Heap::SetAlloctrackingEnabled or else we can get this DCHECK failing
DCHECK(!IsAllocTrackingEnabled())
Change-Id: I1fb5df217a2785baf22b4f57887cd323f13f0973
Nicolas Geoffray [Tue, 23 Feb 2016 18:23:53 +0000 (18:23 +0000)]
Merge "Revert "Compile checker run-tests with Jack""
am:
96cd22822b
* commit '
96cd22822b8b88bca6322172db018421d829f746':
Revert "Compile checker run-tests with Jack"
Nicolas Geoffray [Tue, 23 Feb 2016 18:17:59 +0000 (18:17 +0000)]
Merge "Revert "Compile checker run-tests with Jack""
Nicolas Geoffray [Tue, 23 Feb 2016 18:17:46 +0000 (18:17 +0000)]
Revert "Compile checker run-tests with Jack"
Tests still faill.
Bug:
25635944
Bug:
19467889
This reverts commit
fbeeb47fc63ec85891198b51b2309bb15f26527e.
Change-Id: I8f49dc6e8d3eb5f0de10636ef2685b7a2e08f297
Roland Levillain [Tue, 23 Feb 2016 18:08:53 +0000 (18:08 +0000)]
Please Clang with respect to stack frame limits in dex2oat.
This change enables Clang to compile dex2oat on MIPS64
without complaining about stack frames larger than what
`-Wframe-larger-than` allows.
Bug:
27310199
Change-Id: I441a4be499959a089d3c2eae1135eb0273c1e80b
Sebastien Hertz [Tue, 23 Feb 2016 17:02:03 +0000 (17:02 +0000)]
Merge "Compile checker run-tests with Jack"
am:
c37a3eb818
* commit '
c37a3eb8180d6488466961239eabc9ab0712bd05':
Compile checker run-tests with Jack
Calin Juravle [Tue, 23 Feb 2016 16:57:39 +0000 (16:57 +0000)]
Merge "Fix profman path for the gtest."
am:
5171d4656d
* commit '
5171d4656d4d2acfcc84d6541f2789892c3264a8':
Fix profman path for the gtest.
Sebastien Hertz [Tue, 23 Feb 2016 16:56:50 +0000 (16:56 +0000)]
Merge "Compile checker run-tests with Jack"
Calin Juravle [Tue, 23 Feb 2016 16:54:48 +0000 (16:54 +0000)]
Merge "Fix profman path for the gtest."
Calin Juravle [Tue, 23 Feb 2016 16:53:30 +0000 (16:53 +0000)]
Fix profman path for the gtest.
Change-Id: Id332c50658b7dc1eb1edf6a58fcbdde4c2887d27
Sebastien Hertz [Fri, 19 Feb 2016 15:54:05 +0000 (16:54 +0100)]
Compile checker run-tests with Jack
Bug:
25635944
Bug:
19467889
Change-Id: I3c3fcbcbd2f6c142dbea279a9ecd9d372e79b3b9
Nicolas Geoffray [Tue, 23 Feb 2016 13:56:43 +0000 (13:56 +0000)]
Introduce partial code cache collection.
It will collect code that is known unused (because it deoptimized),
and osr code.
bug:
26846185
Change-Id: Ic27dfeb944efb2ca464039007ba365c1e0d4a040
Calin Juravle [Tue, 23 Feb 2016 14:08:52 +0000 (14:08 +0000)]
Merge "Revert "Revert "Add profman tool: responsible to process profiles"""
am:
6406b521be
* commit '
6406b521bed1a1cc465edc6be083ce57ba0f524e':
Revert "Revert "Add profman tool: responsible to process profiles""
Calin Juravle [Tue, 23 Feb 2016 14:07:40 +0000 (14:07 +0000)]
Merge "Revert "Revert "Add profman tool: responsible to process profiles"""
Roland Levillain [Tue, 23 Feb 2016 13:58:13 +0000 (13:58 +0000)]
Merge "Re-enable tests that were causing TimeoutExceptions on x86/x86-64."
am:
a016ba5614
* commit '
a016ba5614054e27eada7f4815df7d4bac7ba8d8':
Re-enable tests that were causing TimeoutExceptions on x86/x86-64.
Roland Levillain [Tue, 23 Feb 2016 13:57:10 +0000 (13:57 +0000)]
Merge "Re-enable tests that were causing TimeoutExceptions on x86/x86-64."
Roland Levillain [Tue, 23 Feb 2016 13:49:35 +0000 (13:49 +0000)]
Re-enable tests that were causing TimeoutExceptions on x86/x86-64.
Some libcore tests have been failing with a
java.util.concurrent.TimeoutException on ART Builbot's
x86/x86-64 concurrent collector configurations. No longer
ignore these failures to see whether recent changes (namely
https://android-review.googlesource.com/#/c/204125) fixed
the issue.
Bug:
26507762
Change-Id: Ib188e194195fc11b539bd53a03db78ab80626f33
Nicolas Geoffray [Tue, 23 Feb 2016 13:54:53 +0000 (13:54 +0000)]
Merge "Don\'t allocate mspaces of less than a page."
am:
0648212e3a
* commit '
0648212e3aaf2ce142b382c98255af5c094b2f00':
Don't allocate mspaces of less than a page.
Nicolas Geoffray [Tue, 23 Feb 2016 13:53:11 +0000 (13:53 +0000)]
Merge "Don't allocate mspaces of less than a page."
Nicolas Geoffray [Tue, 23 Feb 2016 13:52:01 +0000 (13:52 +0000)]
Don't allocate mspaces of less than a page.
Fixes jit tests in debug mode.
Change-Id: I34565e03683cee063e26975a461d8e75ad4a205f
Calin Juravle [Tue, 23 Feb 2016 12:00:03 +0000 (12:00 +0000)]
Revert "Revert "Add profman tool: responsible to process profiles""
This reverts commit
3da74687e42de7d33a8e75df9bd64374e650f75e.
Change-Id: Id005096bd8063c6c602744d4476d5eb7e0d34e90
Vladimir Marko [Tue, 23 Feb 2016 10:54:41 +0000 (10:54 +0000)]
Merge "Dex-wide ArenaPool scoping for AOT compilation"
am:
e4c77b4d37
* commit '
e4c77b4d37024c1ed74e72494e69605942fead61':
Dex-wide ArenaPool scoping for AOT compilation
Nicolas Geoffray [Tue, 23 Feb 2016 10:54:32 +0000 (10:54 +0000)]
Merge "Add a new kReservedCapacity to decide when to start GC code."
am:
08e992e41e
* commit '
08e992e41e5e234ecc6b38a4ab53d4876fd077b6':
Add a new kReservedCapacity to decide when to start GC code.
Vladimir Marko [Tue, 23 Feb 2016 10:52:23 +0000 (10:52 +0000)]
Merge "Dex-wide ArenaPool scoping for AOT compilation"
Nicolas Geoffray [Tue, 23 Feb 2016 10:52:11 +0000 (10:52 +0000)]
Merge "Add a new kReservedCapacity to decide when to start GC code."
Calin Juravle [Tue, 23 Feb 2016 10:42:41 +0000 (10:42 +0000)]
Merge "Fix static dex2oat build"
am:
4764d4e253
* commit '
4764d4e253aaea1595bbe1f5aaa8677ea9319b79':
Fix static dex2oat build
Calin Juravle [Tue, 23 Feb 2016 10:41:25 +0000 (10:41 +0000)]
Merge "Fix static dex2oat build"
Delphine Martin [Tue, 23 Feb 2016 08:32:52 +0000 (08:32 +0000)]
Merge "Revert "Force Jack to consider multidex annotations""
am:
920e1230d6
* commit '
920e1230d617ec1194dc22cab3ec9d704e1b30dc':
Revert "Force Jack to consider multidex annotations"
Delphine Martin [Tue, 23 Feb 2016 08:19:30 +0000 (08:19 +0000)]
Merge "Revert "Force Jack to consider multidex annotations""
Mathieu Chartier [Tue, 23 Feb 2016 01:30:53 +0000 (01:30 +0000)]
Merge "Add regression test for alloc stack trace and unloading"
am:
6a5c5b8f17
* commit '
6a5c5b8f1738404bebc5f880e6cc0967cbb687e1':
Add regression test for alloc stack trace and unloading
Mathieu Chartier [Tue, 23 Feb 2016 01:21:13 +0000 (01:21 +0000)]
Merge "Add regression test for alloc stack trace and unloading"
Mathieu Chartier [Tue, 23 Feb 2016 00:56:54 +0000 (16:56 -0800)]
Add regression test for alloc stack trace and unloading
Test creates allocations in a different loader, then unloads it.
This would free the ArtMethod except that we now visit them as
roots.
Bug:
26849503
Change-Id: Ied9f5942ff9022b1cd39052363f119a630ffbaef
Mathieu Chartier [Tue, 23 Feb 2016 00:26:51 +0000 (00:26 +0000)]
Merge "Visit stack trace roots"
am:
5039728b6c
* commit '
5039728b6ce61e70bfca5d35889ecbd4150a5af9':
Visit stack trace roots
Mathieu Chartier [Tue, 23 Feb 2016 00:18:30 +0000 (00:18 +0000)]
Merge "Visit stack trace roots"
Mathieu Chartier [Mon, 22 Feb 2016 22:49:04 +0000 (14:49 -0800)]
Visit stack trace roots
We need to visit the declaring classes of all the methods in the
allocation stack traces to prevent class unloading for these
methods. If the class gets unloaded, it will free the linear alloc
resulting in hprof crashing during dumping.
Also a bit of clean up.
Bug:
26849503
Change-Id: I5cc57436294e4399388cb497819148b8a3b973d9
Nicolas Geoffray [Mon, 22 Feb 2016 22:45:20 +0000 (22:45 +0000)]
Merge "Revert "Add profman tool: responsible to process profiles""
am:
a5502e31cb
* commit '
a5502e31cb558c6e257d1dd1889c073a793e3d9d':
Revert "Add profman tool: responsible to process profiles"
Nicolas Geoffray [Mon, 22 Feb 2016 22:38:27 +0000 (22:38 +0000)]
Merge "Revert "Add profman tool: responsible to process profiles""
Nicolas Geoffray [Mon, 22 Feb 2016 22:37:52 +0000 (22:37 +0000)]
Revert "Add profman tool: responsible to process profiles"
Needs a profile_assistant_test fix.
Bug:
26719109
Bug:
26563023
This reverts commit
6caefd983a800a063b219f1d3ed71b1416cecd70.
Change-Id: Ibdeb7385737dd7846ed861e0a95f083abb9aa974
Hiroshi Yamauchi [Mon, 22 Feb 2016 21:52:27 +0000 (21:52 +0000)]
Merge "Fix class_linker_test for valgrind."
am:
4a582f864c
* commit '
4a582f864c10fce33fe9ba632aefc5e656280bc2':
Fix class_linker_test for valgrind.
Hiroshi Yamauchi [Mon, 22 Feb 2016 21:45:16 +0000 (21:45 +0000)]
Merge "Fix class_linker_test for valgrind."
Hiroshi Yamauchi [Mon, 22 Feb 2016 21:44:53 +0000 (21:44 +0000)]
Merge "Fix CC collector thread flip and JNI critical section deadlocks."
am:
8852d809b2
* commit '
8852d809b21b37a0e97ea3514ff9f13b2ec8dcb3':
Fix CC collector thread flip and JNI critical section deadlocks.
Hiroshi Yamauchi [Mon, 22 Feb 2016 21:30:35 +0000 (13:30 -0800)]
Fix class_linker_test for valgrind.
Fix a memory leak.
Bug:
27156726
Change-Id: I4d9a2dc9cff447b6f2fd02432e018ae49766563a
Hiroshi Yamauchi [Mon, 22 Feb 2016 21:41:06 +0000 (21:41 +0000)]
Merge "Fix CC collector thread flip and JNI critical section deadlocks."
Andreas Gampe [Mon, 22 Feb 2016 20:52:18 +0000 (20:52 +0000)]
Merge "ART: Add Class.getEnclosingClass() to UnstartedRuntime"
am:
eacf4cbb21
* commit '
eacf4cbb21ec35f5261779e60be8981d2e85e493':
ART: Add Class.getEnclosingClass() to UnstartedRuntime
Andreas Gampe [Mon, 22 Feb 2016 20:50:35 +0000 (20:50 +0000)]
Merge "ART: Add Class.getEnclosingClass() to UnstartedRuntime"
Chris Larsen [Fri, 20 Nov 2015 17:07:09 +0000 (09:07 -0800)]
MIPS32: Implement intrinsics from java.lang.Math:
- abs(double) - abs(float) - abs(int)
- abs(long) - max(double, double) - max(float, float)
- max(int, int) - max(long, long) - min(double, double)
- min(float, float) - min(int, int) - min(long, long)
- sqrt(double)
The math intrinsics:
- ceil(double) - floor(double) - rint(double)
- round(double) - round(float)
aren't implemented because they require instructions which only exist
for MIPS64, or for MIPS32r6.
Change-Id: I943be3592b52a423fcb7ac40f46f38a5e2a58c50
Bill Buzbee [Mon, 22 Feb 2016 19:41:44 +0000 (19:41 +0000)]
Merge "ART: Enable JitProfiling for Arm Mterp"
am:
e33d20e321
* commit '
e33d20e321b630bcab83f6dfbfac2788d8145148':
ART: Enable JitProfiling for Arm Mterp
Hiroshi Yamauchi [Fri, 19 Feb 2016 23:44:06 +0000 (15:44 -0800)]
Fix CC collector thread flip and JNI critical section deadlocks.
There's a bug in the synchronization between the CC collector's thread
flip and JNI critical sections where it incorrectly attempts to make
the synchronization scheme to be writer (GC) preference to avoid
starvation of GC in the presence of frequent JNI critical section
enter/exit. This could cause a deadlock between them if a thread
enters a nested JNI critical section after a thread flip occurs. This
is reproduced in the added test.
The fix is to use a thread local disable counter in addition to the
global counter to detect a nested enter by the same thread and avoid
waiting if nested.
Bug:
19235243
Bug:
12687968
Change-Id: Idf7720a6906c9ea508219935af3727f76680d2d8
Andreas Gampe [Fri, 19 Feb 2016 18:49:50 +0000 (10:49 -0800)]
ART: Add Class.getEnclosingClass() to UnstartedRuntime
Required to initialize classes calling getSimpleName().
Bug:
27265238
(cherry picked from commit
fb5c22e28030cc9ba8424b7f6f70677ec3ba3afc)
Change-Id: Id63dac5b75b3bbcdfe80f73f2d9d76dea3996823
Bill Buzbee [Mon, 22 Feb 2016 19:14:13 +0000 (19:14 +0000)]
Merge "ART: Enable JitProfiling for Arm Mterp"
Vladimir Marko [Mon, 22 Feb 2016 18:41:47 +0000 (18:41 +0000)]
Merge "Optimizing/x86-64: Use MOVL in Load64BitValue() if IsUint<32>()."
am:
8fda759172
* commit '
8fda7591726fa274ccb126f216356ef9fd39e035':
Optimizing/x86-64: Use MOVL in Load64BitValue() if IsUint<32>().
Vladimir Marko [Mon, 22 Feb 2016 18:37:47 +0000 (18:37 +0000)]
Merge "Optimizing/x86-64: Use MOVL in Load64BitValue() if IsUint<32>()."
Calin Juravle [Mon, 22 Feb 2016 18:20:49 +0000 (18:20 +0000)]
Fix static dex2oat build
Change-Id: I1a5fb726fa72d9ccd083f90a818e245f075fc89c
Vladimir Marko [Mon, 22 Feb 2016 16:54:39 +0000 (16:54 +0000)]
Optimizing/x86-64: Use MOVL in Load64BitValue() if IsUint<32>().
Change-Id: Ie8bfb1861a384d0906f2aff9e8a94be0925c65b6
Hans Boehm [Mon, 22 Feb 2016 16:00:13 +0000 (16:00 +0000)]
Merge "Add Math.round tests for large integers."
am:
827e2128fa
* commit '
827e2128fa65e1256abe40c0841fc1d1494583e7':
Add Math.round tests for large integers.
Hans Boehm [Mon, 22 Feb 2016 15:52:53 +0000 (15:52 +0000)]
Merge "Add Math.round tests for large integers."