OSDN Git Service
Vladimir Marko [Wed, 23 Mar 2016 01:00:21 +0000 (01:00 +0000)]
Merge "ART: Clean up arena allocation memory tracking."
am:
9a3c1fa
* commit '
9a3c1fa119350ebd390c63cc464e0a373dd296dd':
ART: Clean up arena allocation memory tracking.
Roland Levillain [Wed, 23 Mar 2016 01:00:20 +0000 (01:00 +0000)]
Merge "Tighten art::HNeg type constraints on its input."
am:
6fa06e6
* commit '
6fa06e6f5a92cd318021afad9b036126438b2de4':
Tighten art::HNeg type constraints on its input.
Alexey Frunze [Wed, 23 Mar 2016 01:00:20 +0000 (01:00 +0000)]
Merge "MIPS32: Implement UnsafeCASInt and UnsafeCASObject intrinsics."
am:
2a07b80
* commit '
2a07b80dfbfb869aabe96c88b10e07d26c0ce137':
MIPS32: Implement UnsafeCASInt and UnsafeCASObject intrinsics.
Roland Levillain [Wed, 23 Mar 2016 01:00:19 +0000 (01:00 +0000)]
Merge "Fix missing header inclusion in art/runtime/thread.cc."
am:
db17ce1
* commit '
db17ce13157bb2d8562d1b09682ee55fe69088e4':
Fix missing header inclusion in art/runtime/thread.cc.
Nicolas Geoffray [Wed, 23 Mar 2016 01:00:18 +0000 (01:00 +0000)]
Merge "Rename test to avoid too long filenames."
am:
c507fb6
* commit '
c507fb6d11c38065c4898e79e4cfaaf3ef904079':
Rename test to avoid too long filenames.
Nicolas Geoffray [Wed, 23 Mar 2016 01:00:17 +0000 (01:00 +0000)]
Merge "Add an ImtConflictTable to better resolve IMT conflicts."
am:
1f4364d
* commit '
1f4364d180d231a7d086eb0641deec30f71d02e6':
Add an ImtConflictTable to better resolve IMT conflicts.
Vladimir Marko [Tue, 22 Mar 2016 18:38:46 +0000 (18:38 +0000)]
Merge "ART: Clean up arena allocation memory tracking."
Roland Levillain [Tue, 22 Mar 2016 16:38:18 +0000 (16:38 +0000)]
Merge "Tighten art::HNeg type constraints on its input."
Vladimir Marko [Tue, 22 Mar 2016 16:26:33 +0000 (16:26 +0000)]
ART: Clean up arena allocation memory tracking.
Remove unused allocation types, mostly from removed Quick.
Move logging one level up to capture memory used by stack
maps during AOT compilation. Raise the reporting threshold
to 8MiB to limit the output to the worst offenders.
Change-Id: I8c7a01bfa90bc8ec5eab66187eb6850a022f3543
Roland Levillain [Tue, 22 Mar 2016 16:19:02 +0000 (16:19 +0000)]
Merge "MIPS32: Implement UnsafeCASInt and UnsafeCASObject intrinsics."
Roland Levillain [Tue, 22 Mar 2016 16:01:54 +0000 (16:01 +0000)]
Merge "Fix missing header inclusion in art/runtime/thread.cc."
Roland Levillain [Tue, 22 Mar 2016 15:52:22 +0000 (15:52 +0000)]
Fix missing header inclusion in art/runtime/thread.cc.
The file art/runtime/thread.cc was missing an #include of
art/runtime/gc/accounting/heap_bitmap-inl.h, which is
required by art::ReferenceMapVisitor::VisitDeclaringClass to
find the (inlined) implementation of
art::gc::accounting::HeapBitmap::Test.
This fixes the MIPS32 build.
Change-Id: I00a8bc85d8b32cfed02309e13e437f0cfd0d493e
Nicolas Geoffray [Tue, 22 Mar 2016 15:38:56 +0000 (15:38 +0000)]
Merge "Rename test to avoid too long filenames."
Nicolas Geoffray [Tue, 22 Mar 2016 15:38:11 +0000 (15:38 +0000)]
Rename test to avoid too long filenames.
Change-Id: Ic969c3f303fe7a0c415f670f268421906496ab39
Nicolas Geoffray [Tue, 22 Mar 2016 15:34:36 +0000 (15:34 +0000)]
Merge "Add an ImtConflictTable to better resolve IMT conflicts."
Nicolas Geoffray [Sun, 13 Mar 2016 22:22:31 +0000 (22:22 +0000)]
Add an ImtConflictTable to better resolve IMT conflicts.
- Attach a ImtConflictTable to conflict runtime ArtMethod.
- Initially 0, a new one will be created at the first hit of
the conflict method.
- If the assembly code does not find a target method in the table,
we will create a new one again, copying the data from the previous
table and adding the new mapping.
Implemented for arm/arm64/x86/x64.
bug:
27556801
bug:
24769046
Change-Id: Ie74d1c77cf73d451a1142bdc5e3683f9f84bb4e7
Vladimir Marko [Tue, 22 Mar 2016 14:03:33 +0000 (14:03 +0000)]
Merge "Optimizing: Fix a new valgrind error in image_test."
am:
0339bee
* commit '
0339bee5b1be39669606c4ba57edd42a0bacf0ff':
Optimizing: Fix a new valgrind error in image_test.
Vladimir Marko [Tue, 22 Mar 2016 13:55:17 +0000 (13:55 +0000)]
Merge "Optimizing: Fix a new valgrind error in image_test."
Nicolas Geoffray [Tue, 22 Mar 2016 13:03:29 +0000 (13:03 +0000)]
Merge "Disable two tests for no-prebuild."
am:
1aafce4
* commit '
1aafce4bb4b158349dcac1166aa049960461a686':
Disable two tests for no-prebuild.
Roland Levillain [Tue, 22 Mar 2016 12:57:27 +0000 (12:57 +0000)]
Merge "Revamp run-test 431-optimizing-arith-shifts."
am:
948a2a7
* commit '
948a2a7df4d818b7c1b07cd02aa21797f1c5fc58':
Revamp run-test 431-optimizing-arith-shifts.
Nicolas Geoffray [Tue, 22 Mar 2016 12:56:22 +0000 (12:56 +0000)]
Merge "Disable two tests for no-prebuild."
Nicolas Geoffray [Tue, 22 Mar 2016 12:55:30 +0000 (12:55 +0000)]
Disable two tests for no-prebuild.
bug:
27784033
Change-Id: Ib4fc86cf970e6f008da006cad1bf18e58fb84346
Roland Levillain [Tue, 22 Mar 2016 12:49:54 +0000 (12:49 +0000)]
Merge "Revamp run-test 431-optimizing-arith-shifts."
Vladimir Marko [Tue, 22 Mar 2016 12:31:54 +0000 (12:31 +0000)]
Optimizing: Fix a new valgrind error in image_test.
Bug:
27651442
Bug:
27151098
Change-Id: I23a428be68ccf9f9557df01ee7e920eeeb8da2ba
Roland Levillain [Tue, 22 Mar 2016 11:54:37 +0000 (11:54 +0000)]
Tighten art::HNeg type constraints on its input.
Ensure art::HNeg is only passed a type having the kind of
its input. For a boolean, byte, short, or char input, it
means HNeg's type should be int.
Bug:
27684275
Change-Id: Ic8442c62090a8ab65590754874a14a0deb7acd8d
Nicolas Geoffray [Tue, 22 Mar 2016 11:49:58 +0000 (11:49 +0000)]
Merge "Fix braino in JitCodeCache."
am:
0c25da0
* commit '
0c25da0276f5b6f6119793ae9d45d1bca8172c2b':
Fix braino in JitCodeCache.
Nicolas Geoffray [Tue, 22 Mar 2016 11:38:50 +0000 (11:38 +0000)]
Merge "Fix braino in JitCodeCache."
buzbee [Tue, 22 Mar 2016 11:28:23 +0000 (11:28 +0000)]
Merge "ART: remove nested include in arch_test"
am:
eecf60d
* commit '
eecf60d51b481647c8508f22b3d6ce437773ea0c':
ART: remove nested include in arch_test
Nicolas Geoffray [Tue, 22 Mar 2016 11:25:20 +0000 (11:25 +0000)]
Fix braino in JitCodeCache.
A OatQuickMethodHeader can never have its entry point be the
interpreter entrypoint.
Clear hotness counter of methods in more relevant places.
Change-Id: I0563a57eace2e0e4fe2abc76f5e293ddf47b25e3
Bill Buzbee [Tue, 22 Mar 2016 11:20:32 +0000 (11:20 +0000)]
Merge "ART: remove nested include in arch_test"
Nicolas Geoffray [Tue, 22 Mar 2016 11:19:43 +0000 (11:19 +0000)]
Merge "Revert "Revert "Enable compilation of secondary dex files"""
am:
a373a33
* commit '
a373a33d33b8a5b4fd0d4c35645e2e4353ebde9b':
Revert "Revert "Enable compilation of secondary dex files""
Nicolas Geoffray [Tue, 22 Mar 2016 11:09:36 +0000 (11:09 +0000)]
Merge "Revert "Revert "Enable compilation of secondary dex files"""
Nicolas Geoffray [Tue, 22 Mar 2016 10:59:54 +0000 (10:59 +0000)]
Merge "Update Makefile and scripts after Quick removal."
am:
e2aad5d
* commit '
e2aad5d8dba805e510476ded22737a2adffbef72':
Update Makefile and scripts after Quick removal.
Nicolas Geoffray [Tue, 22 Mar 2016 10:52:46 +0000 (10:52 +0000)]
Merge "Update Makefile and scripts after Quick removal."
Goran Jakovljevic [Tue, 22 Mar 2016 10:43:18 +0000 (10:43 +0000)]
Merge "Suppress MIPS32 assembler warnings"
am:
e989fe0
* commit '
e989fe08717ae6725d6bf7655289b6d0005126ae':
Suppress MIPS32 assembler warnings
Nicolas Geoffray [Tue, 22 Mar 2016 10:43:01 +0000 (10:43 +0000)]
Update Makefile and scripts after Quick removal.
Change-Id: I7610b34da337d81d9176ceca74e55ab85642a72b
Roland Levillain [Tue, 22 Mar 2016 10:35:59 +0000 (10:35 +0000)]
Merge "Suppress MIPS32 assembler warnings"
Nicolas Geoffray [Tue, 22 Mar 2016 09:52:40 +0000 (09:52 +0000)]
Revert "Revert "Enable compilation of secondary dex files""
Bug:
26719109
This reverts commit
d98a52f0bc6c58e8e538de8335ab9bcb6ae73aa7.
Change-Id: I523675eb6d647fe773dd57b6e1cc398927bb066e
Nicolas Geoffray [Tue, 22 Mar 2016 09:49:15 +0000 (09:49 +0000)]
Merge "Remove Quick from tree."
am:
2fac35e
* commit '
2fac35e21a3c0a0510cb1e5a824cf2cf4e4097ac':
Remove Quick from tree.
Nicolas Geoffray [Tue, 22 Mar 2016 09:41:41 +0000 (09:41 +0000)]
Merge "Remove Quick from tree."
Vladimir Marko [Tue, 22 Mar 2016 09:20:24 +0000 (09:20 +0000)]
Merge "Remove bogus DCHECK()."
am:
988a8ff
* commit '
988a8ff4c8ee3239096c877151bdf0359bf9411e':
Remove bogus DCHECK().
Vladimir Marko [Tue, 22 Mar 2016 09:11:36 +0000 (09:11 +0000)]
Merge "Remove bogus DCHECK()."
Mathieu Chartier [Tue, 22 Mar 2016 03:53:33 +0000 (03:53 +0000)]
Add sanity checking to declaring class visiting
am:
b33b1dc
* commit '
b33b1dc78d178060ff0f4327d448fd3a89df51de':
Add sanity checking to declaring class visiting
Mathieu Chartier [Tue, 22 Mar 2016 03:17:16 +0000 (03:17 +0000)]
Merge "Add sanity checking to declaring class visiting"
am:
1a9018b
* commit '
1a9018ba74841ac507b96f0e0dd6b86b22778ca6':
Add sanity checking to declaring class visiting
Mathieu Chartier [Tue, 22 Mar 2016 03:08:50 +0000 (03:08 +0000)]
Merge "Add sanity checking to declaring class visiting"
Mathieu Chartier [Mon, 21 Mar 2016 21:05:56 +0000 (14:05 -0700)]
Add sanity checking to declaring class visiting
When we have an unmarked declaring class in the image, it will
SIGSEGV due to the bitmap being read-only. Print some useful
info to try and debug this.
This probably hurts performance a bit, TODO disable when the bug is
fixed.
Bug:
27493510
(cherry picked from commit
b33b1dc78d178060ff0f4327d448fd3a89df51de)
Change-Id: I0c25afd5a6101a71fa1494e12dc019ba64bf43be
Mathieu Chartier [Mon, 21 Mar 2016 21:05:56 +0000 (14:05 -0700)]
Add sanity checking to declaring class visiting
When we have an unmarked declaring class in the image, it will
SIGSEGV due to the bitmap being read-only. Print some useful
info to try and debug this.
This probably hurts performance a bit, TODO disable when the bug is
fixed.
Bug:
27493510
Change-Id: Ida0c09cb8e41c1c2ff5cd9d07cbf0d34d6802511
Aart Bik [Mon, 21 Mar 2016 23:00:52 +0000 (23:00 +0000)]
Merge "Generalize induction and range analysis across type conversions."
am:
9060376
* commit '
9060376f38cb03353c82ddf15844156414249b19':
Generalize induction and range analysis across type conversions.
Aart Bik [Mon, 21 Mar 2016 22:52:06 +0000 (22:52 +0000)]
Merge "Generalize induction and range analysis across type conversions."
Alexey Frunze [Fri, 18 Mar 2016 00:21:45 +0000 (17:21 -0700)]
MIPS32: Implement UnsafeCASInt and UnsafeCASObject intrinsics.
Change-Id: Ie871763b9a36075fd3d70ee6e2e241ae1ccc36cf
buzbee [Mon, 21 Mar 2016 22:11:04 +0000 (15:11 -0700)]
ART: remove nested include in arch_test
arch_test #includes asm_support.h while inside the art namespace.
We've gotten away with this until now because the files that
asm_support.h includes had already been included earlier (and thus,
were empty via the #ifdef guard). However, adding new #includes to
asm_support.h results in art::art:: namespace ugliness.
Change-Id: Ie2671c456bb631976b4280f29a5656b086138047
Mathieu Chartier [Mon, 21 Mar 2016 20:10:10 +0000 (20:10 +0000)]
Disable LZ4HC compressed images
am:
086e279
* commit '
086e279ff9c739da617c9fb50fababf74ed52890':
Disable LZ4HC compressed images
Aart Bik [Wed, 16 Mar 2016 17:49:38 +0000 (10:49 -0700)]
Generalize induction and range analysis across type conversions.
Rationale:
This changelist implements allowing narrowing conversions within
inductions and loop control. More induction and loops recognized,
more bounds eliminated. We all win. The basic idea is pretty simple
(record type with detected induction) but one has to get all the
details right, as illustrated by the many new unit tests.
BUG=
27151098
Change-Id: I254020bfa5fa623799b31bbbb5ccc97d4d5a0100
Mathieu Chartier [Mon, 21 Mar 2016 19:52:35 +0000 (19:52 +0000)]
Merge "Move process state into runtime"
am:
6a32929
* commit '
6a329292736c3dd74e9c8cb319c2a233d07fe524':
Move process state into runtime
Mathieu Chartier [Mon, 21 Mar 2016 19:47:35 +0000 (19:47 +0000)]
Merge "Disable LZ4HC compressed images"
am:
4485c69
* commit '
4485c6964ad414d5c6d0535622cfad1c0a6b640f':
Disable LZ4HC compressed images
Mathieu Chartier [Mon, 21 Mar 2016 19:45:04 +0000 (19:45 +0000)]
Merge "Move process state into runtime"
Mathieu Chartier [Fri, 18 Mar 2016 02:19:15 +0000 (19:19 -0700)]
Disable LZ4HC compressed images
Seem to get randomly compressed incorrectly on volantis. Added
verifiation in the image writer.
Using LZ4HC now silently uses LZ4. This is still safe since both use
the same decompression code.
Bug:
27560444
(cherry picked from commit
9894fc8079a5c6eb72e04099bdbd3239b75cf491)
Change-Id: Ic0d78f419884d7ef2e29948835c942fbb68e66da
Mathieu Chartier [Mon, 21 Mar 2016 19:37:48 +0000 (19:37 +0000)]
Merge "Disable LZ4HC compressed images"
Mathieu Chartier [Mon, 21 Mar 2016 18:47:03 +0000 (18:47 +0000)]
Move process state into runtime
am:
f8484c8
* commit '
f8484c8b55f4b423048f94dfabbe44110a039a9b':
Move process state into runtime
Mathieu Chartier [Sat, 19 Mar 2016 01:45:41 +0000 (18:45 -0700)]
Move process state into runtime
Clean up.
Bug:
27420435
(cherry picked from commit
f8484c8b55f4b423048f94dfabbe44110a039a9b)
Change-Id: Ia20781ee36e6a31c88ca41d3866b26813cff434d
Mathieu Chartier [Sat, 19 Mar 2016 01:45:41 +0000 (18:45 -0700)]
Move process state into runtime
Clean up.
Bug:
27420435
Change-Id: I8fff84ed1b29a12310094b10fb6382268e69d54b
Mathieu Chartier [Fri, 18 Mar 2016 02:19:15 +0000 (19:19 -0700)]
Disable LZ4HC compressed images
Seem to get randomly compressed incorrectly on volantis. Added
verifiation in the image writer.
Using LZ4HC now silently uses LZ4. This is still safe since both use
the same decompression code.
Bug:
27560444
Change-Id: I652eee7498dc84994993be3a5b0447ec5b246304
Vladimir Marko [Mon, 21 Mar 2016 17:58:51 +0000 (17:58 +0000)]
Remove bogus DCHECK().
Bug:
27684368
Change-Id: Ic3653280b32a471fbfdb5459ea382bc15c86cdbc
Vladimir Marko [Mon, 21 Mar 2016 17:46:17 +0000 (17:46 +0000)]
Merge "Optimizing: Fix register allocator validation memory usage."
am:
162629e
* commit '
162629ee8ac0fee2df0c0cdec27dff34bc6f0062':
Optimizing: Fix register allocator validation memory usage.
Nicolas Geoffray [Mon, 21 Mar 2016 17:10:24 +0000 (17:10 +0000)]
Remove Quick from tree.
So long, old friend.
Change-Id: I0241c798a34b92bf994fed83888da67d6e7f1891
Vladimir Marko [Mon, 21 Mar 2016 17:36:44 +0000 (17:36 +0000)]
Merge "Optimizing: Fix register allocator validation memory usage."
Hiroshi Yamauchi [Mon, 21 Mar 2016 17:22:20 +0000 (17:22 +0000)]
Merge "Fix a CC 145-alloc-tracking-stress deadlock."
am:
3890e85
* commit '
3890e85aaab150bc0a5e116be762c786c882e1ec':
Fix a CC 145-alloc-tracking-stress deadlock.
Hiroshi Yamauchi [Mon, 21 Mar 2016 17:12:28 +0000 (17:12 +0000)]
Merge "Fix a CC 145-alloc-tracking-stress deadlock."
Vladimir Marko [Mon, 21 Mar 2016 12:01:50 +0000 (12:01 +0000)]
Optimizing: Fix register allocator validation memory usage.
Also attribute ArenaBitVector allocations to appropriate
passes. This was used to track down the source of the
excessive memory alloactions.
Bug:
27690481
Change-Id: Ib895984cb7c04e24cbc7abbd8322079bab8ab100
Yohann Roussel [Mon, 21 Mar 2016 16:47:58 +0000 (16:47 +0000)]
Merge "Let tests informa Jack of the min api version"
am:
985125b
* commit '
985125b33f27220608cbdb87d87bc24e36325156':
Let tests informa Jack of the min api version
Yohann Roussel [Mon, 21 Mar 2016 16:39:59 +0000 (16:39 +0000)]
Merge "Let tests informa Jack of the min api version"
Yohann Roussel [Mon, 21 Mar 2016 15:26:02 +0000 (16:26 +0100)]
Let tests informa Jack of the min api version
This is necessarry for compiling source code with default method.
Bug:
27371864
Change-Id: I8c9d3690e403729facd2e868cbda761b3488b2f6
Chris Larsen [Mon, 21 Mar 2016 15:25:37 +0000 (15:25 +0000)]
Merge "MIPS32: sun.misc.Unsafe get/put intrinsics."
am:
ae207db
* commit '
ae207dbf2cb73ef3cfff6dd5c502920dee4d4366':
MIPS32: sun.misc.Unsafe get/put intrinsics.
Roland Levillain [Mon, 21 Mar 2016 15:20:52 +0000 (15:20 +0000)]
Merge "Pacify g++ about a set-but-unused variable."
am:
73139dd
* commit '
73139dd7c12906975e835ae6e6707266626fed2a':
Pacify g++ about a set-but-unused variable.
Roland Levillain [Mon, 21 Mar 2016 15:18:43 +0000 (15:18 +0000)]
Merge "MIPS32: sun.misc.Unsafe get/put intrinsics."
Roland Levillain [Mon, 21 Mar 2016 15:13:15 +0000 (15:13 +0000)]
Merge "Pacify g++ about a set-but-unused variable."
Nicolas Geoffray [Mon, 21 Mar 2016 14:59:22 +0000 (14:59 +0000)]
Merge "Code cleanup between debugger and jit."
am:
1153282
* commit '
1153282aa91292b740289ab7612a481e5c6bc167':
Code cleanup between debugger and jit.
Nicolas Geoffray [Mon, 21 Mar 2016 14:53:09 +0000 (14:53 +0000)]
Merge "Code cleanup between debugger and jit."
Nicolas Geoffray [Fri, 18 Mar 2016 09:40:17 +0000 (09:40 +0000)]
Code cleanup between debugger and jit.
This is to allow secondary dex files to be fully compiled.
- No need to do full deopt anymore for breakpoints: code in boot.oat
is deoptimized as soon as the debugger attaches (and we decided that
existing frames could not be debugged), and application being
debugged is compiled debuggable.
- jit should only call UpdateMethodsCode if exit stubs are not
installed due to lock violation otherwise (the lock level of the
jit code cache is lower than the deoptimization lock).
This part needs an overall cleanup beyond the scope of this change.
Change-Id: I38d85dcb270db746c1d6b0ceb7893a1aad8c9655
Goran Jakovljevic [Mon, 21 Mar 2016 13:24:43 +0000 (14:24 +0100)]
Suppress MIPS32 assembler warnings
Suppressing "no .cprestore pseudo-op used in PIC code".
Suppressing "used $at without .set noat".
Fixing some typos.
Change-Id: I45267890b070cee3dd7f3708cf73e157a08f798e
Roland Levillain [Mon, 21 Mar 2016 14:09:54 +0000 (14:09 +0000)]
Pacify g++ about a set-but-unused variable.
This fixes the MIPS32 build.
Change-Id: Ic1e6d4627d69a3701c2f3e8fdd784d97a4e41ba5
Nicolas Geoffray [Mon, 21 Mar 2016 11:43:48 +0000 (11:43 +0000)]
Merge "Check if the type of an instruction is erroneous before inlining."
am:
459898d
* commit '
459898dc4470559ba1e1d578bc52a914d1f573f5':
Check if the type of an instruction is erroneous before inlining.
Nicolas Geoffray [Mon, 21 Mar 2016 11:38:27 +0000 (11:38 +0000)]
Merge "Check if the type of an instruction is erroneous before inlining."
Nicolas Geoffray [Mon, 21 Mar 2016 11:34:33 +0000 (11:34 +0000)]
Merge "Call HuntForOriginalReference to get to the null."
am:
3cf5f5c
* commit '
3cf5f5ccdb32d035f021dcef11222092b8d20b0b':
Call HuntForOriginalReference to get to the null.
Nicolas Geoffray [Mon, 21 Mar 2016 11:27:10 +0000 (11:27 +0000)]
Merge "Call HuntForOriginalReference to get to the null."
Nicolas Geoffray [Fri, 18 Mar 2016 11:36:20 +0000 (11:36 +0000)]
Check if the type of an instruction is erroneous before inlining.
We can get HInstructions typed with a class that is in an error state.
For such classes, we cannot look at the vtable or imt table as they
are not cleanly populated.
bug:
27683927
Change-Id: I0d64ca470e1cb6cf9b40e9f02bb9b0bb12c2bac1
Nicolas Geoffray [Mon, 21 Mar 2016 09:07:48 +0000 (09:07 +0000)]
Merge remote-tracking branch 'goog/master' into nyc-dev
bug:
25492619
bug:
27520994
bug:
27624718
Change-Id: I8dd1e90724f7b9694a1d493ce61f669123dd3ac4
Nicolas Geoffray [Fri, 18 Mar 2016 16:25:38 +0000 (16:25 +0000)]
Call HuntForOriginalReference to get to the null.
The null constant might be hiding under a HBoundType
(which we could clean up in instruction simplifier, but
that is orthogonal).
bug:
27683874
Change-Id: Ide8ec5bcd439ec0fca5e54175ebeedc5a9f679a3
Nicolas Geoffray [Sat, 19 Mar 2016 11:47:02 +0000 (11:47 +0000)]
Merge "Fix mising "." am:
0d0796e
am:
b7788e2
* commit '
b7788e23737e221799770b8ea2887b3134fe6223':
Fix mising ".
Nicolas Geoffray [Sat, 19 Mar 2016 11:44:41 +0000 (11:44 +0000)]
Merge "Fix mising "."
am:
0d0796e
* commit '
0d0796eb5db4cbc51fd826b370595ba6871264a1':
Fix mising ".
Nicolas Geoffray [Sat, 19 Mar 2016 11:37:04 +0000 (11:37 +0000)]
Merge "Fix mising "."
Nicolas Geoffray [Sat, 19 Mar 2016 10:25:41 +0000 (10:25 +0000)]
Fix mising ".
Change-Id: I2116d97162b8ab6d01fa633650532e190959cad4
Hiroshi Yamauchi [Sat, 19 Mar 2016 00:17:52 +0000 (17:17 -0700)]
Fix a CC 145-alloc-tracking-stress deadlock.
When the allocation tracking gets disabled, there may be threads
blocking on the system weak access for recording allocations, but when
GC reenables the system weak access, it fails to wake up those blocked
threads (which causes a deadlock) because the broadcast call is guarded
by Heap::IsAllocTrackingEnabled(), which is false at this point.
Broadcast in Heap::BroadcastForNewAllocationRecords() regardless of
Heap::IsAllocTrackingEnabled(), which is safe.
Also apply a similar fix for the non-CC case.
Bug:
27467554
Change-Id: I74cf88bceb306589ce11a19a688be223e099e88a
Jeff Hao [Fri, 18 Mar 2016 23:37:45 +0000 (23:37 +0000)]
Merge "Add patchoat check that input oat file has patch section." am:
443e7ee
am:
fd2cd8e
* commit '
fd2cd8e49d6d6dab12d526a7485ea152aa744552':
Add patchoat check that input oat file has patch section.
Jeff Hao [Fri, 18 Mar 2016 23:33:22 +0000 (23:33 +0000)]
Merge "Add patchoat check that input oat file has patch section." into nyc-dev am:
99d0151
am:
61464e2
* commit '
61464e2bc934739a19df8a87527d1d7ed36c7f66':
Add patchoat check that input oat file has patch section.
Jeff Hao [Fri, 18 Mar 2016 23:33:21 +0000 (23:33 +0000)]
Merge "Add patchoat check that input oat file has patch section."
am:
443e7ee
* commit '
443e7eeaf6783325dde27b6b20b57ea344cd6a36':
Add patchoat check that input oat file has patch section.
Jeff Hao [Fri, 18 Mar 2016 23:31:04 +0000 (23:31 +0000)]
Merge "Add patchoat check that input oat file has patch section." into nyc-dev
am:
99d0151
* commit '
99d0151eff70325a7615e860d2483ac7856ee75c':
Add patchoat check that input oat file has patch section.
Jeff Hao [Fri, 18 Mar 2016 23:26:51 +0000 (23:26 +0000)]
Merge "Add patchoat check that input oat file has patch section." into nyc-dev
Jeff Hao [Fri, 18 Mar 2016 23:23:40 +0000 (23:23 +0000)]
Merge "Add patchoat check that input oat file has patch section."
Mathieu Chartier [Fri, 18 Mar 2016 23:02:43 +0000 (23:02 +0000)]
Merge changes from topic \'verify-profile\' am:
4892106
am:
6991d13
* commit '
6991d136b66d79d15ecf90efcda42bcb25a96671':
Fix incorrect dex2oat check
Add verify-profile compiler filter