OSDN Git Service
Andreas Gampe [Fri, 6 Nov 2015 18:49:40 +0000 (18:49 +0000)]
Merge "ART: Change behavior for rethrowing init failures (2)" am:
ef7ef4ce04
am:
a62884320b
* commit '
a62884320b76e1893fde2073c5fdb5fd008e394c':
ART: Change behavior for rethrowing init failures (2)
Andreas Gampe [Fri, 6 Nov 2015 18:46:05 +0000 (18:46 +0000)]
Merge "ART: Change behavior for rethrowing init failures (2)"
am:
ef7ef4ce04
* commit '
ef7ef4ce04a46405e15cd91115c6e657235adf83':
ART: Change behavior for rethrowing init failures (2)
Andreas Gampe [Fri, 6 Nov 2015 18:42:04 +0000 (18:42 +0000)]
Merge "ART: Change behavior for rethrowing init failures (2)"
Vladimir Marko [Fri, 6 Nov 2015 17:48:21 +0000 (17:48 +0000)]
Merge "ART: Fix potential integer overflow in JNI." am:
f66f05ddfc
am:
01ed1f474a
* commit '
01ed1f474a9d87fbb3a921e12cff8f6eb3747847':
ART: Fix potential integer overflow in JNI.
Vladimir Marko [Fri, 6 Nov 2015 17:45:50 +0000 (17:45 +0000)]
Merge "ART: Fix potential integer overflow in JNI."
am:
f66f05ddfc
* commit '
f66f05ddfceaa8a2f613d3ed8316a21c95e1fbca':
ART: Fix potential integer overflow in JNI.
Vladimir Marko [Fri, 6 Nov 2015 17:43:58 +0000 (17:43 +0000)]
Merge "ART: Fix potential integer overflow in JNI."
Andreas Gampe [Fri, 6 Nov 2015 17:38:30 +0000 (17:38 +0000)]
Merge "MIPS32: java.lang.String.equals" am:
17656eb32a
am:
23ac2ad457
* commit '
23ac2ad457add1510a1e3151d5d2daff4abf3035':
MIPS32: java.lang.String.equals
Vladimir Marko [Fri, 6 Nov 2015 16:57:03 +0000 (16:57 +0000)]
ART: Fix potential integer overflow in JNI.
Change-Id: I06fe2035f911cfc8537e27961c2dc2c7e4d1e20d
Andreas Gampe [Fri, 6 Nov 2015 17:36:35 +0000 (17:36 +0000)]
Merge "MIPS32: java.lang.String.equals"
am:
17656eb32a
* commit '
17656eb32a08f81384d4afda8b19b71f0736abd4':
MIPS32: java.lang.String.equals
Andreas Gampe [Fri, 6 Nov 2015 17:33:17 +0000 (17:33 +0000)]
Merge "MIPS32: java.lang.String.equals"
Chris Larsen [Mon, 2 Nov 2015 18:58:31 +0000 (10:58 -0800)]
MIPS32: java.lang.String.equals
Add intrinsic support for String.equals on MIPS32.
Change-Id: I2d184aa4d5dae7cdd4a89c2c902535692c9e7393
Nicolas Geoffray [Fri, 6 Nov 2015 14:28:49 +0000 (14:28 +0000)]
Merge "Improve X86 handling of constants to Field/Array Set" am:
97e740166a
am:
e6bf4a1e3e
* commit '
e6bf4a1e3eccbed40aa7aaa5b73e4c12d5d8cbf9':
Improve X86 handling of constants to Field/Array Set
Nicolas Geoffray [Fri, 6 Nov 2015 14:27:05 +0000 (14:27 +0000)]
Merge "Improve X86 handling of constants to Field/Array Set"
am:
97e740166a
* commit '
97e740166a0687ddca6a51deee64b61c1bd17868':
Improve X86 handling of constants to Field/Array Set
Nicolas Geoffray [Fri, 6 Nov 2015 14:24:49 +0000 (14:24 +0000)]
Merge "Improve X86 handling of constants to Field/Array Set"
Mark Mendell [Wed, 4 Nov 2015 16:30:41 +0000 (11:30 -0500)]
Improve X86 handling of constants to Field/Array Set
AnTuTu 5.6 f.v.b() function on X86 showed several places where FP
constants were created using the stack, one in an inner loop.
Change ArraySet and *FieldSet to allow constants, and then generate
integer constant moves, rather than forcing the constant to be
materialized into a register. This will also help with register
pressure.
Change-Id: Ibebe2fed748a1bbeca47c36e9536b9b2357fc3cb
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Sebastien Hertz [Fri, 6 Nov 2015 13:20:23 +0000 (13:20 +0000)]
Merge "JDWP: fix returned tag for ClassType.NewInstance" am:
5348137d15
am:
0392859ef6
* commit '
0392859ef6caa91fc4fd1054fd6c2be456f41c06':
JDWP: fix returned tag for ClassType.NewInstance
Sebastien Hertz [Fri, 6 Nov 2015 13:18:39 +0000 (13:18 +0000)]
Merge "JDWP: fix returned tag for ClassType.NewInstance"
am:
5348137d15
* commit '
5348137d15483f7aeaf03f5116b8d6e01b5c1bac':
JDWP: fix returned tag for ClassType.NewInstance
Sebastien Hertz [Fri, 6 Nov 2015 13:16:41 +0000 (13:16 +0000)]
Merge "JDWP: fix returned tag for ClassType.NewInstance"
Vladimir Marko [Fri, 6 Nov 2015 09:58:43 +0000 (09:58 +0000)]
Merge "ART: Fix ignoring duplicate fields when loading class." am:
2fa684206b
am:
feda70faff
* commit '
feda70faff0f8691f00a4fd37c607f98e62134fb':
ART: Fix ignoring duplicate fields when loading class.
Vladimir Marko [Fri, 6 Nov 2015 09:56:59 +0000 (09:56 +0000)]
Merge "ART: Fix ignoring duplicate fields when loading class."
am:
2fa684206b
* commit '
2fa684206b0a8bd203d07e1edf74a839b498f74f':
ART: Fix ignoring duplicate fields when loading class.
Vladimir Marko [Fri, 6 Nov 2015 09:54:39 +0000 (09:54 +0000)]
Merge "ART: Fix ignoring duplicate fields when loading class."
Nicolas Geoffray [Fri, 6 Nov 2015 09:41:06 +0000 (09:41 +0000)]
Merge "MIPS64: Implement virtual intrinsic slow path" am:
2704896d3a
am:
3f8c6abb9e
* commit '
3f8c6abb9e5e915e68f48bbb2e7d08c2721a476d':
MIPS64: Implement virtual intrinsic slow path
Nicolas Geoffray [Fri, 6 Nov 2015 09:39:22 +0000 (09:39 +0000)]
Merge "MIPS64: Implement virtual intrinsic slow path"
am:
2704896d3a
* commit '
2704896d3aa2902f46eebd722095b06331f548be':
MIPS64: Implement virtual intrinsic slow path
Nicolas Geoffray [Fri, 6 Nov 2015 09:38:03 +0000 (09:38 +0000)]
Merge "MIPS64: Implement virtual intrinsic slow path"
Mathieu Chartier [Fri, 6 Nov 2015 04:34:56 +0000 (04:34 +0000)]
Merge "Change test .dex.art to .art" am:
9c3cd19d85
am:
f8bcb258a3
* commit '
f8bcb258a3549062c954ef5021071bbdf447fce9':
Change test .dex.art to .art
Mathieu Chartier [Fri, 6 Nov 2015 04:33:08 +0000 (04:33 +0000)]
Merge "Change test .dex.art to .art"
am:
9c3cd19d85
* commit '
9c3cd19d85a1366fdd9a617562d4966d6844d9f7':
Change test .dex.art to .art
Mathieu Chartier [Fri, 6 Nov 2015 04:30:59 +0000 (04:30 +0000)]
Merge "Change test .dex.art to .art"
Mathieu Chartier [Fri, 6 Nov 2015 04:24:53 +0000 (20:24 -0800)]
Change test .dex.art to .art
Fixes some file names that were too long and causing tests to fail.
Change-Id: Id4929b2ba98e7c0bc7daa33ec3e783738f5e4719
Alexey Frunze [Fri, 6 Nov 2015 00:34:23 +0000 (16:34 -0800)]
MIPS64: Implement virtual intrinsic slow path
This fixes a crash in dex2oat while compiling boot.oat.
Change-Id: I44fc92809902d7fc226c88b3e3f081b72cc19ce5
Mathieu Chartier [Fri, 6 Nov 2015 00:26:22 +0000 (00:26 +0000)]
Merge "Revert "Revert "Add basic image writer support for app images""" am:
ae04419075
am:
578c1aa650
* commit '
578c1aa650e8d4fd2d0b77aa8101e37579e70836':
Revert "Revert "Add basic image writer support for app images""
Mathieu Chartier [Fri, 6 Nov 2015 00:23:10 +0000 (00:23 +0000)]
Merge "Revert "Revert "Add basic image writer support for app images"""
am:
ae04419075
* commit '
ae0441907596ff5d7d3ebba6e12ed25e3ec11e21':
Revert "Revert "Add basic image writer support for app images""
Mathieu Chartier [Fri, 6 Nov 2015 00:19:56 +0000 (00:19 +0000)]
Merge "Revert "Revert "Add basic image writer support for app images"""
Mathieu Chartier [Thu, 5 Nov 2015 16:03:47 +0000 (08:03 -0800)]
Revert "Revert "Add basic image writer support for app images""
No changes, bug fixed in:
https://android-review.googlesource.com/#/c/180886/
Bug:
22858531
This reverts commit
4b018565e57c3349a3c1b5ec8ac9dae261c5e00b.
Change-Id: I86d9c2b55d535d803c6e1b3b8b4836bf6ff077e5
Mathieu Chartier [Thu, 5 Nov 2015 23:36:20 +0000 (23:36 +0000)]
Merge "Fix elf writer to properly handle empty text sections" am:
51c1b63fc7
am:
7bdb2bc06d
* commit '
7bdb2bc06dd6e4bb8d23df3ed0cb8ae06c3aef0a':
Fix elf writer to properly handle empty text sections
Mathieu Chartier [Thu, 5 Nov 2015 23:32:42 +0000 (23:32 +0000)]
Merge "Fix elf writer to properly handle empty text sections"
am:
51c1b63fc7
* commit '
51c1b63fc71bea1b22b9719bc24ffd130aa2e420':
Fix elf writer to properly handle empty text sections
Mathieu Chartier [Thu, 5 Nov 2015 23:29:42 +0000 (23:29 +0000)]
Merge "Fix elf writer to properly handle empty text sections"
Mathieu Chartier [Thu, 5 Nov 2015 19:16:34 +0000 (11:16 -0800)]
Fix elf writer to properly handle empty text sections
Previously, empty text sections caused an underflow in the oat file
size.
Added regression test.
Bug:
22858531
Change-Id: I9391a3666ab04e32472a9776d5217fe1743417a9
Richard Uhler [Thu, 5 Nov 2015 20:26:51 +0000 (20:26 +0000)]
Merge "ahat: limit default number of results shown." am:
1a143287f2
am:
7b53ae2293
* commit '
7b53ae22938b6ef628a59fe143974ea5386eb44e':
ahat: limit default number of results shown.
Richard Uhler [Thu, 5 Nov 2015 20:23:03 +0000 (20:23 +0000)]
Merge "ahat: limit default number of results shown."
am:
1a143287f2
* commit '
1a143287f23d8ed7f69ccc336733f605f44cf5da':
ahat: limit default number of results shown.
Richard Uhler [Thu, 5 Nov 2015 20:19:41 +0000 (20:19 +0000)]
Merge "ahat: limit default number of results shown."
Sebastien Hertz [Thu, 5 Nov 2015 17:39:21 +0000 (17:39 +0000)]
Merge "Minor cleanup of Monitor::VisitLocks" am:
4ba3766449
am:
8c9b6fe884
* commit '
8c9b6fe8845a31ef4f6f4c85370dd1bdcf65d742':
Minor cleanup of Monitor::VisitLocks
Sebastien Hertz [Thu, 5 Nov 2015 17:36:56 +0000 (17:36 +0000)]
Merge "Minor cleanup of Monitor::VisitLocks"
am:
4ba3766449
* commit '
4ba3766449e4c36478ed896ee6d2ad9e9ee43f74':
Minor cleanup of Monitor::VisitLocks
Sebastien Hertz [Thu, 5 Nov 2015 17:33:10 +0000 (17:33 +0000)]
Merge "Minor cleanup of Monitor::VisitLocks"
Vladimir Marko [Thu, 5 Nov 2015 15:30:12 +0000 (15:30 +0000)]
ART: Fix ignoring duplicate fields when loading class.
Bug:
25493974
Change-Id: I59e7ee6ee5b991b327553d022d7d212db415c9c3
Sebastien Hertz [Thu, 5 Nov 2015 14:57:30 +0000 (15:57 +0100)]
Minor cleanup of Monitor::VisitLocks
Uses the Instruction class to not bother with the decoding logic.
Change-Id: Id1501b57129084014f05e41513319639a630361d
Aart Bik [Thu, 5 Nov 2015 17:18:21 +0000 (17:18 +0000)]
Merge "Finalized all components of range analysis needed for dynamic bce." am:
d93223d796
am:
23fee0ffe8
* commit '
23fee0ffe863c3cfc17f3a2bf9b9e3d173dfc12a':
Finalized all components of range analysis needed for dynamic bce.
Aart Bik [Thu, 5 Nov 2015 17:16:35 +0000 (17:16 +0000)]
Merge "Finalized all components of range analysis needed for dynamic bce."
am:
d93223d796
* commit '
d93223d7966bee1ae91a9e224c1dd56de1aa3f50':
Finalized all components of range analysis needed for dynamic bce.
Aart Bik [Thu, 5 Nov 2015 17:15:05 +0000 (17:15 +0000)]
Merge "Finalized all components of range analysis needed for dynamic bce."
Nicolas Geoffray [Thu, 5 Nov 2015 16:30:35 +0000 (16:30 +0000)]
Merge "X86-64: Split long/double constant array/field set" am:
f2a93f4d82
am:
3bfec9013a
* commit '
3bfec9013aabb0f449733be92fdf619efd19ddb4':
X86-64: Split long/double constant array/field set
Nicolas Geoffray [Thu, 5 Nov 2015 16:28:51 +0000 (16:28 +0000)]
Merge "X86-64: Split long/double constant array/field set"
am:
f2a93f4d82
* commit '
f2a93f4d824d6ea0f5858c774ba03f1c002a6aaa':
X86-64: Split long/double constant array/field set
Nicolas Geoffray [Thu, 5 Nov 2015 16:27:58 +0000 (16:27 +0000)]
Merge "X86-64: Split long/double constant array/field set"
Mark Mendell [Thu, 22 Oct 2015 21:35:49 +0000 (17:35 -0400)]
X86-64: Split long/double constant array/field set
A long constant needs to be in a register to store to memory.
By allowing stores of constants that are outside of the range of
int32_t, we reduce register usage.
Also support sets of float/double constants by using integer stores.
Rename RegisterOrInt32LongConstant to RegisterOrInt32Constant as it
now handles any type of constant.
Change-Id: I025d9ef889a5a433e45aa03b376bae40f14197d2
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Nicolas Geoffray [Thu, 5 Nov 2015 15:56:53 +0000 (15:56 +0000)]
Merge "Fix conditional jump over jmp (X86/X86-64/ARM32)" am:
3f96f42b37
am:
f3c8b86aa4
* commit '
f3c8b86aa4edd0ed48d343e72367cda916f4365e':
Fix conditional jump over jmp (X86/X86-64/ARM32)
Nicolas Geoffray [Thu, 5 Nov 2015 15:54:56 +0000 (15:54 +0000)]
Merge "Fix conditional jump over jmp (X86/X86-64/ARM32)"
am:
3f96f42b37
* commit '
3f96f42b3788f9b9b243822212ec686e599279ef':
Fix conditional jump over jmp (X86/X86-64/ARM32)
Nicolas Geoffray [Thu, 5 Nov 2015 15:53:05 +0000 (15:53 +0000)]
Merge "Fix conditional jump over jmp (X86/X86-64/ARM32)"
David Srbecky [Thu, 5 Nov 2015 15:49:22 +0000 (15:49 +0000)]
Merge "Move .dynsym ELF section after .text" am:
f941a32401
am:
b28ac6cd41
* commit '
b28ac6cd4166c685f400746fb91d05e067217352':
Move .dynsym ELF section after .text
David Srbecky [Thu, 5 Nov 2015 15:47:59 +0000 (15:47 +0000)]
Merge "Move .dynsym ELF section after .text"
am:
f941a32401
* commit '
f941a32401f554a1713aedba44757f6edb664aad':
Move .dynsym ELF section after .text
Mark Mendell [Fri, 22 May 2015 20:58:19 +0000 (16:58 -0400)]
Fix conditional jump over jmp (X86/X86-64/ARM32)
Optimize the code generation for 'if' statements to jump to the
'false' block if the next block to be generated is the 'true' block.
Add an X86-64 test for this case.
Note that ARM64 & MIPS64 have not been updated.
Change-Id: Iebb1352feb9d3bd0142d8b0621a2e3069a708ea7
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
David Srbecky [Thu, 5 Nov 2015 15:42:08 +0000 (15:42 +0000)]
Merge "Move .dynsym ELF section after .text"
Sebastien Hertz [Thu, 5 Nov 2015 11:09:44 +0000 (12:09 +0100)]
JDWP: fix returned tag for ClassType.NewInstance
Bug:
25490662
Change-Id: I0c369f04342a60caef4f7462005804307a410d18
Nicolas Geoffray [Thu, 5 Nov 2015 14:48:09 +0000 (14:48 +0000)]
Merge "Fix flake around instrumentation." am:
55a77ef5f9
am:
653e7d770a
* commit '
653e7d770a1f8c5ef710276997babd09c483bb48':
Fix flake around instrumentation.
Nicolas Geoffray [Thu, 5 Nov 2015 14:46:04 +0000 (14:46 +0000)]
Merge "Fix flake around instrumentation."
am:
55a77ef5f9
* commit '
55a77ef5f99c2b056eb5f2820c1ff3b29c0ec270':
Fix flake around instrumentation.
Nicolas Geoffray [Thu, 5 Nov 2015 14:43:33 +0000 (14:43 +0000)]
Merge "Fix flake around instrumentation."
David Srbecky [Tue, 3 Nov 2015 13:43:09 +0000 (13:43 +0000)]
Move .dynsym ELF section after .text
The main purpose of the dynamic section is to describe where
.text is and how large it is. It makes more sense to write
this section once we actually know this information.
Also write string sections (.dynstr and .strtab) before the
corresponding symbol sections because the strings take more space.
Neither of these changes is important now since we build the
sections in memory first, but it is move towards streaming of
the ELF file directly do disk.
Due to alignment requirements, the move increases the oat file
size by one page (4K) which is insignificant.
Change-Id: I61cc9f934b031d26a3a1f6007b51315e1538e3eb
Nicolas Geoffray [Thu, 5 Nov 2015 13:26:17 +0000 (13:26 +0000)]
Fix flake around instrumentation.
bug:
25492507
Change-Id: Ia4de07ecaf33c3153f5d93473671d2c93593f52d
Nicolas Geoffray [Thu, 5 Nov 2015 13:00:19 +0000 (13:00 +0000)]
Merge "Code cleanup to avoid CompilerDriver abstractions in JIT." am:
b24301b06b
am:
6ec2986ea8
* commit '
6ec2986ea8213a60ec341969e7eaf1b7dbaa0a58':
Code cleanup to avoid CompilerDriver abstractions in JIT.
Nicolas Geoffray [Thu, 5 Nov 2015 12:57:39 +0000 (12:57 +0000)]
Merge "Code cleanup to avoid CompilerDriver abstractions in JIT."
am:
b24301b06b
* commit '
b24301b06b31b463f7e92ebc9a8f75839e54b746':
Code cleanup to avoid CompilerDriver abstractions in JIT.
Nicolas Geoffray [Thu, 5 Nov 2015 12:53:57 +0000 (12:53 +0000)]
Merge "Code cleanup to avoid CompilerDriver abstractions in JIT."
Nicolas Geoffray [Thu, 5 Nov 2015 12:21:07 +0000 (12:21 +0000)]
Merge "Properly delete the jit thread pool." am:
2b13eaa500
am:
db1d1dec24
* commit '
db1d1dec24f78768d4a828d1542e41458e1b8138':
Properly delete the jit thread pool.
Nicolas Geoffray [Thu, 5 Nov 2015 12:18:32 +0000 (12:18 +0000)]
Merge "Properly delete the jit thread pool."
am:
2b13eaa500
* commit '
2b13eaa50065346d4a1345b05fe2e1455df6d71d':
Properly delete the jit thread pool.
Nicolas Geoffray [Thu, 5 Nov 2015 12:16:09 +0000 (12:16 +0000)]
Merge "Properly delete the jit thread pool."
Nicolas Geoffray [Wed, 4 Nov 2015 17:22:16 +0000 (17:22 +0000)]
Properly delete the jit thread pool.
bug:
25461989
bug:
25462600
Change-Id: I273cf256285d01c085e4dea1d997955d029361b9
Nicolas Geoffray [Wed, 4 Nov 2015 14:36:55 +0000 (14:36 +0000)]
Code cleanup to avoid CompilerDriver abstractions in JIT.
Avoids allocating a CompiledMethod.
Change-Id: I35b4aa0d7c74daba68e827a01e71c300fce3b3bf
Nicolas Geoffray [Thu, 5 Nov 2015 09:24:17 +0000 (09:24 +0000)]
Merge "Revert "Use Jack lang dev version for compiling art tests"" am:
ad15539f5a
am:
6ceb9dfb87
* commit '
6ceb9dfb87085d9693b4b2aeb9e141d48af71cee':
Revert "Use Jack lang dev version for compiling art tests"
Nicolas Geoffray [Thu, 5 Nov 2015 09:22:31 +0000 (09:22 +0000)]
Merge "Revert "Use Jack lang dev version for compiling art tests""
am:
ad15539f5a
* commit '
ad15539f5a1135d82439c5eb3ed4bb80c422a734':
Revert "Use Jack lang dev version for compiling art tests"
Nicolas Geoffray [Thu, 5 Nov 2015 09:20:42 +0000 (09:20 +0000)]
Merge "Revert "Use Jack lang dev version for compiling art tests""
Nicolas Geoffray [Thu, 5 Nov 2015 09:18:55 +0000 (09:18 +0000)]
Revert "Use Jack lang dev version for compiling art tests"
Tests fail.
This reverts commit
55fed87ff8b60d55589ee7df75b5080b17bce541.
Change-Id: I02c064c6774d72bc1349dbaab4d05ef69c537952
Nicolas Geoffray [Thu, 5 Nov 2015 08:52:22 +0000 (08:52 +0000)]
Merge "Revert "Add basic image writer support for app images"" am:
c09b334456
am:
38db676ebe
* commit '
38db676ebe56938fc6994831576815d4bb7f2ef6':
Revert "Add basic image writer support for app images"
Nicolas Geoffray [Thu, 5 Nov 2015 08:50:13 +0000 (08:50 +0000)]
Merge "Revert "Add basic image writer support for app images""
am:
c09b334456
* commit '
c09b3344568f9533a0954f5dfba20d65d05ec4c1':
Revert "Add basic image writer support for app images"
Nicolas Geoffray [Thu, 5 Nov 2015 08:49:07 +0000 (08:49 +0000)]
Merge "Revert "Add basic image writer support for app images""
Nicolas Geoffray [Thu, 5 Nov 2015 08:47:52 +0000 (08:47 +0000)]
Revert "Add basic image writer support for app images"
interpreter and jit tests fail.
Bug:
22858531
This reverts commit
c033474cfbfe1e963c07fa5c38aed02e35ed6f91.
Change-Id: Ic12a3e2a1908ac0db52d21a0b44b2508c88b2585
Yohann Roussel [Thu, 5 Nov 2015 08:13:39 +0000 (08:13 +0000)]
Merge "Use Jack lang dev version for compiling art tests" am:
f97ad8115d
am:
1a01dc6eb6
* commit '
1a01dc6eb68e8f9794f3f21077b1f9c7edc34d89':
Use Jack lang dev version for compiling art tests
Yohann Roussel [Thu, 5 Nov 2015 08:11:54 +0000 (08:11 +0000)]
Merge "Use Jack lang dev version for compiling art tests"
am:
f97ad8115d
* commit '
f97ad8115d00d5bd9bbd9c485a7a4b8107f620a2':
Use Jack lang dev version for compiling art tests
Yohann Roussel [Thu, 5 Nov 2015 08:09:50 +0000 (08:09 +0000)]
Merge "Use Jack lang dev version for compiling art tests"
Sebastien Hertz [Thu, 5 Nov 2015 07:42:47 +0000 (07:42 +0000)]
Merge "Fix continuous build" am:
e597d59771
am:
475dea46d7
* commit '
475dea46d7fe5706cae4d55a17038421f737ef65':
Fix continuous build
Sebastien Hertz [Thu, 5 Nov 2015 07:41:00 +0000 (07:41 +0000)]
Merge "Fix continuous build"
am:
e597d59771
* commit '
e597d59771ac85a18744587eebc8711286aae5d4':
Fix continuous build
Sebastien Hertz [Thu, 5 Nov 2015 07:38:42 +0000 (07:38 +0000)]
Merge "Fix continuous build"
Sebastien Hertz [Thu, 5 Nov 2015 07:32:10 +0000 (08:32 +0100)]
Fix continuous build
Stop building vogar.jar target since it no longer exists.
Change-Id: I4b834abd519736199c5ee1e5881b3531dbbf2c6f
Mathieu Chartier [Thu, 5 Nov 2015 02:15:03 +0000 (02:15 +0000)]
Merge "Add basic image writer support for app images" am:
a930832a4e
am:
baca8c1203
* commit '
baca8c1203d8f460ef8ecc6a083c477c98354ad4':
Add basic image writer support for app images
Mathieu Chartier [Thu, 5 Nov 2015 02:12:52 +0000 (02:12 +0000)]
Merge "Add basic image writer support for app images"
am:
a930832a4e
* commit '
a930832a4ef0a2ef0835c5db4650750018ab0765':
Add basic image writer support for app images
Mathieu Chartier [Thu, 5 Nov 2015 02:09:05 +0000 (02:09 +0000)]
Merge "Add basic image writer support for app images"
Andreas Gampe [Tue, 3 Nov 2015 00:20:00 +0000 (16:20 -0800)]
ART: Change behavior for rethrowing init failures (2)
Always store the pending exception when making a class erroneous.
Instead of filtering by ExceptionInInitializerError, add an option
to the rethrow that enforces a NoClassDefFoundError, which is required
by the specification.
Use the libcore companion change to add the stored error (if any) as
a cause to the NoClassDefFoundError, which should significantly help
tracking down issues.
Fix run-test 008 to expect spec-compliant behavior. Test that a cause
has been set.
Bug:
25445103
Change-Id: I6a0dc54e78312283faf23415887eff387531407f
Mathieu Chartier [Mon, 2 Nov 2015 18:30:20 +0000 (10:30 -0800)]
Add basic image writer support for app images
Needed to handle references from app image -> boot image.
Generate app images for tests to enable some testing.
Bug:
22858531
Change-Id: I1af98b6c4dfcb3a147fb5b0dea64aa4946c7ce57
Andreas Gampe [Wed, 4 Nov 2015 23:46:30 +0000 (23:46 +0000)]
Merge "ART: Change behavior for rethrowing init failures" am:
accc24985c
am:
6e1f6aab91
* commit '
6e1f6aab91a49d7657b947ea21386637afb04867':
ART: Change behavior for rethrowing init failures
Andreas Gampe [Wed, 4 Nov 2015 23:44:16 +0000 (23:44 +0000)]
Merge "ART: Change behavior for rethrowing init failures"
am:
accc24985c
* commit '
accc24985c08e98a27f43bc856fba4c3c48e79e9':
ART: Change behavior for rethrowing init failures
Andreas Gampe [Wed, 4 Nov 2015 23:42:13 +0000 (23:42 +0000)]
Merge "ART: Change behavior for rethrowing init failures"
David Brazdil [Wed, 4 Nov 2015 22:54:42 +0000 (22:54 +0000)]
Merge "Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation"" am:
3c60103948
am:
1dfc279504
* commit '
1dfc27950451930f706d212555f1c0299aeeed27':
Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation"
David Brazdil [Wed, 4 Nov 2015 22:52:08 +0000 (22:52 +0000)]
Merge "Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation""
am:
3c60103948
* commit '
3c60103948a8357497765965234eff7a56164061':
Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation"
David Brazdil [Wed, 4 Nov 2015 22:49:06 +0000 (22:49 +0000)]
Merge "Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation""
David Brazdil [Wed, 4 Nov 2015 22:48:45 +0000 (22:48 +0000)]
Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation"
Crashes on YouTube, need to investigate
This reverts commit
1749e2cfb5c5ed4d6970a09aecf898ca9cdfcb75.
Change-Id: If5f133d55dcc26b8db79a670a48fbd4af7807556