OSDN Git Service
Andreas Gampe [Thu, 27 Aug 2015 03:47:18 +0000 (03:47 +0000)]
am
39ca1d88: (-s ours) am
a3cd834a: ART: Avoid soft- after hard-fail in verifier
* commit '
39ca1d88efe0e18cd80e77138dc8eb9ab552be2d':
Andreas Gampe [Thu, 27 Aug 2015 03:47:16 +0000 (03:47 +0000)]
am
9c9bd6eb: (-s ours) am
0d8b449e: am
dffdfb9e: Merge "ART: Avoid soft- after hard-fail in verifier"
* commit '
9c9bd6ebc743c33b7f354da44b5115951328f0d0':
Aart Bik [Thu, 27 Aug 2015 03:47:14 +0000 (03:47 +0000)]
am
2dadbed7: (-s ours) am
82f479f9: am
8e76556c: Merge "Make Art dexdump/list the real utilities."
* commit '
2dadbed747c0afa5aca137d4b88703cce5b1b4e2':
Andreas Gampe [Thu, 27 Aug 2015 03:47:12 +0000 (03:47 +0000)]
am
c615f3f0: (-s ours) am
fd6fe84c: Merge "ART: Release inputs in Long.reverse intrinsic in x86" into mnc-dev
* commit '
c615f3f0dde36793c1e01bb84ba7881a760fd9a3':
David Brazdil [Thu, 27 Aug 2015 03:47:10 +0000 (03:47 +0000)]
am
e076d76d: (-s ours) am
90b8d4f1: am
486728d8: Merge "Address small comments in HGraphBuilder"
* commit '
e076d76db10c2dfc06302484d71ec5ccb7010e06':
David Brazdil [Thu, 27 Aug 2015 03:47:08 +0000 (03:47 +0000)]
am
595908e8: (-s ours) am
ad7eb809: am
4880fd56: Merge "Revert "Revert "ART: Ignore try blocks with no throwing instructions"""
* commit '
595908e86e830c1b3a860bff8a141c7b98318987':
Aart Bik [Thu, 27 Aug 2015 03:47:06 +0000 (03:47 +0000)]
am
3ad95fe4: (-s ours) am
6bfafebd: am
d9acfe21: Merge "Migrated dexlist from Dalvik (libdex) into Art (libart)"
* commit '
3ad95fe470424b1c1a19649761f9a0cd46342f15':
David Brazdil [Thu, 27 Aug 2015 03:47:04 +0000 (03:47 +0000)]
am
c64357f1: (-s ours) am
4f228ec5: am
98bea9fd: Merge "Revert "ART: Ignore try blocks with no throwing instructions""
* commit '
c64357f17186212ec955911c0a5fcb3dd20d9440':
Calin Juravle [Thu, 27 Aug 2015 03:47:02 +0000 (03:47 +0000)]
am
835950ac: (-s ours) am
586333a6: am
761f281e: Merge "Revert "Use the object class as top in reference type propagation""
* commit '
835950ac653a1e0d24b86fc14f4cdbe5d238ff4f':
Andreas Gampe [Thu, 27 Aug 2015 03:47:00 +0000 (03:47 +0000)]
am
04294b50: (-s ours) am
ee1755a4: am
c7d5ae36: Merge "ART: Release inputs in Long.reverse intrinsic in x86"
* commit '
04294b50e56e4b11c6052af193da9fa2bc3d7d8c':
David Brazdil [Thu, 27 Aug 2015 03:46:57 +0000 (03:46 +0000)]
am
c171f894: (-s ours) am
1b1872ec: am
7d5e4d05: Merge "ART: Ignore try blocks with no throwing instructions"
* commit '
c171f89443940b263933f7e5f3899e39ca2aa6da':
Calin Juravle [Thu, 27 Aug 2015 03:46:55 +0000 (03:46 +0000)]
am
c7822346: (-s ours) am
06e72c81: am
c7432f3b: Merge "Use the object class as top in reference type propagation"
* commit '
c782234650837052ed4a683ec4117bbff554a1b2':
Nicolas Geoffray [Thu, 27 Aug 2015 03:46:53 +0000 (03:46 +0000)]
am
ae2e7b85: (-s ours) am
7181746c: am
c21dc873: Merge "Fix oatdump after ArtMethod change."
* commit '
ae2e7b859193217110aca8bb8cebeebad3a2e36c':
Nicolas Geoffray [Thu, 27 Aug 2015 03:46:51 +0000 (03:46 +0000)]
am
ca847ef6: (-s ours) am
e0e1b07c: am
30502f1f: Merge "Revert "Revert "Remove interpreter entrypoint in ArtMethod."""
* commit '
ca847ef619923fee4979e357c1c4f985d5beb248':
David Srbecky [Thu, 27 Aug 2015 03:46:49 +0000 (03:46 +0000)]
am
177a9dae: (-s ours) am
ba34973f: am
a4e43032: Merge "Accept 0xFFFFFFFF as dex debug info offset."
* commit '
177a9daedf87c752c610026eb10211572b45cca2':
Roland Levillain [Thu, 27 Aug 2015 03:46:47 +0000 (03:46 +0000)]
am
a70c28cd: (-s ours) am
3fc926d5: am
3e18a895: Merge "Fuse long and FP compare & condition on x86/x86-64 in Optimizing."
* commit '
a70c28cdffe1ae9e0fe89aed51f45a2939519687':
Nicolas Geoffray [Thu, 27 Aug 2015 03:46:45 +0000 (03:46 +0000)]
am
945b7116: (-s ours) am
13d2e68d: am
569e81e5: Merge "Revert "Remove interpreter entrypoint in ArtMethod.""
* commit '
945b7116280402b04977f1faaaf31d7b6ac2b669':
Nicolas Geoffray [Thu, 27 Aug 2015 03:46:43 +0000 (03:46 +0000)]
am
3658b950: (-s ours) am
ea1f6cc4: am
d5bd4fdd: Merge "Remove interpreter entrypoint in ArtMethod."
* commit '
3658b950be26041c8a9f0cb139986a3d3eb76ff9':
Andreas Gampe [Thu, 27 Aug 2015 03:46:41 +0000 (03:46 +0000)]
am
af9dbd35: (-s ours) am
db05e310: ART: Fix opsize in LoadArgDirect
* commit '
af9dbd35a84ec946bdd48836d14b1f9ae7da6f6f':
Aart Bik [Thu, 27 Aug 2015 03:46:39 +0000 (03:46 +0000)]
am
3b6366a6: (-s ours) am
9431cf57: am
a100332e: Merge "Build rule for dexdump regression test on host."
* commit '
3b6366a6a8f5a31ca42cf3a7976984edaca2f41b':
Andreas Gampe [Thu, 27 Aug 2015 03:46:37 +0000 (03:46 +0000)]
am
85fc221d: (-s ours) am
bb83481b: am
53ed3c5f: Merge "ART: Fix opsize in LoadArgDirect"
* commit '
85fc221dfd7bd62a5425b5995442ba5eb4de2f13':
Nicolas Geoffray [Thu, 27 Aug 2015 03:46:30 +0000 (03:46 +0000)]
am
d1f9f4e5: (-s ours) am
c50df772: am
ee35ff80: Merge "Improve code generation for ARM64 VisitArrayGet/Set."
* commit '
d1f9f4e56d106606905522762eadffec7e533440':
Nicolas Geoffray [Thu, 27 Aug 2015 03:46:19 +0000 (03:46 +0000)]
am
c171f6b0: (-s ours) am
29cd8a89: am
00dec6a9: Merge "Make dexdump2 compile for 64bit devices."
* commit '
c171f6b0ca3f4a9106e30636535ab53c292e94a2':
Roland Levillain [Thu, 27 Aug 2015 03:46:08 +0000 (03:46 +0000)]
am
15a1fa6c: (-s ours) am
6848874d: am
399426d9: Merge "Added next condition check to branch instruction"
* commit '
15a1fa6cebf96db2290d473400ecb2d794ad44bc':
Roland Levillain [Thu, 27 Aug 2015 03:45:49 +0000 (03:45 +0000)]
am
2242a242: (-s ours) am
724ff5bb: am
4e869c81: Merge "Make oatdump work with .art files and code generated by Optimizing."
* commit '
2242a2422cb4256aa57a7b3e8ddbf9790b5f3eb3':
Evgenii Stepanov [Thu, 27 Aug 2015 03:45:39 +0000 (03:45 +0000)]
am
59a22dda: (-s ours) am
2d2e39ab: am
bb5965c8: Merge "Disable sanitization of dex2oat on device."
* commit '
59a22dda3c936692e47aa47febd6d35b830ac854':
Aart Bik [Thu, 27 Aug 2015 03:44:15 +0000 (03:44 +0000)]
am
ffe0f37e: (-s ours) am
99e5ebf1: am
288b3001: Merge "List dependence of dexdump gtest on dexdump binary."
* commit '
ffe0f37eead57c5cc787c87ea885660f60a9ed6b':
Aart Bik [Thu, 27 Aug 2015 03:42:06 +0000 (03:42 +0000)]
am
84cb5989: (-s ours) am
016e2126: am
e7ea17b7: Merge "Migrated dexdump from Dalvik (libdex) into Art (libart)"
* commit '
84cb5989b9fa2a32545a84fd09b15dd5031a6d46':
Nicolas Geoffray [Thu, 27 Aug 2015 03:41:08 +0000 (03:41 +0000)]
am
657d1bd1: (-s ours) am
cd58c84d: am
d4e2738f: Merge "Revert "Revert "Fix LSRA bug with explicit register temporaries"""
* commit '
657d1bd147d492cbd4c2fdb498f6668f2a0723e8':
Andreas Gampe [Thu, 27 Aug 2015 03:41:01 +0000 (03:41 +0000)]
am
5672c991: (-s ours) am
6c626bb9: am
7fb6ddb8: Merge "ART: Check switch and array data better in the verifier"
* commit '
5672c9914aafb3f0e9392e06e4707ae9d7614424':
Andreas Gampe [Thu, 27 Aug 2015 03:40:55 +0000 (03:40 +0000)]
am
508c2c95: (-s ours) am
24748416: am
a3c31dfd: Merge "ART: Unlink old file in OS::CreateEmptyFile"
* commit '
508c2c95e77a526ac39187b2690dc3d697958727':
Andreas Gampe [Thu, 27 Aug 2015 03:40:51 +0000 (03:40 +0000)]
am
eda8d63a: (-s ours) am
c9f7e38d: am
d5c5ea39: Merge "Revert "ART: Unlink target oat file before compiling""
* commit '
eda8d63a80dd098873e83f0e8cb13db5c875ea92':
Calin Juravle [Thu, 27 Aug 2015 03:40:45 +0000 (03:40 +0000)]
am
d9c8c4f9: (-s ours) am
577fdc4a: am
f7aa6c05: Merge "Revert "Fix LSRA bug with explicit register temporaries""
* commit '
d9c8c4f99f3afdb14bd96f7493c383f77f0ae7bb':
Nicolas Geoffray [Thu, 27 Aug 2015 03:40:37 +0000 (03:40 +0000)]
am
9f34dc2a: (-s ours) am
11d00545: am
16d6d0ef: Merge "Fix LSRA bug with explicit register temporaries"
* commit '
9f34dc2a83f86a6aa4f335744abffe35a3afe8a9':
David Brazdil [Thu, 27 Aug 2015 03:40:25 +0000 (03:40 +0000)]
am
d550c32f: (-s ours) am
b426df50: am
51f38e3a: Merge "ART: Fix graph for switch leaving a try block"
* commit '
d550c32fcc52e66705b5e9130063d78acab81f71':
Narayan Kamath [Thu, 27 Aug 2015 03:39:59 +0000 (03:39 +0000)]
am
1ddce9c6: (-s ours) am
d7265b9c: am
b2409d91: Merge "Supress OsTest#test_xattr on the bots."
* commit '
1ddce9c62ec771d780712f529e3ec6d6492c743e':
Douglas Leung [Thu, 27 Aug 2015 03:39:30 +0000 (03:39 +0000)]
am
77adcff3: (-s ours) am
ccbbda2b: Add implicit null pointer and stack overflow checks for Mips.
* commit '
77adcff35cea7bbc52b4220a1b34cae45955b2b6':
Mathieu Chartier [Wed, 26 Aug 2015 21:11:19 +0000 (21:11 +0000)]
am
8cd4797f: am
5093d3be: Merge "Add a missing reader barrier in entrypoint stub"
* commit '
8cd4797f02b7cbf2b4b721be9627058bbfaab2cd':
Add a missing reader barrier in entrypoint stub
Mathieu Chartier [Wed, 26 Aug 2015 21:02:56 +0000 (21:02 +0000)]
am
5093d3be: Merge "Add a missing reader barrier in entrypoint stub"
* commit '
5093d3becc16b889807269ca5ef39b31fa97f105':
Add a missing reader barrier in entrypoint stub
Mathieu Chartier [Wed, 26 Aug 2015 20:59:00 +0000 (20:59 +0000)]
Merge "Add a missing reader barrier in entrypoint stub"
Vladimir Marko [Wed, 26 Aug 2015 18:18:20 +0000 (18:18 +0000)]
am
2c872499: am
e05b8b59: Merge "ART: Include zero-padding in String::SizeOf()."
* commit '
2c8724993e12999a6e959ea055eabbb3f715c9cb':
ART: Include zero-padding in String::SizeOf().
Mathieu Chartier [Wed, 26 Aug 2015 18:18:18 +0000 (18:18 +0000)]
am
1417e96f: am
47269416: Merge "Address some comments for class flags"
* commit '
1417e96f87871646b692e0eb8fc662dd9c4cbc9e':
Address some comments for class flags
Aart Bik [Wed, 26 Aug 2015 18:13:04 +0000 (18:13 +0000)]
am
de90542f: am
fb32aca0: Merge "Induction variable analysis (with unit tests)."
* commit '
de90542fc55ed3bc7d1d2c91121863517a75d254':
Induction variable analysis (with unit tests).
Vladimir Marko [Wed, 26 Aug 2015 18:05:41 +0000 (18:05 +0000)]
am
e05b8b59: Merge "ART: Include zero-padding in String::SizeOf()."
* commit '
e05b8b592ceaab2cd3639785f31763395371ad23':
ART: Include zero-padding in String::SizeOf().
Mathieu Chartier [Wed, 26 Aug 2015 18:01:58 +0000 (18:01 +0000)]
am
47269416: Merge "Address some comments for class flags"
* commit '
4726941669584b30087ae7b4d142db4777d27015':
Address some comments for class flags
Vladimir Marko [Wed, 26 Aug 2015 18:01:10 +0000 (18:01 +0000)]
Merge "ART: Include zero-padding in String::SizeOf()."
Mathieu Chartier [Wed, 26 Aug 2015 17:56:25 +0000 (17:56 +0000)]
Merge "Address some comments for class flags"
Vladimir Marko [Wed, 26 Aug 2015 17:12:56 +0000 (18:12 +0100)]
ART: Include zero-padding in String::SizeOf().
String.equals() intrinsics depend on the zero-padding
but the zygote compaction didn't preserve it.
Bug:
23528461
Change-Id: I57286a31ea2491c7365045d6c69d7ed2e7a5773a
Aart Bik [Wed, 26 Aug 2015 17:38:36 +0000 (17:38 +0000)]
am
fb32aca0: Merge "Induction variable analysis (with unit tests)."
* commit '
fb32aca04cc1b5f5e8325d79664882f25f253881':
Induction variable analysis (with unit tests).
Aart Bik [Wed, 26 Aug 2015 17:32:28 +0000 (17:32 +0000)]
Merge "Induction variable analysis (with unit tests)."
Aart Bik [Thu, 30 Jul 2015 19:14:31 +0000 (12:14 -0700)]
Induction variable analysis (with unit tests).
Rationale:
Induction variable analysis forms the basis of a wide
variety of compiler optimizations. This implementation
finds induction variables using the elegant SSA-based
algorithm defined by [Gerlek et al.].
Change-Id: I79b8dce33ffb8b283c179699a8dff5bd196f75b2
Roland Levillain [Wed, 26 Aug 2015 15:47:51 +0000 (15:47 +0000)]
am
0fdb8b99: am
574d7559: Merge "Minor changes to art::arm::Thumb2Assembler::StoreToOffset."
* commit '
0fdb8b99e0581ab49147856971771b22152e79f8':
Minor changes to art::arm::Thumb2Assembler::StoreToOffset.
Roland Levillain [Wed, 26 Aug 2015 15:29:21 +0000 (15:29 +0000)]
am
574d7559: Merge "Minor changes to art::arm::Thumb2Assembler::StoreToOffset."
* commit '
574d75597013cb12a961c0d4365d1618d8ef6977':
Minor changes to art::arm::Thumb2Assembler::StoreToOffset.
Roland Levillain [Wed, 26 Aug 2015 15:23:17 +0000 (15:23 +0000)]
Merge "Minor changes to art::arm::Thumb2Assembler::StoreToOffset."
Sebastien Hertz [Wed, 26 Aug 2015 06:17:16 +0000 (06:17 +0000)]
am
c7936863: am
9ee5d6cd: Merge "Add missing field init in constructors"
* commit '
c7936863dafc081e8e2ccdca9712807bab2fe318':
Add missing field init in constructors
Sebastien Hertz [Wed, 26 Aug 2015 06:12:18 +0000 (06:12 +0000)]
am
c4d507da: am
d71c89f4: Merge "Update instrumentation stack after exception event"
* commit '
c4d507da213bd23e91b4aeaa84e6f2d4fe599c7f':
Update instrumentation stack after exception event
Sebastien Hertz [Wed, 26 Aug 2015 06:11:28 +0000 (06:11 +0000)]
am
9ee5d6cd: Merge "Add missing field init in constructors"
* commit '
9ee5d6cdc14ac94b64ea1961bf221bad48746929':
Add missing field init in constructors
Sebastien Hertz [Wed, 26 Aug 2015 06:04:50 +0000 (06:04 +0000)]
Merge "Add missing field init in constructors"
Sebastien Hertz [Wed, 26 Aug 2015 06:03:42 +0000 (06:03 +0000)]
am
d71c89f4: Merge "Update instrumentation stack after exception event"
* commit '
d71c89f46ad60713494d537001d4b370ce355885':
Update instrumentation stack after exception event
Sebastien Hertz [Wed, 26 Aug 2015 05:57:33 +0000 (05:57 +0000)]
Merge "Update instrumentation stack after exception event"
Jeff Hao [Wed, 26 Aug 2015 02:54:07 +0000 (02:54 +0000)]
am
fa8114ca: am
b5f7abcd: Merge "Revert "Revert "Move annotations to native."""
* commit '
fa8114ca7226eb14d3804e2995895bdc3c90db92':
Revert "Revert "Move annotations to native.""
Jeff Hao [Tue, 25 Aug 2015 21:40:39 +0000 (21:40 +0000)]
am
b5f7abcd: Merge "Revert "Revert "Move annotations to native."""
* commit '
b5f7abcdef9aec80e67b581a9bcc0de39e98fc85':
Revert "Revert "Move annotations to native.""
Jeff Hao [Tue, 25 Aug 2015 21:33:38 +0000 (21:33 +0000)]
Merge "Revert "Revert "Move annotations to native."""
Mathieu Chartier [Tue, 25 Aug 2015 21:32:32 +0000 (14:32 -0700)]
Address some comments for class flags
Change-Id: I354f48aefc37ce92c4d02cfce1723db0e28907bf
Jeff Hao [Tue, 25 Aug 2015 20:44:19 +0000 (20:44 +0000)]
Revert "Revert "Move annotations to native.""
This reverts commit
7db6dd79a24570448ae737ee1946b00396696cac.
Adds check if field's declaring class is proxy.
Bug:
23508574
Change-Id: Ie829f1526e74427711e818b56d1588d92946cbf6
Roland Levillain [Tue, 25 Aug 2015 17:23:20 +0000 (18:23 +0100)]
Minor changes to art::arm::Thumb2Assembler::StoreToOffset.
- Use CHECK instead of DCHECK for consistency reasons.
- Adjust documentation.
- Stylistic changes.
Change-Id: Ibc8261a0eb5a8b4d62edc1df0d5fb378e5021c22
David Brazdil [Tue, 25 Aug 2015 16:50:25 +0000 (16:50 +0000)]
am
fc5ce91d: am
dda43e7e: Merge "ART: Add (Fpu)RegHigh stack map location kinds"
* commit '
fc5ce91d46fdb9169860f5c8c3c57a7359dd343f':
ART: Add (Fpu)RegHigh stack map location kinds
Andreas Gampe [Tue, 25 Aug 2015 16:46:47 +0000 (16:46 +0000)]
am
58b7ffb7: am
54503b91: Merge "ART: Add option to retain lock levels in verifier"
* commit '
58b7ffb7085a9a1cb5b4d9fbd4ff7dd0d94c1722':
ART: Add option to retain lock levels in verifier
David Brazdil [Tue, 25 Aug 2015 16:44:58 +0000 (16:44 +0000)]
am
dda43e7e: Merge "ART: Add (Fpu)RegHigh stack map location kinds"
* commit '
dda43e7e9680e6eead02876e67718d01837d89e0':
ART: Add (Fpu)RegHigh stack map location kinds
David Brazdil [Tue, 25 Aug 2015 16:40:48 +0000 (16:40 +0000)]
Merge "ART: Add (Fpu)RegHigh stack map location kinds"
Andreas Gampe [Tue, 25 Aug 2015 16:37:58 +0000 (16:37 +0000)]
am
54503b91: Merge "ART: Add option to retain lock levels in verifier"
* commit '
54503b91200b0c645358ae428f397c7db358e86a':
ART: Add option to retain lock levels in verifier
David Brazdil [Tue, 25 Aug 2015 12:52:43 +0000 (13:52 +0100)]
ART: Add (Fpu)RegHigh stack map location kinds
When running Optimized code on 64-bit, high value of vreg pair may be
stored in the high 32 bits of a CPU register. This is not reflected in
stack maps which would encode both the low and high vreg as
kInRegister with the same register number, making it indistinguishable
from two non-wide vregs with the same value in the lower 32 bits.
Deoptimization deals with this by running the verifier and thus
obtaining vreg pair information, but this would be too slow for try/
catch. This patch therefore adds two new stack map location kinds:
kInRegisterHigh and kInFpuRegisterHigh to differentiate between the
two cases.
Note that this also applies to floating-point registers on x86.
Change-Id: I15092323e56a661673e77bee1f0fca4261374732
Andreas Gampe [Tue, 25 Aug 2015 16:34:32 +0000 (16:34 +0000)]
Merge "ART: Add option to retain lock levels in verifier"
Vladimir Marko [Tue, 25 Aug 2015 16:25:35 +0000 (16:25 +0000)]
am
f1ae0fe2: am
77204c01: Merge "Revert "Revert "[MIPS] Use hard float calling convention for managed code"""
* commit '
f1ae0fe299eff17aec22e0b08815987ee1871c3e':
Revert "Revert "[MIPS] Use hard float calling convention for managed code""
Vladimir Marko [Tue, 25 Aug 2015 16:16:50 +0000 (16:16 +0000)]
am
77204c01: Merge "Revert "Revert "[MIPS] Use hard float calling convention for managed code"""
* commit '
77204c018e27ad70a226daadebf75e9144b1b275':
Revert "Revert "[MIPS] Use hard float calling convention for managed code""
Andreas Gampe [Tue, 25 Aug 2015 04:13:08 +0000 (21:13 -0700)]
ART: Add option to retain lock levels in verifier
Templatize SetRegisterType to be able to retain lock levels. When
sharpening a type, e.g., in a branch after an instanceof, the
verifier should remember if the register had been locked before
and not implicitly erase that information.
Bug:
23502994
Change-Id: Iba62688a536792da0920598fecdbf24a4993ec04
Vladimir Marko [Tue, 25 Aug 2015 16:10:51 +0000 (16:10 +0000)]
Merge "Revert "Revert "[MIPS] Use hard float calling convention for managed code"""
Sebastien Hertz [Tue, 25 Aug 2015 15:17:41 +0000 (15:17 +0000)]
am
93146839: am
9dc601eb: Merge "Revert "Fix deoptimization with pending exception""
* commit '
93146839d83c82fc42fe3463bea5aa6e519afc2e':
Revert "Fix deoptimization with pending exception"
Goran Jakovljevic [Mon, 24 Aug 2015 12:58:55 +0000 (12:58 +0000)]
Revert "Revert "[MIPS] Use hard float calling convention for managed code""
This reverts commit
7fee84c087e0f903e7d43bef180df047db1c8051.
Fixed issue with temporary registers on Mips32r6.
Change-Id: I93018927e6a6036cff2d55e6cda66d3212a4316b
Sebastien Hertz [Tue, 25 Aug 2015 15:12:01 +0000 (15:12 +0000)]
am
9dc601eb: Merge "Revert "Fix deoptimization with pending exception""
* commit '
9dc601eb65da0cd5f53172699dacd6e5dd38ab44':
Revert "Fix deoptimization with pending exception"
Sebastien Hertz [Tue, 25 Aug 2015 15:05:54 +0000 (15:05 +0000)]
Merge "Revert "Fix deoptimization with pending exception""
Sebastien Hertz [Tue, 25 Aug 2015 15:05:17 +0000 (15:05 +0000)]
Revert "Fix deoptimization with pending exception"
This reverts commit
54b62480636ae846d705fc180c7bd6cd08ec1e42.
This is causing test failures with Optimizing compiler.
Bug:
23371176
Bug:
19944235
Change-Id: Ie3ffbcf2b6d2ca8bc93cb008a4e29a7567d04a7c
Sebastien Hertz [Tue, 25 Aug 2015 14:14:10 +0000 (14:14 +0000)]
am
dd4a05d9: am
5595dd17: Merge "Fix deoptimization with pending exception"
* commit '
dd4a05d909e79d51aa7a1d0159993dde64a4185b':
Fix deoptimization with pending exception
Sebastien Hertz [Tue, 25 Aug 2015 14:07:37 +0000 (14:07 +0000)]
am
5595dd17: Merge "Fix deoptimization with pending exception"
* commit '
5595dd177b77bc32a512a8676e7195f649bb4e1d':
Fix deoptimization with pending exception
Sebastien Hertz [Tue, 25 Aug 2015 14:04:14 +0000 (14:04 +0000)]
Merge "Fix deoptimization with pending exception"
Sebastien Hertz [Tue, 25 Aug 2015 13:25:41 +0000 (15:25 +0200)]
Add missing field init in constructors
Adds missing field initializations detected by Eclipse IDE.
Change-Id: I5f2f32bcccb12545fc9f0b42fcec74a23dc81376
Sebastien Hertz [Thu, 20 Aug 2015 10:07:57 +0000 (12:07 +0200)]
Fix deoptimization with pending exception
When deoptimizing the stack, we set a fake exception in the current
Thread* (see method Thread::GetDeoptimizationException). On the next
exception check, the QuickExceptionHandler will deoptimize the stack.
The issue is when we deoptimize while an exception is already pending
in the current Thread*: setting the fake exception will clobber the
pending exception which is not correct. This happens in the
artQuickToInterpreterBridge when returning from the interpreter and
we want to deoptimize the stack for debugging (like single-stepping).
This CL saves the pending exception before asking for deoptimization.
Then the exception is restored just before executing the deoptimized
frames with the interpreter.
Also cleans up the way we save deoptimization context (return value
and pending exception).
Bug:
23371176
Bug:
19944235
Change-Id: I7f4c8347b328817c452beda3399e210eba3a88a4
Roland Levillain [Tue, 25 Aug 2015 12:20:33 +0000 (12:20 +0000)]
am
fe8e0455: am
c9774838: Merge "Revert "Move annotations to native.""
* commit '
fe8e04554ad3712a0a2b1a2e0d0e4a9fef469c25':
Revert "Move annotations to native."
Roland Levillain [Tue, 25 Aug 2015 12:13:04 +0000 (12:13 +0000)]
am
c9774838: Merge "Revert "Move annotations to native.""
* commit '
c97748381468485535b11bfc8664c26385f4b715':
Revert "Move annotations to native."
Roland Levillain [Tue, 25 Aug 2015 12:07:47 +0000 (12:07 +0000)]
Merge "Revert "Move annotations to native.""
Roland Levillain [Tue, 25 Aug 2015 10:53:19 +0000 (10:53 +0000)]
Revert "Move annotations to native."
This reverts commit
0042c6d49b8488c78f0b937063e316e8d6244439.
Reverting this change (as well as the companion CL
https://android-review.googlesource.com/#/c/167510/ in
platform/libcore) as they make libcore test
libcore.java.lang.reflect.ProxyTest#test24846 fail.
Change-Id: Ie0676cabb128277c7df5dab7bde17aefd3b2c09c
Andreas Gampe [Tue, 25 Aug 2015 05:16:43 +0000 (05:16 +0000)]
am
fc509f70: am
f0170ded: Merge "ART: Add VLOG printing of SetStatus(Error)"
* commit '
fc509f70a21cbe1bab82359cc57aca6b9bff4938':
ART: Add VLOG printing of SetStatus(Error)
Andreas Gampe [Tue, 25 Aug 2015 05:11:11 +0000 (05:11 +0000)]
am
f0170ded: Merge "ART: Add VLOG printing of SetStatus(Error)"
* commit '
f0170ded84fbcd3d9152cdbcf9ffbf74c71b03ba':
ART: Add VLOG printing of SetStatus(Error)
Andreas Gampe [Tue, 25 Aug 2015 05:02:46 +0000 (05:02 +0000)]
Merge "ART: Add VLOG printing of SetStatus(Error)"
Andreas Gampe [Tue, 25 Aug 2015 04:09:05 +0000 (21:09 -0700)]
ART: Add VLOG printing of SetStatus(Error)
In verbose:class mode, print a message when a class is set to
erroneous, and dump any pending exception.
Change-Id: I2ebfe4fcd8495c3ff42675bd3c0f80125b23c019
Andreas Gampe [Mon, 24 Aug 2015 23:03:06 +0000 (23:03 +0000)]
am
cb3c9952: am
dcff51a0: Merge "Revert "Do a second check for testing intrinsic types.""
* commit '
cb3c9952c81cabedcf9f5460d03d3c62ed3b461c':
Revert "Do a second check for testing intrinsic types."
Andreas Gampe [Mon, 24 Aug 2015 22:57:53 +0000 (22:57 +0000)]
am
dcff51a0: Merge "Revert "Do a second check for testing intrinsic types.""
* commit '
dcff51a0079c5e3abaf0335f7cb9a3dd44044456':
Revert "Do a second check for testing intrinsic types."
Andreas Gampe [Mon, 24 Aug 2015 22:50:51 +0000 (22:50 +0000)]
Merge "Revert "Do a second check for testing intrinsic types.""
Andreas Gampe [Mon, 24 Aug 2015 22:49:59 +0000 (22:49 +0000)]
Revert "Do a second check for testing intrinsic types."
This reverts commit
4daa0b4c21eee46362b5114fb2c3800c0c7e7a36.
If the intrinsic has a slow-path, like charAt, the slow-path logic will complain as it only understands direct slow-paths, not virtual calls.
We should either override that decision in the slow-path, or replace the HInvokeVirtual when we're overriding the intrinsic choice.
Bug:
23475673
Change-Id: If55fbc8c82d52e0e7a7aec2674ae2bd2b74b5c77
Sebastien Hertz [Mon, 24 Aug 2015 12:27:01 +0000 (14:27 +0200)]
Update instrumentation stack after exception event
If instrumentation is updated on an exception event, we must update
the instrumentation stack (to remove all frames that will be unwound
by the exception) before doing the long jump.
Bug:
23471864
Change-Id: Ic91552bb7280c54bcc58b7ba03a17040b0b0f5ef