OSDN Git Service
Mathieu Chartier [Wed, 6 Apr 2016 18:37:30 +0000 (18:37 +0000)]
Merge "Change RequiresConstructorBarrier default to yes" into nyc-dev
am:
d42c845
* commit '
d42c845ac0629c7b8c4d75233fa3df7b8844edec':
Change RequiresConstructorBarrier default to yes
Change-Id: Ie8350448d65aaf1fc4735c7ac30514d908f2d3a1
David Srbecky [Wed, 6 Apr 2016 18:34:45 +0000 (18:34 +0000)]
Merge "Fix thumb bit in the oatdump symbolizer." into nyc-dev
am:
07b2ad2
* commit '
07b2ad2b9d5002609adbdb2478e11ae86aaaabff':
Fix thumb bit in the oatdump symbolizer.
Change-Id: Iac9091db5ff0a5eb2c8d3650c0be90942b57f355
Mathieu Chartier [Wed, 6 Apr 2016 18:32:33 +0000 (18:32 +0000)]
Merge "Change RequiresConstructorBarrier default to yes" into nyc-dev
David Srbecky [Wed, 6 Apr 2016 18:27:31 +0000 (18:27 +0000)]
Merge "Fix thumb bit in the oatdump symbolizer." into nyc-dev
Mathieu Chartier [Wed, 6 Apr 2016 17:47:45 +0000 (10:47 -0700)]
Change RequiresConstructorBarrier default to yes
Previously it defaulted to false, this caused incorrect dex2dex if
the resolution pass was not run.
TODO: Re-enable the no barrier for no resolution case to improve
interpreter performance slightly.
Bug:
28005874
Change-Id: I6b2e5078e5a0d76317e5486cd5e4f04d995e7b56
Yi Kong [Wed, 6 Apr 2016 17:16:41 +0000 (17:16 +0000)]
Merge "Fix and re-enable compiler_driver_test" into nyc-dev
am:
96d4ff8
* commit '
96d4ff8d96da8949c98691953f4961fb9fd8f0d1':
Fix and re-enable compiler_driver_test
Change-Id: I97780950b5943cbdc5e0ffca88802d1b08f48628
Mathieu Chartier [Wed, 6 Apr 2016 17:16:41 +0000 (17:16 +0000)]
ART: Handle OOM in stack overflow
am:
cee1321
* commit '
cee1321190401800504e42a9ccfe5e681d6be119':
ART: Handle OOM in stack overflow
Change-Id: I34a795fc701af7b08225b40ec3153b7e9951edf5
Yi Kong [Wed, 6 Apr 2016 17:11:01 +0000 (17:11 +0000)]
Merge "Fix and re-enable compiler_driver_test" am:
0fb09f7
am:
7acef76
* commit '
7acef76ca2bc6a2b64a7059097b15f8ef7b0ff7e':
Fix and re-enable compiler_driver_test
Change-Id: I570566b14ebba9f799029841c4780148d2f87486
Yi Kong [Wed, 6 Apr 2016 17:09:34 +0000 (17:09 +0000)]
Merge "Fix and re-enable compiler_driver_test" into nyc-dev
Yi Kong [Wed, 6 Apr 2016 17:07:54 +0000 (17:07 +0000)]
Merge "Fix and re-enable compiler_driver_test"
am:
0fb09f7
* commit '
0fb09f7a441a2858c4724198f1ef74d9235be044':
Fix and re-enable compiler_driver_test
Change-Id: Ie4455edb68b32b13301d2a1d845fe506c4a72784
Yi Kong [Mon, 4 Apr 2016 16:44:59 +0000 (17:44 +0100)]
Fix and re-enable compiler_driver_test
This reverts commit
6f58cb85328bed2f3ea246cce4080244544d7c2b.
The move to OpenJDK introduces new dependencies to compile these
methods, however we don't actually need them to run this test. Remove
them here to enable the test again.
Bug:
25836016
Change-Id: I75b12c48941fca6646142004accae8364e8c6dbc
(cherry picked from commit
5dcf19d402b4ea7023ced2afa8d615576fe2784f)
Mathieu Chartier [Wed, 6 Apr 2016 17:02:17 +0000 (17:02 +0000)]
Merge "ART: Handle OOM in stack overflow" am:
c28a0d7
am:
65512cb
* commit '
65512cb466e8a0f3822a4e686d7c876f745852ce':
ART: Handle OOM in stack overflow
Change-Id: I8ef863d10676ef220d847ce91230310a7f58c761
Mathieu Chartier [Wed, 6 Apr 2016 16:59:33 +0000 (16:59 +0000)]
Merge "ART: Handle OOM in stack overflow"
am:
c28a0d7
* commit '
c28a0d71d18e333b22b453128dc549a44634b1fa':
ART: Handle OOM in stack overflow
Change-Id: Ia922b8190ee4fcd34e7cbfc1248f1276a2498ff6
Mathieu Chartier [Wed, 6 Apr 2016 16:59:33 +0000 (16:59 +0000)]
Merge "Change hash set to use noexcept" into nyc-dev
am:
e4e3ae6
* commit '
e4e3ae671aa61ecd200ec7ac06a1d9fb9b4b0e2e':
Change hash set to use noexcept
Change-Id: I33d4a2a101613d5488c3f494c1f755c1ff794351
Yi Kong [Wed, 6 Apr 2016 16:59:02 +0000 (16:59 +0000)]
Merge "Fix and re-enable compiler_driver_test"
Mathieu Chartier [Mon, 4 Apr 2016 23:49:44 +0000 (16:49 -0700)]
ART: Handle OOM in stack overflow
When creating a stack overflow error, we must not allocate a
new out-of-memory error. Running its constructor will lead to
a nested exception.
Bug:
27663199
(cherry picked from commit
e8f3f03ce142d9cdb10a1bb6bbbb428d0e8b672f)
Change-Id: I96b9682c3eb6ad71140a062cb357d4334c7fdaa5
Mathieu Chartier [Wed, 6 Apr 2016 16:52:25 +0000 (16:52 +0000)]
Merge "Change hash set to use noexcept" into nyc-dev
Mathieu Chartier [Wed, 6 Apr 2016 16:51:48 +0000 (16:51 +0000)]
Merge "ART: Handle OOM in stack overflow"
Yi Kong [Mon, 4 Apr 2016 16:44:59 +0000 (17:44 +0100)]
Fix and re-enable compiler_driver_test
This reverts commit
6f58cb85328bed2f3ea246cce4080244544d7c2b.
The move to OpenJDK introduces new dependencies to compile these
methods, however we don't actually need them to run this test. Remove
them here to enable the test again.
Bug:
25836016
Change-Id: I75b12c48941fca6646142004accae8364e8c6dbc
Mathieu Chartier [Wed, 6 Apr 2016 02:13:37 +0000 (19:13 -0700)]
Change hash set to use noexcept
Otherwise it uses copy constructor instead of move constructor in
some cases (like std::vector).
Reduces shared dirty native by around 350k.
Bug:
27860101
Change-Id: I2ece57e81349316c2f8ba0a57bda6f342faf3f3b
Mathieu Chartier [Mon, 4 Apr 2016 23:49:44 +0000 (16:49 -0700)]
ART: Handle OOM in stack overflow
When creating a stack overflow error, we must not allocate a
new out-of-memory error. Running its constructor will lead to
a nested exception.
Bug:
27663199
Change-Id: I2a7b5b937730eeade22dce654cfc4ad903c5f040
Andreas Gampe [Wed, 6 Apr 2016 01:30:01 +0000 (01:30 +0000)]
Merge "ART: Add arraycopy(byte) to unstarted runtime" am:
5827507
am:
f4ee62b
* commit '
f4ee62b27592615abdc5ad6aba0ccbf2d46f9662':
ART: Add arraycopy(byte) to unstarted runtime
Change-Id: Ie3fac4ef0589b2bd91f50f83d6be967534140a86
Andreas Gampe [Wed, 6 Apr 2016 01:26:34 +0000 (01:26 +0000)]
Merge "ART: Add arraycopy(byte) to unstarted runtime"
am:
5827507
* commit '
5827507da8efdaf4536c70dfdc54407c28e37852':
ART: Add arraycopy(byte) to unstarted runtime
Change-Id: Ib3b727c1d717e83739943639dcb02c3885a17f85
Andreas Gampe [Wed, 6 Apr 2016 01:18:15 +0000 (01:18 +0000)]
Merge "ART: Add arraycopy(byte) to unstarted runtime"
Andreas Gampe [Tue, 5 Apr 2016 21:16:10 +0000 (14:16 -0700)]
ART: Add arraycopy(byte) to unstarted runtime
The byte-array version is now in use in libcore.
Allows to compile-time initialize:
* java.security.cert.X509CertSelector
* sun.security.pkcs.PKCS9Attribute
* sun.security.provider.certpath.AdaptableX509CertSelector
* sun.security.x509.AccessDescription
* sun.security.x509.AlgorithmId
* sun.security.x509.ExtendedKeyUsageExtension
* sun.security.x509.NetscapeCertTypeExtension
* sun.security.x509.OIDMap
* sun.security.x509.PKIXExtensions
Bug:
27265238
(cherry picked from commit
cc44581beacd61a633b02a1223d1bf6fea278f94)
Change-Id: If6b680a455809152c9bd7a679a8ab430936c46a1
Andreas Gampe [Tue, 5 Apr 2016 23:18:11 +0000 (23:18 +0000)]
Merge "ART: Add arraycopy(byte) to unstarted runtime" into nyc-dev
am:
53b21d0
* commit '
53b21d03e3ef7fe0c9594c024a4e98e561ab3032':
ART: Add arraycopy(byte) to unstarted runtime
Change-Id: I49d18725a37df414c8fb3e86638a98e6becaa09d
Andreas Gampe [Tue, 5 Apr 2016 23:11:13 +0000 (23:11 +0000)]
Merge "ART: Don\'t attempt write flock if not zygote" am:
224b7f3
am:
0ce4ac5
* commit '
0ce4ac5a1886315fd9da992bfeae82b595e75ae3':
ART: Don't attempt write flock if not zygote
Change-Id: I1f07cfdb56c91884b1f4a23cd1fc4277f713429b
Andreas Gampe [Tue, 5 Apr 2016 23:07:45 +0000 (23:07 +0000)]
Merge "ART: Don\'t attempt write flock if not zygote"
am:
224b7f3
* commit '
224b7f346d8e13ef7b19d72671d687cad34f63eb':
ART: Don't attempt write flock if not zygote
Change-Id: I2e3aacde20d96b7c2b5ace695185d005d8320784
Andreas Gampe [Tue, 5 Apr 2016 23:02:42 +0000 (23:02 +0000)]
Merge "ART: Don't attempt write flock if not zygote"
Andreas Gampe [Tue, 5 Apr 2016 23:02:11 +0000 (23:02 +0000)]
Merge "ART: Add arraycopy(byte) to unstarted runtime" into nyc-dev
Andreas Gampe [Tue, 5 Apr 2016 21:16:10 +0000 (14:16 -0700)]
ART: Add arraycopy(byte) to unstarted runtime
The byte-array version is now in use in libcore.
Allows to compile-time initialize:
* java.security.cert.X509CertSelector
* sun.security.pkcs.PKCS9Attribute
* sun.security.provider.certpath.AdaptableX509CertSelector
* sun.security.x509.AccessDescription
* sun.security.x509.AlgorithmId
* sun.security.x509.ExtendedKeyUsageExtension
* sun.security.x509.NetscapeCertTypeExtension
* sun.security.x509.OIDMap
* sun.security.x509.PKIXExtensions
Bug:
27265238
Change-Id: If6b680a455809152c9bd7a679a8ab430936c46a1
Andreas Gampe [Tue, 5 Apr 2016 21:16:00 +0000 (21:16 +0000)]
Merge "ART: Don\'t attempt write flock if not zygote" into nyc-dev
am:
41834dc
* commit '
41834dc226b4842eea3b296bc8acd22663ac3eb1':
ART: Don't attempt write flock if not zygote
Change-Id: Ib939ab67aeb083f1cb2e964a2d77b917ad0fe05a
Andreas Gampe [Tue, 5 Apr 2016 17:26:42 +0000 (10:26 -0700)]
ART: Don't attempt write flock if not zygote
When loading an image, don't attempt a RDWR flock if the process
is not the zygote. The lock will be rejected as the process does
not have permission to write the file.
Bug:
28011897
(cherry picked from commit
fff377b13469b8c84ce55ee20b10ca80a5a0813d)
Change-Id: I567934c4e9a9a13e9131711240e9ecfdd58b69f7
Andreas Gampe [Tue, 5 Apr 2016 21:03:35 +0000 (21:03 +0000)]
Merge "ART: Don't attempt write flock if not zygote" into nyc-dev
Alex Light [Tue, 5 Apr 2016 20:07:05 +0000 (20:07 +0000)]
Fix issued with non-public interface methods.
am:
565bc96
* commit '
565bc96291623bf617aef40739247b224188fd16':
Fix issued with non-public interface methods.
Change-Id: I1d6965fee2142d4ece6053a1926362a7ec548a96
Alex Light [Thu, 31 Mar 2016 17:03:07 +0000 (10:03 -0700)]
Fix issued with non-public interface methods.
Some APK's ship with dex files containing non-public interface
methods. These would cause crashes on newer versions of ART due to
stricter verification of dex files. Make ART emit a warning but allow
this behavior.
Bug:
27928832
(cherry picked from commit
d7c10c237bf2631630fac7982c3f374b1a27ed01)
Change-Id: Ia3689ee091aa154fb5954b1f6dd50c489128acce
Alex Light [Tue, 5 Apr 2016 18:10:06 +0000 (18:10 +0000)]
Merge "Fix issued with non-public interface methods." am:
31b66aa
am:
6c3ce7a
* commit '
6c3ce7a7aca25efb0cb2e9b5ea29b82a014e050e':
Fix issued with non-public interface methods.
Change-Id: I27eaac567e296e4e940b2002725bf95a469edecf
Alex Light [Tue, 5 Apr 2016 18:00:55 +0000 (18:00 +0000)]
Merge "Fix issued with non-public interface methods."
am:
31b66aa
* commit '
31b66aa845d7294846e549da54750e4d8fd24822':
Fix issued with non-public interface methods.
Change-Id: Ieb47d07d1764e6942022edc510b7e1d94206d7b1
Andreas Gampe [Tue, 5 Apr 2016 17:26:42 +0000 (10:26 -0700)]
ART: Don't attempt write flock if not zygote
When loading an image, don't attempt a RDWR flock if the process
is not the zygote. The lock will be rejected as the process does
not have permission to write the file.
Bug:
28011897
Change-Id: I567934c4e9a9a13e9131711240e9ecfdd58b69f7
Alex Light [Tue, 5 Apr 2016 17:49:22 +0000 (17:49 +0000)]
Merge "Fix issued with non-public interface methods."
Oleksiy Vyalov [Tue, 5 Apr 2016 17:35:05 +0000 (17:35 +0000)]
Merge "ART: Return native debuggable status of the app." into nyc-dev
am:
50e6f7c
* commit '
50e6f7ca6b071861d29a79736eb9e7a496b42c5b':
ART: Return native debuggable status of the app.
Change-Id: I9c2e4f425913d62154621088b3a136855d07f552
Narayan Kamath [Tue, 5 Apr 2016 17:35:04 +0000 (17:35 +0000)]
Merge changes I56b0a4dd,I85aa52cc into nyc-dev
am:
55338c9
* commit '
55338c9f2c7d5c154ec28891ef655ae1514e4102':
unstarted_runtime: Update references to decimal format classes.
unstarted_runtime: Add additional cutouts
Change-Id: I98ddc3fc7ac20f1522312b74f0f02c6f03980b59
David Srbecky [Thu, 31 Mar 2016 17:17:59 +0000 (18:17 +0100)]
Fix thumb bit in the oatdump symbolizer.
MethodDebugInfo expects code address without the bit set.
Therefore we need to clear it before passing it to the DWARF writer.
(cherry picked from commit
a1b4c5f562c67398e14756bd127ed806937ff35a)
Bug:
28017942
Change-Id: I37586b19f2a3fc95107abb6204a34e95a3816936
Oleksiy Vyalov [Tue, 5 Apr 2016 17:27:22 +0000 (17:27 +0000)]
Merge "ART: Return native debuggable status of the app." into nyc-dev
Narayan Kamath [Tue, 5 Apr 2016 17:21:00 +0000 (17:21 +0000)]
Merge changes I56b0a4dd,I85aa52cc into nyc-dev
* changes:
unstarted_runtime: Update references to decimal format classes.
unstarted_runtime: Add additional cutouts
Vladimir Marko [Tue, 5 Apr 2016 15:54:33 +0000 (15:54 +0000)]
Merge "Remove unnecessary TEMP_FAILURE_RETRY." am:
9a14710
am:
f13975b
* commit '
f13975bae017f45c68c617b5ed489547d889a147':
Remove unnecessary TEMP_FAILURE_RETRY.
Change-Id: Iac2eb4db4e502ad842346d95a71e945f9efe92b9
Vladimir Marko [Tue, 5 Apr 2016 15:51:33 +0000 (15:51 +0000)]
Merge "Remove unnecessary TEMP_FAILURE_RETRY."
am:
9a14710
* commit '
9a14710112d61e90412e54c3da83fc3f7849df8e':
Remove unnecessary TEMP_FAILURE_RETRY.
Change-Id: Ic4dc49bdf577a5084a6174269143ec980ea0b2ec
Vladimir Marko [Tue, 5 Apr 2016 15:43:16 +0000 (15:43 +0000)]
Merge "Remove unnecessary TEMP_FAILURE_RETRY."
Oleksiy Vyalov [Thu, 31 Mar 2016 03:27:00 +0000 (20:27 -0700)]
ART: Return native debuggable status of the app.
Bug:
27942453
Change-Id: I40820cfb1416d468331f9b6583f9e3809670f428
Roland Levillain [Tue, 5 Apr 2016 13:35:29 +0000 (13:35 +0000)]
Merge "Implement ARM64 support for SystemArrayCopy()" am:
96de6c3
am:
32ed4ab
* commit '
32ed4ab376742aafb6782e256d1ffd52bea46789':
Implement ARM64 support for SystemArrayCopy()
Change-Id: I29f67e21278e80ccede7e2ef9e6bede529ec5b80
donghui.bai [Tue, 5 Apr 2016 13:32:39 +0000 (13:32 +0000)]
Merge "Implement ARM64 support for SystemArrayCopy()"
am:
96de6c3
* commit '
96de6c36efd328b3c5a7e4bb8f32ab340cce3efe':
Implement ARM64 support for SystemArrayCopy()
Change-Id: I048881e8f60f6c1a51e572c32a8df9e2bd6a01b1
Roland Levillain [Tue, 5 Apr 2016 13:25:12 +0000 (13:25 +0000)]
Merge "Implement ARM64 support for SystemArrayCopy()"
Vladimir Marko [Tue, 5 Apr 2016 13:19:08 +0000 (14:19 +0100)]
Remove unnecessary TEMP_FAILURE_RETRY.
unlink, rmdir, rename and closedir do not generate EINTR.
Change-Id: Ia5daab3e19f7373d7c27cdb6a800351c86b5a4e5
Vladimir Marko [Tue, 5 Apr 2016 12:45:07 +0000 (12:45 +0000)]
Merge "Remove unused \'status\' variable" am:
274704f
am:
6dc319a
* commit '
6dc319a839103f339af56a07005169f21976b80e':
Remove unused 'status' variable
Change-Id: I26afebf2ebd4f177cd939703f9df9efe06304f5a
Goran Jakovljevic [Tue, 5 Apr 2016 12:41:46 +0000 (12:41 +0000)]
Merge "Remove unused \'status\' variable"
am:
274704f
* commit '
274704fd37ff65c65f229638d359186e33f4912b':
Remove unused 'status' variable
Change-Id: I3d07fbc5befdd25ad2a4a400383b73a9a7ab1d58
Vladimir Marko [Tue, 5 Apr 2016 12:36:16 +0000 (12:36 +0000)]
Merge "Remove unused 'status' variable"
Vladimir Marko [Tue, 5 Apr 2016 12:00:57 +0000 (12:00 +0000)]
Merge "Revert "Remove many `instrumentation` variables from goto interpreter."" am:
c2c9bcb
am:
bda7cb2
* commit '
bda7cb2d4a87e93ecbfe3eaf9f0e043a9fa32e33':
Revert "Remove many `instrumentation` variables from goto interpreter."
Change-Id: I5d85cbf55914c0cc4568382548d63671f3fa84d2
Vladimir Marko [Tue, 5 Apr 2016 11:58:12 +0000 (11:58 +0000)]
Merge "Revert "Remove many `instrumentation` variables from goto interpreter.""
am:
c2c9bcb
* commit '
c2c9bcb716cdfed2337a7715dd33667b3bb71fba':
Revert "Remove many `instrumentation` variables from goto interpreter."
Change-Id: Ia9d1f17ea824623d6949b6903f63d537dd134381
Vladimir Marko [Tue, 5 Apr 2016 11:52:23 +0000 (11:52 +0000)]
Merge "Revert "Remove many `instrumentation` variables from goto interpreter.""
Vladimir Marko [Tue, 5 Apr 2016 11:48:02 +0000 (11:48 +0000)]
Revert "Remove many `instrumentation` variables from goto interpreter."
This reverts commit
4cb22b4f6d0afbdf424369df99c6eb11999f2473.
Change-Id: I1d84965c2cde2ffc2ebdb46fb5251691ea12569b
Goran Jakovljevic [Tue, 5 Apr 2016 11:08:21 +0000 (13:08 +0200)]
Remove unused 'status' variable
GCC (mips32 Buildbot) is complaining about unused variable.
This is follow up change for
https://android-review.googlesource.com/#/c/212523/.
Change-Id: Id6ac2736d30f324f2cad68d8dabe409092f000ac
Vladimir Marko [Tue, 5 Apr 2016 09:32:50 +0000 (09:32 +0000)]
Merge "Clean up OatQuickMethodHeader after Quick removal." am:
75563e3
am:
20153e1
* commit '
20153e118f7301282416e04cc335a13c74d433ae':
Clean up OatQuickMethodHeader after Quick removal.
Change-Id: Ifa40daca0093e714c4cd6edee59ecd799582bbf8
Vladimir Marko [Tue, 5 Apr 2016 09:30:16 +0000 (09:30 +0000)]
Merge "Clean up OatQuickMethodHeader after Quick removal."
am:
75563e3
* commit '
75563e34a4e64a8e805e6810b13e07f1cafec137':
Clean up OatQuickMethodHeader after Quick removal.
Change-Id: I41575dd094edc1c1246672a34678665b668a8f36
Vladimir Marko [Tue, 5 Apr 2016 09:23:52 +0000 (09:23 +0000)]
Merge "Clean up OatQuickMethodHeader after Quick removal."
Aart Bik [Mon, 4 Apr 2016 22:18:53 +0000 (22:18 +0000)]
Merge "Move DCHECK into loop." am:
a07be75
am:
4f3e438
* commit '
4f3e4380f38e853c6806f0dc5a6623310d5f38a5':
Move DCHECK into loop.
Change-Id: I679433b42ae6e7a66305ede534014fc9df86523f
Aart Bik [Mon, 4 Apr 2016 22:16:24 +0000 (22:16 +0000)]
Merge "Move DCHECK into loop."
am:
a07be75
* commit '
a07be75830af60ce50aba357e8de066e849aa21c':
Move DCHECK into loop.
Change-Id: Ia7bab5ec9fec82fb1d693b06357643518dfa19d6
Aart Bik [Mon, 4 Apr 2016 22:08:30 +0000 (22:08 +0000)]
Merge "Move DCHECK into loop."
Alex Light [Thu, 31 Mar 2016 17:03:07 +0000 (10:03 -0700)]
Fix issued with non-public interface methods.
Some APK's ship with dex files containing non-public interface
methods. These would cause crashes on newer versions of ART due to
stricter verification of dex files. Make ART emit a warning but allow
this behavior.
Bug:
27928832
Change-Id: Ia3689ee091aa154fb5954b1f6dd50c489128acce
Alex Light [Mon, 4 Apr 2016 21:53:08 +0000 (21:53 +0000)]
Merge "Fix issue with verification check failure on erroneous classes." am:
03bea09
am:
053490c
* commit '
053490cedb8cb349cbcedbad652e7cf83c1b8a03':
Fix issue with verification check failure on erroneous classes.
Change-Id: If8df1134bcdd077bee4cf5285f470ef3a84fe8fc
Alex Light [Mon, 4 Apr 2016 21:50:41 +0000 (21:50 +0000)]
Merge "Fix issue with verification check failure on erroneous classes."
am:
03bea09
* commit '
03bea09898e81078e3d116f580e74d5b1911ea39':
Fix issue with verification check failure on erroneous classes.
Change-Id: I39a584f6c46653109617962661971872de08d7e8
Alex Light [Mon, 4 Apr 2016 21:46:30 +0000 (21:46 +0000)]
Merge "Fix issue with verification check failure on erroneous classes."
Andreas Gampe [Mon, 4 Apr 2016 21:40:50 +0000 (21:40 +0000)]
Merge "ART: Dump less maps" am:
23cb752
am:
51fc51e
* commit '
51fc51e4fb95f1911e4a52e95b0369feaf73ab19':
ART: Dump less maps
Change-Id: Ic4cd2ec698d79b65ef548335d8e64fca3ebe6876
Andreas Gampe [Mon, 4 Apr 2016 21:38:23 +0000 (21:38 +0000)]
Merge "ART: Dump less maps"
am:
23cb752
* commit '
23cb752adb33e77864b7d8f5bc5a1d3a08ab2ac2':
ART: Dump less maps
Change-Id: Iaff4f923a8f875a764f5a8dc7c122d01ad765205
Andreas Gampe [Mon, 4 Apr 2016 21:38:23 +0000 (21:38 +0000)]
Merge "ART: Dump less maps" into nyc-dev
am:
657887e
* commit '
657887ebcd26cf0eae7c40d8ea35bd33186903e7':
ART: Dump less maps
Change-Id: I2e702ca2db8d280af3413a38ddb780efa3d9b0e8
Andreas Gampe [Mon, 4 Apr 2016 21:24:59 +0000 (21:24 +0000)]
Merge "ART: Dump less maps"
Andreas Gampe [Sat, 2 Apr 2016 00:20:49 +0000 (17:20 -0700)]
ART: Dump less maps
Security has been tightened, so there are situations where we can't
load our files, and produce "log spam."
Bug:
27925454
(cherry picked from commit
dfd7b70bbab8157fb385e4a6d6e4b55ae2e4e892)
Change-Id: Ia8c76184ea5087d625cf52d4459f8a557eebfafe
Andreas Gampe [Mon, 4 Apr 2016 21:22:13 +0000 (21:22 +0000)]
Merge "ART: Dump less maps" into nyc-dev
Aart Bik [Mon, 4 Apr 2016 21:19:01 +0000 (14:19 -0700)]
Move DCHECK into loop.
Rationale:
Since pointer is non-null on loop entry, moving the check
into the while loop (rather than after) gives a more friendly
error message in debug mode when something goes wrong.
BUG=
27825731
BUG=
27627004
Change-Id: I2ea67b3ab6c4edc6815fea38a436e5c3c194e540
Alex Light [Mon, 4 Apr 2016 20:23:14 +0000 (13:23 -0700)]
Fix issue with verification check failure on erroneous classes.
Bug:
27924355
Change-Id: I7d680e7196aeb9e2e6ef54139634564e058174d7
Mathieu Chartier [Mon, 4 Apr 2016 18:53:05 +0000 (18:53 +0000)]
Merge "Mark array classes as verification attempted" am:
2746c68
am:
32deff1
* commit '
32deff171e4d0d1dfe8738c185d9edc7f2a35082':
Mark array classes as verification attempted
Change-Id: Ic4f5561ecd49b1d728101af5e25dfccd49915c23
Mathieu Chartier [Mon, 4 Apr 2016 18:50:12 +0000 (18:50 +0000)]
Merge "Mark array classes as verification attempted"
am:
2746c68
* commit '
2746c68840535294b1febc2224e81280f002909d':
Mark array classes as verification attempted
Change-Id: Ibfe84255283ee005f9317663fcd44fcffc525c5d
Mathieu Chartier [Mon, 4 Apr 2016 18:40:51 +0000 (18:40 +0000)]
Merge "Mark array classes as verification attempted"
Mathieu Chartier [Sat, 2 Apr 2016 00:33:31 +0000 (17:33 -0700)]
Mark array classes as verification attempted
We now initialize all array classes in the compiler driver. This in
turn will ensure they are marked verified in the image. This
prevents dirty pages in the image since we would otherwise set the
flags in the zygote.
On BusinessCard:
Reduces shared dirty from 636k -> 432k for boot.art, and dirty pages
from 183 to 132.
(cherry picked from commit
3b674098bef6eaf7d3fb731878293ef715fe1080)
Change-Id: If3093e4e3242e4ee3ea120abe5be7db028290260
Mathieu Chartier [Mon, 4 Apr 2016 18:27:07 +0000 (18:27 +0000)]
Mark array classes as verification attempted
am:
3b67409
* commit '
3b674098bef6eaf7d3fb731878293ef715fe1080':
Mark array classes as verification attempted
Change-Id: Ib367d6dffe2df3fe7abdf8e6e65d61d7de83baff
David Brazdil [Mon, 4 Apr 2016 17:59:04 +0000 (17:59 +0000)]
Merge "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"" am:
7d9a5b0
am:
4082dea
* commit '
4082deab827eb5c6cd4b8c6d10d494949d209a4f':
Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
Change-Id: Ifd13e4161873261b01aceb16321f72db0d315fa8
David Brazdil [Mon, 4 Apr 2016 17:56:46 +0000 (17:56 +0000)]
Merge "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""
am:
7d9a5b0
* commit '
7d9a5b0fbceef5806f059060d47533b9e699ec28':
Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
Change-Id: Ib027ac7dec02c175d50192f6b1ad15ed2fb19a28
Mathieu Chartier [Sat, 2 Apr 2016 00:33:31 +0000 (17:33 -0700)]
Mark array classes as verification attempted
We now initialize all array classes in the compiler driver. This in
turn will ensure they are marked verified in the image. This
prevents dirty pages in the image since we would otherwise set the
flags in the zygote.
On BusinessCard:
Reduces shared dirty from 636k -> 432k for boot.art, and dirty pages
from 183 to 132.
Bug:
27906566
Change-Id: I99fcaffe2cb7f0235a1a0845bebc44e2dc94cbf0
David Brazdil [Mon, 4 Apr 2016 17:48:02 +0000 (17:48 +0000)]
Merge "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""
David Brazdil [Mon, 4 Apr 2016 17:47:42 +0000 (17:47 +0000)]
Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
Bug:
27995065
This reverts commit
e3ff7b293be2a6791fe9d135d660c0cffe4bd73f.
Change-Id: I5363c7ce18f47fd422c15eed5423a345a57249d8
Roland Levillain [Mon, 4 Apr 2016 17:10:03 +0000 (17:10 +0000)]
Merge "Have Checker print lines of unmatched test cases." am:
75c221d
am:
4077036
* commit '
407703687ee9b402bf3e5d4e7e8c436d7a50123f':
Have Checker print lines of unmatched test cases.
Change-Id: I7eb9eee0bb318325ccf23452337c8c180e9a2271
Roland Levillain [Mon, 4 Apr 2016 17:06:31 +0000 (17:06 +0000)]
Merge "Have Checker print lines of unmatched test cases."
am:
75c221d
* commit '
75c221dcffab45e3c1e4ba8b8cd048c87497334f':
Have Checker print lines of unmatched test cases.
Change-Id: I37f42fa427a37dcddb077805f9eab316b759c71b
Roland Levillain [Mon, 4 Apr 2016 16:58:06 +0000 (16:58 +0000)]
Merge "Have Checker print lines of unmatched test cases."
Vladimir Marko [Thu, 31 Mar 2016 11:02:28 +0000 (12:02 +0100)]
Clean up OatQuickMethodHeader after Quick removal.
This reduces the size of the pre-header by 8 bytes, reducing
oat file size and mmapped .text section size. The memory
needed to store a CompiledMethod by dex2oat is also reduced,
for 32-bit dex2oat by 8B and for 64-bit dex2oat by 16B. The
aosp_flounder-userdebug 32-bit and 64-bit boot.oat are each
about 1.1MiB smaller.
Disable the broken StubTest.IMT, b/
27991555 .
Change-Id: I05fe45c28c8ffb7a0fa8b1117b969786748b1039
Roland Levillain [Mon, 4 Apr 2016 14:48:28 +0000 (14:48 +0000)]
Merge "Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper." am:
eb98c0d
am:
d7e95b2
* commit '
d7e95b201f633d7499948b7e36d84b649b65e69c':
Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper.
Change-Id: I208a1e2e10e9445ea94642d8f920e3a7a6113dcf
Roland Levillain [Mon, 4 Apr 2016 14:44:57 +0000 (14:44 +0000)]
Merge "Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper."
am:
eb98c0d
* commit '
eb98c0ded592cfca8187c744393c82efd1020b2a':
Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper.
Change-Id: I6129f9834e5d45975f63100f7e230e6f92dbf577
Roland Levillain [Mon, 4 Apr 2016 14:36:12 +0000 (14:36 +0000)]
Merge "Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper."
Roland Levillain [Mon, 4 Apr 2016 14:34:31 +0000 (15:34 +0100)]
Please Clang wrt stack frames in HInliner::TryBuildAndInlineHelper.
This change enables Clang to compile ART on MIPS64 without
complaining about stack frames larger than what
`-Wframe-larger-than` allows.
Change-Id: I72f424922d9cb3d01f7b8ba4e5cb9170b82870d9
Roland Levillain [Mon, 4 Apr 2016 13:56:36 +0000 (14:56 +0100)]
Have Checker print lines of unmatched test cases.
Change-Id: I8ea7eee4c29f23ad10fb4d49ca927fdde39c1ef9
David Srbecky [Mon, 4 Apr 2016 13:46:32 +0000 (13:46 +0000)]
Merge "Use bit-level packing for InlineInfo in stackmaps as well." am:
2f92ec8
am:
934b58d
* commit '
934b58d4f53490607e1a12a59f697c51c1797404':
Use bit-level packing for InlineInfo in stackmaps as well.
Change-Id: Id60a84511ceb94e3a9f0bb17464f0c75cef26a8c
David Srbecky [Mon, 4 Apr 2016 13:43:04 +0000 (13:43 +0000)]
Merge "Use bit-level packing for InlineInfo in stackmaps as well."
am:
2f92ec8
* commit '
2f92ec8a52faa4bc566af8fa34212f3e749e82c8':
Use bit-level packing for InlineInfo in stackmaps as well.
Change-Id: I548b78a3602f3aa9e9268bcd7188d683d153e6e3