OSDN Git Service
Roland Levillain [Thu, 4 Feb 2016 18:06:12 +0000 (18:06 +0000)]
Merge "Ignore ZipFileTest#testZipFileWithLotsOfEntries failures with CC on N5." am:
6234003307
am:
b0a8d95760
* commit '
b0a8d957605e18262c79ac3f8750cbf26fb8ff0d':
Ignore ZipFileTest#testZipFileWithLotsOfEntries failures with CC on N5.
Roland Levillain [Thu, 4 Feb 2016 18:04:12 +0000 (18:04 +0000)]
Merge "Ignore DeflaterOutputStreamTest#testSyncFlushEnabled failures with CC." am:
496450a9f4
am:
92ec0c5e8d
* commit '
92ec0c5e8dd11bfe895f1bf7409d47097081aa50':
Ignore DeflaterOutputStreamTest#testSyncFlushEnabled failures with CC.
Roland Levillain [Thu, 4 Feb 2016 18:04:11 +0000 (18:04 +0000)]
Merge "Ignore ZipFileTest#testZipFileWithLotsOfEntries failures with CC on N5."
am:
6234003307
* commit '
62340033078bcd965e940b8ee390bf07b7867cab':
Ignore ZipFileTest#testZipFileWithLotsOfEntries failures with CC on N5.
Roland Levillain [Thu, 4 Feb 2016 18:01:00 +0000 (18:01 +0000)]
Merge "Ignore DeflaterOutputStreamTest#testSyncFlushEnabled failures with CC."
am:
496450a9f4
* commit '
496450a9f4a2aacc5598051acbb384c5145ddca0':
Ignore DeflaterOutputStreamTest#testSyncFlushEnabled failures with CC.
Roland Levillain [Thu, 4 Feb 2016 17:59:08 +0000 (17:59 +0000)]
Merge "Ignore ZipFileTest#testZipFileWithLotsOfEntries failures with CC on N5."
Roland Levillain [Thu, 4 Feb 2016 17:57:48 +0000 (17:57 +0000)]
Merge "Ignore DeflaterOutputStreamTest#testSyncFlushEnabled failures with CC."
Roland Levillain [Thu, 4 Feb 2016 17:51:13 +0000 (17:51 +0000)]
Ignore ZipFileTest#testZipFileWithLotsOfEntries failures with CC on N5.
This test sometimes fails with a
java.util.concurrent.TimeoutException on ART Builbot's
hammerhead concurrent collector configuration:
* libcore.java.util.zip.ZipFileTest#testZipFileWithLotsOfEntries
Disable it while we investigate.
Bug:
26711853
Change-Id: I22d2c1f7ae6fc447045dfa0f7075b10e5b2094ae
Roland Levillain [Thu, 4 Feb 2016 17:29:22 +0000 (17:29 +0000)]
Ignore DeflaterOutputStreamTest#testSyncFlushEnabled failures with CC.
This test sometimes fails with a
java.util.concurrent.TimeoutException on ART Builbot's
x86 concurrent collector configuration:
* libcore.java.util.zip.DeflaterOutputStreamTest#testSyncFlushEnabled
Disable it while we investigate.
Bug:
26507762
Change-Id: I4f026c20a555f985a17bf785606cae53f3f804d3
Aart Bik [Thu, 4 Feb 2016 17:07:25 +0000 (17:07 +0000)]
Merge "Fixed bug on premature DCHECK. With fail-before/pass-after test" am:
85b3b52a93
am:
120b36a903
* commit '
120b36a9032aa168b7d4c1a1fdc3f2c1e5be4ea2':
Fixed bug on premature DCHECK. With fail-before/pass-after test
Aart Bik [Thu, 4 Feb 2016 17:05:30 +0000 (17:05 +0000)]
Merge "Fixed bug on premature DCHECK. With fail-before/pass-after test"
am:
85b3b52a93
* commit '
85b3b52a931b54380be3753216e97431ae2215a9':
Fixed bug on premature DCHECK. With fail-before/pass-after test
Aart Bik [Thu, 4 Feb 2016 16:59:17 +0000 (16:59 +0000)]
Merge "Fixed bug on premature DCHECK. With fail-before/pass-after test"
Roland Levillain [Thu, 4 Feb 2016 16:50:31 +0000 (16:50 +0000)]
Merge "Re-enable some MIPS/MIPS64 run-tests" am:
f6171e1b62
am:
8e5d6d1320
* commit '
8e5d6d1320dbcd83a65052cafc57934319abc38f':
Re-enable some MIPS/MIPS64 run-tests
Roland Levillain [Thu, 4 Feb 2016 16:48:32 +0000 (16:48 +0000)]
Merge "Re-enable some MIPS/MIPS64 run-tests"
am:
f6171e1b62
* commit '
f6171e1b62c1442956e83e9a95eb0c0e385622e9':
Re-enable some MIPS/MIPS64 run-tests
Roland Levillain [Thu, 4 Feb 2016 16:44:57 +0000 (16:44 +0000)]
Merge "Re-enable some MIPS/MIPS64 run-tests"
Roland Levillain [Thu, 4 Feb 2016 14:42:55 +0000 (14:42 +0000)]
Merge "Test 565-checker-doublenegbitwise applies to all architectures." am:
9004b817d7
am:
7b3c2e881e
* commit '
7b3c2e881e38a8e1444764390d54836c81423d65':
Test 565-checker-doublenegbitwise applies to all architectures.
Roland Levillain [Thu, 4 Feb 2016 14:41:04 +0000 (14:41 +0000)]
Merge "Test 565-checker-doublenegbitwise applies to all architectures."
am:
9004b817d7
* commit '
9004b817d7dcfa955a02bb7827de9401cdf4d291':
Test 565-checker-doublenegbitwise applies to all architectures.
Roland Levillain [Thu, 4 Feb 2016 14:36:46 +0000 (14:36 +0000)]
Merge "Test 565-checker-doublenegbitwise applies to all architectures."
Goran Jakovljevic [Thu, 4 Feb 2016 14:18:41 +0000 (15:18 +0100)]
Re-enable some MIPS/MIPS64 run-tests
These tests are passing now on MIPS/MIPS64:
- 441-checker-inliner
- 536-checker-intrinsic-optimization
- 557-checker-instruction-simplifier-ror
Change-Id: I57b82f8ec1e774e8e0a16ba289e50aa4a764b96b
David Srbecky [Thu, 4 Feb 2016 13:24:31 +0000 (13:24 +0000)]
Merge "Reduce the size of native debug info generated by JIT." am:
ac6a195ec8
am:
fa6ab63236
* commit '
fa6ab6323637a53125f314f822361c71837d6009':
Reduce the size of native debug info generated by JIT.
David Srbecky [Thu, 4 Feb 2016 13:22:25 +0000 (13:22 +0000)]
Merge "Reduce the size of native debug info generated by JIT."
am:
ac6a195ec8
* commit '
ac6a195ec8e1b5a7a6bd3d0c53d8997ff7a5e2cc':
Reduce the size of native debug info generated by JIT.
David Srbecky [Thu, 4 Feb 2016 13:17:41 +0000 (13:17 +0000)]
Merge "Reduce the size of native debug info generated by JIT."
David Srbecky [Thu, 28 Jan 2016 20:01:28 +0000 (20:01 +0000)]
Reduce the size of native debug info generated by JIT.
Remove some ELF file overheads:
- Do not produce program headers.
- Do not page align strtab.
- Do not write oat_patches sections.
This more than halves the size of JIT native debug info.
Since we generate many small entries, the overheads added up.
Change-Id: I27d95548c61e2e38c3683d6f5eb870a2db6e812d
Alexandre Rames [Thu, 4 Feb 2016 13:16:08 +0000 (13:16 +0000)]
Test 565-checker-doublenegbitwise applies to all architectures.
Change-Id: Icd8c54b5b8e90f839c4ef1646074f70be1cfe094
Igor Murashkin [Thu, 4 Feb 2016 02:34:10 +0000 (02:34 +0000)]
Merge "runtime: Don\'t skip verification for -Xverify:soft-fail" am:
867d63b65f
am:
d5b4ac600c
* commit '
d5b4ac600ca5e3dbacc2fb887e24c9342e1eda97':
runtime: Don't skip verification for -Xverify:soft-fail
Mathieu Chartier [Thu, 4 Feb 2016 02:34:01 +0000 (02:34 +0000)]
Merge "Strip image-format arg in dex2oat" am:
6006e2ce92
am:
3ae8e105d7
* commit '
3ae8e105d7f1ec67a0f4e237a29db30d32f66cb1':
Strip image-format arg in dex2oat
Igor Murashkin [Thu, 4 Feb 2016 00:40:47 +0000 (00:40 +0000)]
Merge "runtime: Don\'t skip verification for -Xverify:soft-fail"
am:
867d63b65f
* commit '
867d63b65f653d27dc7ea87e924f47148cec22a7':
runtime: Don't skip verification for -Xverify:soft-fail
Igor Murashkin [Thu, 4 Feb 2016 00:34:43 +0000 (00:34 +0000)]
Merge "runtime: Don't skip verification for -Xverify:soft-fail"
Mathieu Chartier [Thu, 4 Feb 2016 00:26:44 +0000 (00:26 +0000)]
Merge "Strip image-format arg in dex2oat"
am:
6006e2ce92
* commit '
6006e2ce92fd86fdf028cd7b3afe972815b0e0f3':
Strip image-format arg in dex2oat
Mathieu Chartier [Thu, 4 Feb 2016 00:22:21 +0000 (00:22 +0000)]
Merge "Strip image-format arg in dex2oat"
Mathieu Chartier [Wed, 3 Feb 2016 23:50:29 +0000 (15:50 -0800)]
Strip image-format arg in dex2oat
Avoids printing it out to prevent spam.
Bug:
22858531
Change-Id: I9d0b35b8fa317bc39ab27946baa88812a32381e2
Alex Light [Wed, 3 Feb 2016 21:57:51 +0000 (21:57 +0000)]
Merge "Fix class_linker_test to take into account default methods." am:
009a195c55
am:
fc1052715b
* commit '
fc1052715b54b3e0e1cf16a4972c1ccee77ca62e':
Fix class_linker_test to take into account default methods.
Alex Light [Wed, 3 Feb 2016 21:55:48 +0000 (21:55 +0000)]
Merge "Fix class_linker_test to take into account default methods."
am:
009a195c55
* commit '
009a195c5507ddc799cf7a52927b0ac02aa7f7e6':
Fix class_linker_test to take into account default methods.
Alex Light [Wed, 3 Feb 2016 21:51:04 +0000 (21:51 +0000)]
Merge "Fix class_linker_test to take into account default methods."
Alex Light [Wed, 3 Feb 2016 21:45:41 +0000 (13:45 -0800)]
Fix class_linker_test to take into account default methods.
Bug:
26963208
Change-Id: Ie22ce4e7fae3b259b9a58356dbd9662fda6d49e3
Igor Murashkin [Wed, 3 Feb 2016 00:56:50 +0000 (16:56 -0800)]
runtime: Don't skip verification for -Xverify:soft-fail
When forcing the interpreter into access checks mode,
make sure that the regular verification is still run,
giving the verifier an opportunity to throw a VerifyError.
If verification would've succeeded (without -Xverify:soft-fail flag),
override this and soft-fail, to force the interpreter-with-access-checks to be run
instead of the normal faster interpreter.
This fixes the following run-tests under the interpeter-access-checks:
* 135
* 412
* 471
* 506
* 800
Bug:
22414682
Change-Id: I5cb86a8bba71c7af9361a63c0802786c852b857b
Mathieu Chartier [Wed, 3 Feb 2016 21:31:51 +0000 (21:31 +0000)]
Merge "Avoid read barrier for UpdateEntrypoints" am:
287fd33a9f
am:
ccfc007a3f
* commit '
ccfc007a3ffc35e1896848cbaf2e997b36092e57':
Avoid read barrier for UpdateEntrypoints
Mathieu Chartier [Wed, 3 Feb 2016 21:29:22 +0000 (21:29 +0000)]
Merge "Avoid read barrier for UpdateEntrypoints"
am:
287fd33a9f
* commit '
287fd33a9f03f16ae52a3b290bcabb49bc65d97b':
Avoid read barrier for UpdateEntrypoints
Mathieu Chartier [Wed, 3 Feb 2016 21:22:49 +0000 (21:22 +0000)]
Merge "Avoid read barrier for UpdateEntrypoints"
Aart Bik [Wed, 3 Feb 2016 20:56:02 +0000 (12:56 -0800)]
Fixed bug on premature DCHECK.
With fail-before/pass-after test
bug=
26947011
Rationale:
During BCE, the phi structure is under construction,
to be fixed by InsertPhiNodes() and carefully checked
with the SSA checker. So utilities should not overly
DCHECK on SSA consistency during the modifications.
Change-Id: Ia9df9ee5aac0c1dd2c3e3a447c730246d5e48bbb
Igor Murashkin [Wed, 3 Feb 2016 20:20:27 +0000 (20:20 +0000)]
Merge changes I44ee74d8,I78b17187 am:
e968112160
am:
18edaea305
* commit '
18edaea305b7b269f7eb0e4d434087689913b7e0':
runtime: Update Proxy to assume 1 less direct method
runtime: Fix field resolution with access checks (runtest 073)
Igor Murashkin [Wed, 3 Feb 2016 20:20:13 +0000 (20:20 +0000)]
Merge changes from topic \'reflection_1_8\' am:
071b933eb6
am:
07aec663bc
* commit '
07aec663bccc3c5378a521a660ae707cfc83a643':
Revert "Revert "reflection: Add new 1.8 AnnotatedElement methods and tests""
interpreter: Fix proxy method invocation with access checks enabled.
Igor Murashkin [Wed, 3 Feb 2016 20:18:16 +0000 (20:18 +0000)]
Merge changes I44ee74d8,I78b17187
am:
e968112160
* commit '
e9681121609e08835dd461a80eea649b94dac563':
runtime: Update Proxy to assume 1 less direct method
runtime: Fix field resolution with access checks (runtest 073)
Igor Murashkin [Wed, 3 Feb 2016 20:18:06 +0000 (20:18 +0000)]
Merge changes from topic \'reflection_1_8\'
am:
071b933eb6
* commit '
071b933eb6e937ca6b9efa24e0e3a70a50eca975':
Revert "Revert "reflection: Add new 1.8 AnnotatedElement methods and tests""
interpreter: Fix proxy method invocation with access checks enabled.
Igor Murashkin [Wed, 3 Feb 2016 20:15:05 +0000 (20:15 +0000)]
Merge changes I44ee74d8,I78b17187
* changes:
runtime: Update Proxy to assume 1 less direct method
runtime: Fix field resolution with access checks (runtest 073)
Igor Murashkin [Wed, 3 Feb 2016 20:13:59 +0000 (20:13 +0000)]
Merge changes from topic 'reflection_1_8'
* changes:
Revert "Revert "reflection: Add new 1.8 AnnotatedElement methods and tests""
interpreter: Fix proxy method invocation with access checks enabled.
Mathieu Chartier [Wed, 3 Feb 2016 19:48:27 +0000 (11:48 -0800)]
Avoid read barrier for UpdateEntrypoints
Somehow not caught by local testing.
Bug:
26786304
Change-Id: Ib9b53c0252bc053013fddd63c8146f4057a38453
Aart Bik [Wed, 3 Feb 2016 17:54:38 +0000 (17:54 +0000)]
Merge "Minor improvement on static BCE analysis." am:
c5b76b9328
am:
bbe27fa779
* commit '
bbe27fa779bf8cc0c93686249d0ab3ce5314e4a7':
Minor improvement on static BCE analysis.
Aart Bik [Wed, 3 Feb 2016 17:50:03 +0000 (17:50 +0000)]
Merge "Minor improvement on static BCE analysis."
am:
c5b76b9328
* commit '
c5b76b9328d77b83c80afed14a5b6e7009136e15':
Minor improvement on static BCE analysis.
Aart Bik [Wed, 3 Feb 2016 17:29:11 +0000 (17:29 +0000)]
Merge "Minor improvement on static BCE analysis."
Aart Bik [Tue, 2 Feb 2016 21:26:16 +0000 (13:26 -0800)]
Minor improvement on static BCE analysis.
Rationale:
Avoid testing initial range if nothing is known.
Change-Id: I22646a5fd6e4481245d1a2f57891d2805550489f
Roland Levillain [Wed, 3 Feb 2016 13:46:22 +0000 (13:46 +0000)]
Merge "Implement first kind of polymorphic inlining on MIPS." am:
a20748aceb
am:
2def2df387
* commit '
2def2df3876220d4cf7b406e58538c0ff441032b':
Implement first kind of polymorphic inlining on MIPS.
Roland Levillain [Wed, 3 Feb 2016 13:38:20 +0000 (13:38 +0000)]
Merge "Implement first kind of polymorphic inlining on MIPS."
am:
a20748aceb
* commit '
a20748aceb63396c5e09366968bbc71308f745df':
Implement first kind of polymorphic inlining on MIPS.
Roland Levillain [Wed, 3 Feb 2016 13:31:53 +0000 (13:31 +0000)]
Merge "Revert "Revert "Optimizing: double-negated bitwise operations simplifications""" am:
905cb88fa4
am:
b99fec8d24
* commit '
b99fec8d2498e04da2678e798684078f6a66c989':
Revert "Revert "Optimizing: double-negated bitwise operations simplifications""
Roland Levillain [Wed, 3 Feb 2016 13:22:58 +0000 (13:22 +0000)]
Merge "Revert "Revert "Optimizing: double-negated bitwise operations simplifications"""
am:
905cb88fa4
* commit '
905cb88fa4a8e3b7fd29424a35572d0d19c7bce5':
Revert "Revert "Optimizing: double-negated bitwise operations simplifications""
Roland Levillain [Wed, 3 Feb 2016 12:28:41 +0000 (12:28 +0000)]
Merge "Implement first kind of polymorphic inlining on MIPS."
Roland Levillain [Wed, 3 Feb 2016 12:27:20 +0000 (12:27 +0000)]
Implement first kind of polymorphic inlining on MIPS.
Change-Id: Ie430d6c5821273143a1872b376e8e24683d00ab0
Roland Levillain [Wed, 3 Feb 2016 12:14:14 +0000 (12:14 +0000)]
Merge "Revert "Revert "Optimizing: double-negated bitwise operations simplifications"""
Vladimir Marko [Wed, 3 Feb 2016 11:03:35 +0000 (11:03 +0000)]
Merge "ART: Fix rounding up in DexCacheArraysLayout constructor." am:
6b5a17a84d
am:
2b925b8f47
* commit '
2b925b8f47fdae5788c1ff463dbbe45562c72500':
ART: Fix rounding up in DexCacheArraysLayout constructor.
Vladimir Marko [Wed, 3 Feb 2016 10:58:16 +0000 (10:58 +0000)]
Merge "ART: Fix rounding up in DexCacheArraysLayout constructor."
am:
6b5a17a84d
* commit '
6b5a17a84d84fc4a9131d7a256e6586d906be064':
ART: Fix rounding up in DexCacheArraysLayout constructor.
Nicolas Geoffray [Wed, 3 Feb 2016 10:55:29 +0000 (10:55 +0000)]
Merge "Assume fp operations can also take a constant on x86." am:
371d75ef9e
am:
d88f688563
* commit '
d88f6885635e0005553def73e53aae14dc82370e':
Assume fp operations can also take a constant on x86.
David Srbecky [Wed, 3 Feb 2016 10:55:13 +0000 (10:55 +0000)]
Merge "Write DWARF strings inline and remove .debug_str section." am:
cbe3b55ac3
am:
b33f979d2f
* commit '
b33f979d2fc71b1b1ec2dcd55ed3ee39ac622b9e':
Write DWARF strings inline and remove .debug_str section.
Alexandre Rames [Wed, 3 Feb 2016 10:54:07 +0000 (10:54 +0000)]
Revert "Revert "Optimizing: double-negated bitwise operations simplifications""
This reverts commit
737c0a99dfbba306ec1f50e2adf66b5d97805af6 with fixes.
In the original patch, the new instruction could be inserted before
one of its inputs. A regression test is also added.
Change-Id: Ie49a17ac90ff048355d9cc944b468cd1b1914424
Nicolas Geoffray [Wed, 3 Feb 2016 10:52:02 +0000 (10:52 +0000)]
Merge "Assume fp operations can also take a constant on x86."
am:
371d75ef9e
* commit '
371d75ef9e478ccd54e43e727e48ff5c4918e55e':
Assume fp operations can also take a constant on x86.
David Srbecky [Wed, 3 Feb 2016 10:51:45 +0000 (10:51 +0000)]
Merge "Write DWARF strings inline and remove .debug_str section."
am:
cbe3b55ac3
* commit '
cbe3b55ac3c34c9f6f3b7f0ddd86f9b88243547d':
Write DWARF strings inline and remove .debug_str section.
Vladimir Marko [Wed, 3 Feb 2016 10:51:15 +0000 (10:51 +0000)]
Merge "ART: Fix rounding up in DexCacheArraysLayout constructor."
David Srbecky [Wed, 3 Feb 2016 10:48:00 +0000 (10:48 +0000)]
Merge "Share DWARF .debug_abbrev sections." am:
edd3a4b6c2
am:
22ae17244a
* commit '
22ae17244afbc0481a960199aa223189855f03a3':
Share DWARF .debug_abbrev sections.
Nicolas Geoffray [Wed, 3 Feb 2016 10:44:56 +0000 (10:44 +0000)]
Merge "Assume fp operations can also take a constant on x86."
David Srbecky [Wed, 3 Feb 2016 10:44:10 +0000 (10:44 +0000)]
Merge "Share DWARF .debug_abbrev sections."
am:
edd3a4b6c2
* commit '
edd3a4b6c222c9bc9ab84ffc10b374ccc6b647ea':
Share DWARF .debug_abbrev sections.
David Srbecky [Wed, 3 Feb 2016 10:43:03 +0000 (10:43 +0000)]
Merge "Write DWARF strings inline and remove .debug_str section."
David Srbecky [Mon, 1 Feb 2016 15:37:32 +0000 (15:37 +0000)]
Write DWARF strings inline and remove .debug_str section.
This means we no longer de-duplicate strings. Contra-intuitively this
saves space since removal of the indirection (4 bytes per string)
outweights the saving that we had from removal of duplicated strings.
The removal of buffering and deduplication also speeds up the processing.
Change-Id: Iee559094ed6180363e1665fbc79493e624b63435
David Srbecky [Wed, 3 Feb 2016 10:39:42 +0000 (10:39 +0000)]
Merge "Share DWARF .debug_abbrev sections."
David Srbecky [Fri, 29 Jan 2016 18:59:56 +0000 (18:59 +0000)]
Share DWARF .debug_abbrev sections.
Restructure the code so that all compilation units share the same
.debug_abbrev sections. This deduplicates many of the abbrevs.
Change-Id: I7da07a8c850871786df52674183c16d574684729
Nicolas Geoffray [Wed, 3 Feb 2016 10:13:41 +0000 (10:13 +0000)]
Assume fp operations can also take a constant on x86.
Because irreducible loops disable the constant pool optimization
on x86, we need to handle cases where a fp operation gets one.
Change-Id: I43387f31aa2589d02112953baa62fd0994d0a6d7
David Brazdil [Wed, 3 Feb 2016 10:07:58 +0000 (10:07 +0000)]
Merge "ART: Enable multi-level instruction inlining" am:
99e8e0b968
am:
c0fd184d9e
* commit '
c0fd184d9ed9da9f4a194d24e9bbddd6b25537e3':
ART: Enable multi-level instruction inlining
David Brazdil [Wed, 3 Feb 2016 10:06:02 +0000 (10:06 +0000)]
Merge "ART: Enable multi-level instruction inlining"
am:
99e8e0b968
* commit '
99e8e0b968e31b3757e329de560886b5aa7d6a13':
ART: Enable multi-level instruction inlining
David Brazdil [Wed, 3 Feb 2016 10:00:20 +0000 (10:00 +0000)]
Merge "ART: Enable multi-level instruction inlining"
David Brazdil [Tue, 2 Feb 2016 16:50:46 +0000 (16:50 +0000)]
ART: Enable multi-level instruction inlining
Change-Id: I4b4c927d7b1598dc197793c25185fb079dec7fe1
Mingyao Yang [Wed, 3 Feb 2016 07:26:53 +0000 (07:26 +0000)]
Merge "Handle HSelect in LSE." am:
b72923dd4d
am:
d0585a11bc
* commit '
d0585a11bc54a8deb83d62b82f9d24e959e0d31c':
Handle HSelect in LSE.
Mingyao Yang [Wed, 3 Feb 2016 07:24:57 +0000 (07:24 +0000)]
Merge "Handle HSelect in LSE."
am:
b72923dd4d
* commit '
b72923dd4d6e1636163047c960395ed9879e31fc':
Handle HSelect in LSE.
Mingyao Yang [Wed, 3 Feb 2016 07:21:05 +0000 (07:21 +0000)]
Merge "Handle HSelect in LSE."
Mingyao Yang [Wed, 3 Feb 2016 04:10:32 +0000 (20:10 -0800)]
Handle HSelect in LSE.
HSelect essentially creates an alias which breaks the singleton
assumption. Need to handle the case in singleton detection.
Bug:
26922558
Change-Id: I259deefe16e1e16c08179a10369cfe5ae23ae155
Mathieu Chartier [Wed, 3 Feb 2016 03:10:48 +0000 (03:10 +0000)]
Merge "Prevent crashes if boot images fail to load" am:
81e01d72ab
am:
6630bd773f
* commit '
6630bd773f90569b9fedd0da57434091f4cb66f7':
Prevent crashes if boot images fail to load
Mathieu Chartier [Wed, 3 Feb 2016 03:08:22 +0000 (03:08 +0000)]
Merge "Prevent crashes if boot images fail to load"
am:
81e01d72ab
* commit '
81e01d72abfe3136554cdaa354be683e2cb636af':
Prevent crashes if boot images fail to load
Mathieu Chartier [Wed, 3 Feb 2016 03:02:54 +0000 (03:02 +0000)]
Merge "Prevent crashes if boot images fail to load"
Mathieu Chartier [Wed, 3 Feb 2016 01:24:39 +0000 (17:24 -0800)]
Prevent crashes if boot images fail to load
We now reset the requested_alloc_space_begin so that there are no gaps
between any boot images and the non moving space.
Also clear boot_image_spaces so that ClassLinker::InitFromBootImage is
not called.
Finally, delete image spaces so that the maps and oat files are
unmapped.
Bug:
26913820
(cherry picked from commit
1e5ff87e774fdbd46efb1d2f61b1b2ab80145a19)
Change-Id: Ia31937f29ef217eac083165dfff37cd068fbd32b
Mathieu Chartier [Wed, 3 Feb 2016 01:24:39 +0000 (17:24 -0800)]
Prevent crashes if boot images fail to load
We now reset the requested_alloc_space_begin so that there are no gaps
between any boot images and the non moving space.
Also clear boot_image_spaces so that ClassLinker::InitFromBootImage is
not called.
Finally, delete image spaces so that the maps and oat files are
unmapped.
Bug:
26913820
Change-Id: If5058a214456bd123163ae064a0c66d6a77d6309
Mathieu Chartier [Wed, 3 Feb 2016 00:26:57 +0000 (00:26 +0000)]
Merge "Fix updating string dex cache array for no class table case" am:
88df4892c8
am:
10e458a67e
* commit '
10e458a67e0b06449e1922b979ce82927ba1bab9':
Fix updating string dex cache array for no class table case
Mathieu Chartier [Wed, 3 Feb 2016 00:24:07 +0000 (00:24 +0000)]
Merge "Fix updating string dex cache array for no class table case"
am:
88df4892c8
* commit '
88df4892c8b48de3019fd48c2ea2f49cf8eed098':
Fix updating string dex cache array for no class table case
Mathieu Chartier [Wed, 3 Feb 2016 00:18:57 +0000 (00:18 +0000)]
Merge "Fix remaining read barrier issues in image relocation" am:
12d0e0e3d8
am:
a3a7582055
* commit '
a3a7582055bc2a0083752ae1ea24f8ae95856e3e':
Fix remaining read barrier issues in image relocation
Mathieu Chartier [Wed, 3 Feb 2016 00:18:12 +0000 (00:18 +0000)]
Merge "Fix updating string dex cache array for no class table case"
Mathieu Chartier [Tue, 2 Feb 2016 18:09:58 +0000 (10:09 -0800)]
Fix updating string dex cache array for no class table case
The issue was that array classes do not have a dex cache. Also removed
some unnecessary mutables.
Bug:
22858531
Change-Id: I2bc45f019e064b6e562c8f158cc2ac8c0e513afd
Mathieu Chartier [Wed, 3 Feb 2016 00:16:17 +0000 (00:16 +0000)]
Merge "Fix remaining read barrier issues in image relocation"
am:
12d0e0e3d8
* commit '
12d0e0e3d87a6f73618d6ceeeea8533b06c44643':
Fix remaining read barrier issues in image relocation
Mathieu Chartier [Wed, 3 Feb 2016 00:08:44 +0000 (00:08 +0000)]
Merge "Fix remaining read barrier issues in image relocation"
Mathieu Chartier [Tue, 2 Feb 2016 04:15:11 +0000 (20:15 -0800)]
Fix remaining read barrier issues in image relocation
Added a way to disallow read barriers, this makes it easy to find
the issues.
Bug:
26786304
Change-Id: I7ebb50832686d03e096a979aae9741239371683f
Hans Boehm [Tue, 2 Feb 2016 23:18:54 +0000 (23:18 +0000)]
Merge "Rosalloc fast path in assembly for MIPS64" am:
b328291eff
am:
cf54059ddf
* commit '
cf54059ddf0f6adbdf1169f5860bc56a84015363':
Rosalloc fast path in assembly for MIPS64
Hans Boehm [Tue, 2 Feb 2016 23:16:28 +0000 (23:16 +0000)]
Merge "Rosalloc fast path in assembly for MIPS64"
am:
b328291eff
* commit '
b328291eff12b5a44b026962c17befcf3170c37b':
Rosalloc fast path in assembly for MIPS64
Richard Uhler [Tue, 2 Feb 2016 23:16:28 +0000 (23:16 +0000)]
Merge "Fix DCHECK compilation error." am:
2f0f5ffcfc
am:
a71313dba2
* commit '
a71313dba22d27d31008b90357e76e9916d10bd8':
Fix DCHECK compilation error.
Richard Uhler [Tue, 2 Feb 2016 23:14:08 +0000 (23:14 +0000)]
Merge "Fix DCHECK compilation error."
am:
2f0f5ffcfc
* commit '
2f0f5ffcfcbe05d0fa20592294e6a12959e3dada':
Fix DCHECK compilation error.
Hans Boehm [Tue, 2 Feb 2016 23:11:14 +0000 (23:11 +0000)]
Merge "Rosalloc fast path in assembly for MIPS64"
Richard Uhler [Tue, 2 Feb 2016 23:08:12 +0000 (23:08 +0000)]
Merge "Fix DCHECK compilation error."