OSDN Git Service
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:01:19 +0000 (01:01 +0000)]
Merge "Add fallback for non moving space being full." into lmp-dev
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
Change-Id: I04d00d0f457f6c1f5724bf32932b6b6ce4d341b1
Ian Rogers [Fri, 22 Aug 2014 21:57:17 +0000 (21:57 +0000)]
am
1e4fbd8b: Merge "Using the correct time for wait_start_ms when lock contention logging is enabled" into lmp-dev
* commit '
1e4fbd8b7d65064d087c5afe812943b203ed205a':
Using the correct time for wait_start_ms when lock contention logging is enabled
Ian Rogers [Fri, 22 Aug 2014 21:48:42 +0000 (21:48 +0000)]
Merge "Using the correct time for wait_start_ms when lock contention logging is enabled" into lmp-dev
Xin Guan [Fri, 22 Aug 2014 16:55:37 +0000 (11:55 -0500)]
Using the correct time for wait_start_ms when lock contention logging is enabled
Bug:
17208457
Change-Id: I35555e0acf3b37bb3776a62c64d59ae93403b237
Andreas Gampe [Fri, 22 Aug 2014 17:20:49 +0000 (17:20 +0000)]
am
1f8ea040: Merge "ART: Allow uninitialized runtime in oat code" into lmp-dev
* commit '
1f8ea0402915b394461bb6a3ca58e05c62f63082':
ART: Allow uninitialized runtime in oat code
Andreas Gampe [Fri, 22 Aug 2014 17:14:12 +0000 (17:14 +0000)]
Merge "ART: Allow uninitialized runtime in oat code" into lmp-dev
Calin Juravle [Fri, 22 Aug 2014 17:00:29 +0000 (17:00 +0000)]
am
fd684f6d: Merge "Always setup the native bridge library" into lmp-dev
* commit '
fd684f6d51cf4bee6e7bf62c9d632fbebd7dd8b7':
Always setup the native bridge library
Mathieu Chartier [Fri, 22 Aug 2014 17:00:29 +0000 (17:00 +0000)]
am
84a9ba10: Merge "Fix testing wrong variable for non zygote." into lmp-dev
* commit '
84a9ba10a826b8480be53ea164fc6168544b2a48':
Fix testing wrong variable for non zygote.
Calin Juravle [Fri, 22 Aug 2014 16:55:31 +0000 (16:55 +0000)]
Merge "Always setup the native bridge library" into lmp-dev
Mathieu Chartier [Fri, 22 Aug 2014 16:48:58 +0000 (16:48 +0000)]
Merge "Fix testing wrong variable for non zygote." into lmp-dev
Mathieu Chartier [Fri, 22 Aug 2014 01:28:20 +0000 (18:28 -0700)]
Fix testing wrong variable for non zygote.
For non zygote we want to only have a single non moving space to
let dex2oat use RosAlloc for all allocations.
Fixed stale low memory logic in parsed options.
Bug:
17189964
Change-Id: I85a565002fd18ae30105df084796521abd60ea12
Calin Juravle [Fri, 22 Aug 2014 11:53:59 +0000 (12:53 +0100)]
Always setup the native bridge library
... even if the string is empty. This will initialize the native bridge
library but mark it as unavailable.
- also, rename native_bridge_library_path to
native_bridge_library_filename to be closer to the actual meaning (it's
just the filename without any path).
Bug:
16404669.
Change-Id: I94628639691459d48d1fbf0841f36b68d51818e7
Daniel Mihalyi [Fri, 22 Aug 2014 09:20:29 +0000 (09:20 +0000)]
am
e246f336: Fixed wrong field usage in Instrumentation::RemoveListener
* commit '
e246f33605a2d6b96f2c7221fa0165dc067c3079':
Fixed wrong field usage in Instrumentation::RemoveListener
Daniel Mihalyi [Fri, 22 Aug 2014 09:20:28 +0000 (09:20 +0000)]
am
96add978: Optimized instrumentation listener handling
* commit '
96add97815ba8418fb4e8c0fc08dbf9c7198f244':
Optimized instrumentation listener handling
Andreas Gampe [Fri, 22 Aug 2014 06:10:47 +0000 (23:10 -0700)]
ART: Allow uninitialized runtime in oat code
Oatdump does not initialize a runtime. Avoid a segfault.
Bug:
17194559
Change-Id: I1a1bd3fc7762ff4714251617a975e832522fa879
Daniel Mihalyi [Thu, 21 Aug 2014 13:57:25 +0000 (15:57 +0200)]
Fixed wrong field usage in Instrumentation::RemoveListener
Signed-off-by: Daniel Mihalyi <daniel.mihalyi@mattakis.com>
Bug:
16814665
(cherry picked from commit
6644521cfaff718a55e3602efb3b54bf19a0cd1a)
Change-Id: Ie68c70ba6ee2e0bd918717c8659c057f98e66ff7
Daniel Mihalyi [Mon, 18 Aug 2014 16:45:31 +0000 (18:45 +0200)]
Optimized instrumentation listener handling
Some instrumentation listener lists may be modified while iterating
over the list to deliver an instrumentation event. Therefore the
previous implementation copied the list of listeners before starting
the iteration.
This new implementation only copies the list of instrumentation
listeners when the list is changed. Instances of the list are
reference counted using std::shared_ptr<>.
Bug:
16814665
(cherry picked from commit
ca1d06cfa2f2b8d2be4390644e126cb68cdbb5ba)
Change-Id: Ib2e6b980de85b75f1c8f4a8825bdc7767154663a
Dave Allison [Fri, 22 Aug 2014 01:19:23 +0000 (01:19 +0000)]
am
39c2a379: Merge "Fix fugu build" into lmp-dev
* commit '
39c2a379795460374b41e627257130e3c4ab961f':
Fix fugu build
Dave Allison [Fri, 22 Aug 2014 01:09:18 +0000 (01:09 +0000)]
Merge "Fix fugu build" into lmp-dev
Dave Allison [Fri, 22 Aug 2014 00:22:38 +0000 (17:22 -0700)]
Fix fugu build
Bug:
17188805
Change-Id: Ibbfc759b42ec0f08a1beb35bf52d3ca92b8fe1ea
Brian Carlstrom [Thu, 21 Aug 2014 20:59:35 +0000 (20:59 +0000)]
am
574758ef: Merge "Make a couple of map checks debug only." into lmp-dev
* commit '
574758ef03b0930ebd1cb8d9afe741cb374419a1':
Make a couple of map checks debug only.
Brian Carlstrom [Thu, 21 Aug 2014 20:43:54 +0000 (20:43 +0000)]
Merge "Make a couple of map checks debug only." into lmp-dev
Narayan Kamath [Thu, 21 Aug 2014 16:38:09 +0000 (17:38 +0100)]
Make a couple of map checks debug only.
This cost us close to 80ms in app startup times.
The checks that a reused region was within an already
existent map has been demoted to a debug check.
A couple of other negative checks have been removed
outright because one of them was superflous and the other
wasn't guaranteed to be correct.
bug:
16828525
Change-Id: I00f76de06df0ea4ced40fdcb7825248d4b662045
Dave Allison [Thu, 21 Aug 2014 17:00:40 +0000 (17:00 +0000)]
am
b9c38883: Remove profiler log line
* commit '
b9c3888380666a7b44718f04f787693787cd57c6':
Remove profiler log line
Dave Allison [Thu, 21 Aug 2014 16:45:04 +0000 (09:45 -0700)]
Remove profiler log line
This removes a LOG(INFO) saying that the profile is disabled.
Bug:
17166556
Change-Id: I4ddb4b0f792eb60ed5c927e17d06cff4ae0c073f
Mathieu Chartier [Thu, 21 Aug 2014 16:46:56 +0000 (16:46 +0000)]
am
9beaac31: Merge "Check pending exception result in AllocObjectWithAllocator." into lmp-dev
* commit '
9beaac31f89ad9f47c6e99e81cbfbefa25940c1d':
Check pending exception result in AllocObjectWithAllocator.
Dave Allison [Thu, 21 Aug 2014 16:46:55 +0000 (16:46 +0000)]
am
03324d0e: Merge "Fix fault handler to unregister on shutdown" into lmp-dev
* commit '
03324d0e4b983863a75800d9973fcb7a1eb809b5':
Fix fault handler to unregister on shutdown
Dave Allison [Thu, 21 Aug 2014 16:46:54 +0000 (16:46 +0000)]
am
45c3ea10: Merge "Add supported architectures to signal test." into lmp-dev
* commit '
45c3ea10b918ed8bb6834a1f4c2356b5874a8c75':
Add supported architectures to signal test.
Mathieu Chartier [Thu, 21 Aug 2014 16:42:31 +0000 (16:42 +0000)]
Merge "Check pending exception result in AllocObjectWithAllocator." into lmp-dev
Dave Allison [Thu, 21 Aug 2014 16:38:39 +0000 (16:38 +0000)]
Merge "Fix fault handler to unregister on shutdown" into lmp-dev
Dave Allison [Thu, 21 Aug 2014 16:38:14 +0000 (16:38 +0000)]
Merge "Add supported architectures to signal test." into lmp-dev
Mathieu Chartier [Thu, 21 Aug 2014 01:19:23 +0000 (18:19 -0700)]
Check pending exception result in AllocObjectWithAllocator.
Possible previous bug:
Allocation fails due to OOM and the collector transitions.
This caused us to incorrectly retry the allocation with a pending
exception. We now return null if there is a pending exception.
Bug:
17164348
Change-Id: I22eab472afb2fdea6e800963ccb35ec0755ba0e6
Dave Allison [Thu, 21 Aug 2014 00:38:41 +0000 (17:38 -0700)]
Fix fault handler to unregister on shutdown
This fixes a problem with the fault handler where it wasn't
unregistering itself during shutdown of the runtime.
Bug:
17133266
Change-Id: If4758b14ded0fba194897191b1a8d8d7b0b3e6e5
Mathieu Chartier [Wed, 20 Aug 2014 23:57:44 +0000 (23:57 +0000)]
am
c7fa9e30: Merge "Use homogeneous space compact by default if not low memory." into lmp-dev
* commit '
c7fa9e3018434eed890034b14bd85645077ec2e9':
Use homogeneous space compact by default if not low memory.
Andreas Gampe [Wed, 20 Aug 2014 23:52:06 +0000 (23:52 +0000)]
am
16dd4dfd: Merge "ART: Relax GetInstructionSetFromString" into lmp-dev
* commit '
16dd4dfd01c0ac432a32d081a15205222ffb1f1c':
ART: Relax GetInstructionSetFromString
Dave Allison [Wed, 20 Aug 2014 21:29:39 +0000 (14:29 -0700)]
Add supported architectures to signal test.
This adds ARM, AARCH64, i386 and x86_64 to the supported architectures
in 004-SignalTest
Bug:
16948053
Change-Id: I82b3f053e9340b9e2e8fc04775d03fb0592fa06e
Mathieu Chartier [Wed, 20 Aug 2014 20:33:19 +0000 (20:33 +0000)]
am
167350d9: Add null check to CheckVirtualMethod
* commit '
167350d9c781c5e3893714bb26ab5cb1c4abf6b4':
Add null check to CheckVirtualMethod
Mathieu Chartier [Wed, 20 Aug 2014 19:09:38 +0000 (12:09 -0700)]
Add null check to CheckVirtualMethod
There was a runtime SIGSEGV that should have been a check jni
failure.
Also added regression test.
Bug:
16320699
Change-Id: If6c8e73959cefb24e4703f1562cdddb343d86630
Vladimir Marko [Wed, 20 Aug 2014 15:13:51 +0000 (15:13 +0000)]
am
a846c1ac: Merge "X86: Fix alias info in GenInlinedIndexOf()." into lmp-dev
* commit '
a846c1ac65b197844380b8d28377a850dfa1fc94':
X86: Fix alias info in GenInlinedIndexOf().
buzbee [Wed, 20 Aug 2014 12:59:10 +0000 (12:59 +0000)]
am
c6a62592: Merge "Quick compiler: fix Arm64 inline locking code" into lmp-dev
* commit '
c6a62592836612b09ff1a8021e49b1328d85493b':
Quick compiler: fix Arm64 inline locking code
buzbee [Wed, 20 Aug 2014 12:54:11 +0000 (12:54 +0000)]
Merge "Quick compiler: fix Arm64 inline locking code" into lmp-dev
buzbee [Tue, 19 Aug 2014 23:47:06 +0000 (16:47 -0700)]
Quick compiler: fix Arm64 inline locking code
The Arm64 monitor enter code was incorrectly comparing the
thread ID to zero rather than the lock value to determine if the
inline fast path was doable. As a result, we ended up always
using the out-of-line case.
This fix delivers a 6% improvement to DeltaBlue.
b/
16707253
Change-Id: I499530da84beecf1f3f5c5ebb666e3eb12599ac0
Brian Carlstrom [Tue, 19 Aug 2014 22:39:01 +0000 (22:39 +0000)]
am
d6ee5033: Merge "Make apps able to run with a failing patchoat" into lmp-dev
* commit '
d6ee5033433619a893a8f20319efcf8c8b1d1016':
Make apps able to run with a failing patchoat
Dave Allison [Tue, 19 Aug 2014 22:15:51 +0000 (22:15 +0000)]
am
20e4afeb: Merge "Workaround problem reading main stack on intel devices." into lmp-dev
* commit '
20e4afeb1ad9d142fe9e46efe812f0d562c28f1f':
Workaround problem reading main stack on intel devices.
Andreas Gampe [Tue, 19 Aug 2014 22:02:12 +0000 (22:02 +0000)]
am
38bd1e1b: ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test
* commit '
38bd1e1b8aa39bdc6e67c5dc205cc8d294d985c5':
ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test
Dave Allison [Tue, 19 Aug 2014 22:08:31 +0000 (22:08 +0000)]
Merge "Workaround problem reading main stack on intel devices." into lmp-dev
Andreas Gampe [Mon, 18 Aug 2014 23:43:12 +0000 (16:43 -0700)]
ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test
On devices which support it, run all jni compiler tests also with
the Generic JNI infrastructure.
Fix art_quick_invoke_stub for ARM32 to enforce 16B stack alignment.
As the native convention does not require as much, the previous
code would keep it unaligned.
Bug:
17107929
(cherry picked from commit
6e498695b60f1532d2264ec6badb1cd6e10ecaa9)
Change-Id: I1481500ff7c627ab4e5bfbfd7245099a639aa049
Dave Allison [Mon, 18 Aug 2014 22:49:51 +0000 (15:49 -0700)]
Workaround problem reading main stack on intel devices.
This works around a problem where ART can't read the lowest page
of the main stack. The workaround is to add 4K to the stack
start address on the main stack on Intel.
Please see https://b2.corp.google.com/issues/
17111575 for
underlying cause.
Bug:
17031544
Change-Id: Ifc3216e10160bb1eec9d989fd57b10345bc89537
Andreas Gampe [Tue, 19 Aug 2014 19:25:22 +0000 (19:25 +0000)]
am
e22c03ce: Merge "ART: Set default visibility to protected" into lmp-dev
* commit '
e22c03ceaa847e3b6c8fcb7ee9d838f61945cda7':
ART: Set default visibility to protected
Jeff Hao [Tue, 19 Aug 2014 17:35:59 +0000 (17:35 +0000)]
am
5afe466c: Check for constructor first when installing tracing stubs.
* commit '
5afe466c027c6ac821bf7c9a88cd7de5260a639b':
Check for constructor first when installing tracing stubs.
Jeff Hao [Tue, 19 Aug 2014 17:17:36 +0000 (10:17 -0700)]
Check for constructor first when installing tracing stubs.
Addresses comments in
https://android-review.googlesource.com/#/c/104383/ made after the commit.
Bug:
16386215
Change-Id: I0e59b8507f601fd6508fbda8d24dd3c98ead1537
Andreas Gampe [Tue, 19 Aug 2014 19:16:29 +0000 (19:16 +0000)]
Merge "ART: Set default visibility to protected" into lmp-dev
Sebastien Hertz [Tue, 19 Aug 2014 09:12:07 +0000 (09:12 +0000)]
am
214f4f15: Merge "Fix JDWP event races" into lmp-dev
* commit '
214f4f15fe0137c285a05b3f70e52a211aecfdb5':
Fix JDWP event races
Mathieu Chartier [Wed, 20 Aug 2014 23:50:23 +0000 (23:50 +0000)]
Merge "Use homogeneous space compact by default if not low memory." into lmp-dev
Mathieu Chartier [Wed, 20 Aug 2014 21:13:18 +0000 (14:13 -0700)]
Use homogeneous space compact by default if not low memory.
Otherwise we use semispace as the background collector.
Bug:
16401001
Change-Id: I7b20e0888695521604758c98d09f0709fa2158ef
Andreas Gampe [Wed, 20 Aug 2014 22:24:11 +0000 (22:24 +0000)]
Merge "ART: Relax GetInstructionSetFromString" into lmp-dev
Andreas Gampe [Wed, 20 Aug 2014 00:28:06 +0000 (17:28 -0700)]
ART: Relax GetInstructionSetFromString
Do not abort on an unknown instruction set string. Instead return
kNone and let the caller handle this.
Also simplify the patchoat tool to use this.
Bug:
17136416
Change-Id: I24131914bcf91c04ae93179bf809a2907f1f2b7a
Brian Carlstrom [Tue, 19 Aug 2014 22:30:21 +0000 (22:30 +0000)]
Merge "Make apps able to run with a failing patchoat" into lmp-dev
Alex Light [Thu, 14 Aug 2014 21:16:26 +0000 (14:16 -0700)]
Make apps able to run with a failing patchoat
Bug:
17000769
(cherry picked from commit
9dcc4572949f6a8231a1b4ed859676ba6f411726)
Change-Id: I0a1a4dc7f5d4bb268530840302ecfb1555231e05
Brian Carlstrom [Tue, 19 Aug 2014 00:48:48 +0000 (00:48 +0000)]
am
5a001b3e: Merge "AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled." into lmp-dev
* commit '
5a001b3e4a4b4d066fd987071eb38b2b97493807':
AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled.
Mathieu Chartier [Mon, 18 Aug 2014 23:41:25 +0000 (23:41 +0000)]
am
6724d864: Fix heap corruption and verification.
* commit '
6724d8649ab73e4fb86c8014bda51b13bddf2f3f':
Fix heap corruption and verification.
Mathieu Chartier [Mon, 18 Aug 2014 22:02:59 +0000 (15:02 -0700)]
Fix heap corruption and verification.
There was a faulty assumption that space End() was always aligned to
card boundaries. This was true for all spaces other than the image
and resulted in heap corruption when the last object of the image
space contained a reference to an object in another space.
Also fixed an error where we called the pre GC verification post GC.
Bug:
17080623
Change-Id: I041ee564518f53b79c6e8dc2ad782a3152577a4e
Vladimir Marko [Mon, 18 Aug 2014 13:20:29 +0000 (13:20 +0000)]
am
dfa7a6c8: Disable load/store elimination. DO NOT MERGE
* commit '
dfa7a6c8711623bf20aad58f57ae980b497ef4d7':
Disable load/store elimination. DO NOT MERGE
Vladimir Marko [Mon, 18 Aug 2014 10:42:51 +0000 (11:42 +0100)]
Disable load/store elimination. DO NOT MERGE
The optimization has several issues and it has been
effectively disabled by
https://android-review.googlesource.com/103511
Disable it completely to avoid wasting compilation time.
Bug:
16862804
Change-Id: I42f69ae64170dc44f5fd6455b6a51c9bd3f93672
Andreas Gampe [Mon, 18 Aug 2014 05:12:55 +0000 (05:12 +0000)]
am
5e8a63ae: Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev
* commit '
5e8a63ae39cb5db996229c6c4a1a21a4b8dec5a2':
ART: Do not recursively abort when visiting locks in a bad state
Andreas Gampe [Sun, 17 Aug 2014 09:39:32 +0000 (09:39 +0000)]
am
d84f916d: ART: Avoid expensive class lookup in compiler driver
* commit '
d84f916d35bb0dc74d7daa075b883e5ee1ce1109':
ART: Avoid expensive class lookup in compiler driver
Andreas Gampe [Sat, 16 Aug 2014 05:35:46 +0000 (22:35 -0700)]
ART: Avoid expensive class lookup in compiler driver
When we are not compiling multidex, avoid an expensive by-descriptor
lookup for classes when deciding whether to skip compilation.
Bug:
17072698
Change-Id: I19bcb2a2928207fcae0badd466cdc52945bd37c4
Vladimir Marko [Wed, 20 Aug 2014 15:08:59 +0000 (15:08 +0000)]
Merge "X86: Fix alias info in GenInlinedIndexOf()." into lmp-dev
Vladimir Marko [Tue, 19 Aug 2014 14:00:34 +0000 (15:00 +0100)]
X86: Fix alias info in GenInlinedIndexOf().
For 32-bit X86, GenInlinedIndexOf() pushes and pops EDI. In
one branch it then calls Load32Disp() with adjusted stack
offset. That calculates wrong alias_info for the generated
insn. If left unfixed, this could confuse load hoisting.
Bug:
17128502
(cherry picked from commit
74de63bb1cc275b411cae28a96f9b3a78b939bc2)
Change-Id: I5dc82b7aae9e9655e75843a952b8ebb04269f46b
Brian Carlstrom [Tue, 19 Aug 2014 00:42:52 +0000 (00:42 +0000)]
Merge "AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled." into lmp-dev
Brian Carlstrom [Mon, 18 Aug 2014 22:38:34 +0000 (15:38 -0700)]
AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled.
Bug:
17108693
(cherry picked from commit
3ea69c0abce1b81b3c45033867d49b00e6d6b709)
Change-Id: Ide8158cc3e12e604f4fa344cd881fe6f68476ab7
Sebastien Hertz [Tue, 19 Aug 2014 09:05:47 +0000 (09:05 +0000)]
Merge "Fix JDWP event races" into lmp-dev
Sebastien Hertz [Mon, 18 Aug 2014 17:26:39 +0000 (19:26 +0200)]
Fix JDWP event races
Fix a race where the JDWP connection could be closed before the VM_DEATH event
is sent during runtime shutdown.
Fix potential race where we could wait forever for the JDWP thread to establish
connection.
Bug:
16720689
Change-Id: I227e0a15a2fd17d7bfe2a66a35d719d558fcd32d
Andreas Gampe [Mon, 18 Aug 2014 05:06:15 +0000 (05:06 +0000)]
Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev
Andreas Gampe [Sat, 16 Aug 2014 20:41:10 +0000 (13:41 -0700)]
ART: Do not recursively abort when visiting locks in a bad state
This avoids a nested abort in VisitLocks.
Bug:
17080621,
16382675
Change-Id: Id604976ac9dcac0e319fb25cab4d2cbc98d7ee24
Nicolas Geoffray [Fri, 15 Aug 2014 19:39:31 +0000 (19:39 +0000)]
am
ebee8de7: Fix bugs in the x86 and arm versions of generic JNI.
* commit '
ebee8de725d5fa83483642786b19ea453d865762':
Fix bugs in the x86 and arm versions of generic JNI.
Nicolas Geoffray [Fri, 15 Aug 2014 19:39:31 +0000 (19:39 +0000)]
am
9c290012: Execute an application even when dex2oat crashes.
* commit '
9c290012b7f505ae1943ab87236f775b97a46e2d':
Execute an application even when dex2oat crashes.
Nicolas Geoffray [Wed, 13 Aug 2014 02:40:45 +0000 (03:40 +0100)]
Fix bugs in the x86 and arm versions of generic JNI.
Also fix the run script of 116-nodex2oat to use the non-prebuild
script for target.
Bug:
17000769
(cherry-picked from commit
54accbca0b549b1b1ad3ef09655dad438bc1e104)
Change-Id: I439fcd710fb8bb408f3288ff8fb34fef23890adb
Nicolas Geoffray [Tue, 22 Jul 2014 09:48:00 +0000 (10:48 +0100)]
Execute an application even when dex2oat crashes.
Bug:
17000769
(cherry picked from commit
4fcdc94d22a4608e355aa8df36240181149d10e8)
Change-Id: Iccb1fec94fe64ce4c3097510952f275482b86aa9
Ian Rogers [Fri, 15 Aug 2014 18:42:34 +0000 (18:42 +0000)]
am
378fe3d3: Merge "Make Monitor::Wait more robust to spurious Inflate failures." into lmp-dev
* commit '
378fe3d39d3a55f61d82ea482b8ce3082aee0e21':
Make Monitor::Wait more robust to spurious Inflate failures.
Mathieu Chartier [Fri, 15 Aug 2014 17:51:28 +0000 (17:51 +0000)]
am
bb6eccca: Merge "Use handle in one case that spans a gc-point." into lmp-dev
* commit '
bb6eccca7dcd673e24eed2fe95915780aa38a5d6':
Use handle in one case that spans a gc-point.
Jeff Hao [Fri, 15 Aug 2014 17:38:50 +0000 (17:38 +0000)]
am
95b4c65d: Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
* commit '
95b4c65da93500cdbdcaa3e01010771ef3f466f1':
Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
Jeff Hao [Fri, 15 Aug 2014 17:38:49 +0000 (17:38 +0000)]
am
4bf8d11d: Fix proxy tracing and enable tests that now work with tracing.
* commit '
4bf8d11df5dccc1b276cd9c40a98e8a14d79a9c8':
Fix proxy tracing and enable tests that now work with tracing.
Jeff Hao [Fri, 15 Aug 2014 00:18:52 +0000 (17:18 -0700)]
Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
This CL is a better fix for proxy tracing and undoes the changes in
https://android-review.googlesource.com/#/c/103025/
Bug:
16386215
(cherry picked from commit
db8a664e0b68c7c4d36270cd21dce8de1912d7f9)
Change-Id: Ic9e0ea2af7cb2da5d90c56aa009de92dba14cc47
Jeff Hao [Thu, 24 Jul 2014 23:26:09 +0000 (16:26 -0700)]
Fix proxy tracing and enable tests that now work with tracing.
Also updates proxy_test to generate an image for GetQuickOatCodeFor.
Bug:
16386215
(cherry picked from commit
f0a3f09c3d54646166a55c05a6b39c7dd504129c)
Change-Id: I138edbad9e1646db8590f2b1b73f2788d9710e68
Calin Juravle [Fri, 15 Aug 2014 13:16:47 +0000 (13:16 +0000)]
am
93de4273: [ART] Move to system/core native bridge library
* commit '
93de4273d72a2558a7b3423547b5074cd76c5796':
[ART] Move to system/core native bridge library
Calin Juravle [Tue, 12 Aug 2014 19:55:20 +0000 (20:55 +0100)]
[ART] Move to system/core native bridge library
Some cleanups on the way:
- move NativeBridgeRuntimeCallbacks from a global to a field
- rename native_bridge_library_string to the more suggestive
navtive_bridge_library_path
- clean up imports
Bug:
16884833
(cherry picked from commit I73aab8e212860ba5aee9444d801806d3da326a41)
Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
Narayan Kamath [Fri, 15 Aug 2014 09:12:08 +0000 (09:12 +0000)]
am
4f1d05f0: Merge "More efficient stack walk in exception throwing." into lmp-dev
* commit '
4f1d05f0531b980b16dbff18161f02160919ec31':
More efficient stack walk in exception throwing.
Ian Rogers [Fri, 15 Aug 2014 18:34:19 +0000 (18:34 +0000)]
Merge "Make Monitor::Wait more robust to spurious Inflate failures." into lmp-dev
Ian Rogers [Fri, 15 Aug 2014 18:09:28 +0000 (11:09 -0700)]
Make Monitor::Wait more robust to spurious Inflate failures.
Bug:
17062710
Change-Id: Ife5f6b335caacc70cab543cd568676d277d3beb6
Narayan Kamath [Fri, 15 Aug 2014 09:08:15 +0000 (09:08 +0000)]
Merge "More efficient stack walk in exception throwing." into lmp-dev
Mathieu Chartier [Fri, 15 Aug 2014 17:45:30 +0000 (17:45 +0000)]
Merge "Use handle in one case that spans a gc-point." into lmp-dev
Mingyao Yang [Wed, 13 Aug 2014 21:51:03 +0000 (14:51 -0700)]
Use handle in one case that spans a gc-point.
Bug:
16689428
(cherry picked from commit
38eecb0f4288a374c9b0b4b4df8793eb5fc6697c)
Change-Id: Id4a1bde9012e4dd333493e46997c200537c9cf55
Andreas Gampe [Thu, 14 Aug 2014 22:51:43 +0000 (22:51 +0000)]
am
b84d7a22: Revert "Revert "ART: Fix mac build""
* commit '
b84d7a226399dcc60bc0a421715ffc90ce9213f7':
Revert "Revert "ART: Fix mac build""
Andreas Gampe [Thu, 14 Aug 2014 22:40:19 +0000 (22:40 +0000)]
Revert "Revert "ART: Fix mac build""
This reverts commit
350b03bca65f87895275d1ed4bb895d5afeeeff1.
Also fixes a fault_handler symbol.
Change-Id: I1315527400bffc8ded9f2a7e7fdb1c8a6c104b96
Dave Allison [Thu, 14 Aug 2014 22:07:57 +0000 (22:07 +0000)]
am
03c9785a: Revert "Revert "Reduce stack usage for overflow checks""
* commit '
03c9785a8a6d712775cf406c4371d0227c44148f':
Revert "Revert "Reduce stack usage for overflow checks""
Dave Allison [Thu, 14 Aug 2014 17:02:48 +0000 (17:02 +0000)]
Revert "Revert "Reduce stack usage for overflow checks""
Fixes stack protection issue.
Fixes mac build issue.
This reverts commit
83b1940e6482b9d8feba5c492507735686650ea5.
Change-Id: I7ba17252882b23a740bcda2ea94aacf398255406
Hiroshi Yamauchi [Wed, 13 Aug 2014 18:12:22 +0000 (11:12 -0700)]
More efficient stack walk in exception throwing.
In the exception handling code, we currently walk down the stack
twice, once to get the stack height which we use to compute frame IDs
(the bottom frame is zero), and once more to find the catch block to
jump to.
For a deep stack, this could result in very slow exception
handling. That is, if have a lot of finally or catch blocks that we
end up jumping to in a deep stack, we need to do a lot of
catch/rethrow chains. Since we'd need to walk down to the bottom each
time to compute frames IDs in each catch/rethrow, we'd need to walk
down O(N^2) frames at the worst case.
Instead of frames IDs ((the bottom frame is zero), we will use the
frame depth (the top frame is zero) and no longer need to walk down
the stack just to get the stack height. We walk down O(N) frames.
This was what was happening with
code.google.gson.functional.CircularReferenceTest. With this change,
the test run time went from ~120s down to ~3s on N5 and it no longer
crashes due to the thread suspension timeout.
(cherry pick commit
649278cec7119cdd1bea3d0b710dbb2aa7c650b6)
Bug:
16800209
Change-Id: Ie815df1e3e8fb9d82e40685d4cc2b8838fd8aa07