OSDN Git Service
David Brazdil [Tue, 10 Nov 2015 09:48:17 +0000 (09:48 +0000)]
Merge "ART: Add clarifying comment"
am:
1963759e84
* commit '
1963759e84664b51b617b00e15728f439895033b':
ART: Add clarifying comment
David Brazdil [Tue, 10 Nov 2015 09:46:41 +0000 (09:46 +0000)]
Merge "ART: Add clarifying comment"
David Brazdil [Tue, 10 Nov 2015 09:43:28 +0000 (09:43 +0000)]
ART: Add clarifying comment
Change-Id: I189ec4cae0aa1a5245a79e86d1ec0592e38eac4a
Mathieu Chartier [Tue, 10 Nov 2015 03:06:40 +0000 (03:06 +0000)]
Merge "Delete flaky DCHECK"
am:
1b87033ed8
* commit '
1b87033ed83ba03983b49237da89ce36d319b68e':
Delete flaky DCHECK
Mathieu Chartier [Tue, 10 Nov 2015 03:02:58 +0000 (03:02 +0000)]
Merge "Delete flaky DCHECK"
Mathieu Chartier [Tue, 10 Nov 2015 03:01:00 +0000 (19:01 -0800)]
Delete flaky DCHECK
Fixes mips build
Change-Id: I738b41f09f3c926f21640e358cf0bd5557167b0e
Mathieu Chartier [Tue, 10 Nov 2015 02:54:25 +0000 (02:54 +0000)]
Merge "Fix mac build"
am:
a5c3e44663
* commit '
a5c3e44663c3b9c97fe350b4191cec079738fca3':
Fix mac build
Mathieu Chartier [Tue, 10 Nov 2015 02:51:37 +0000 (02:51 +0000)]
Merge "Fix mac build"
Mathieu Chartier [Tue, 10 Nov 2015 02:50:49 +0000 (18:50 -0800)]
Fix mac build
Change-Id: I22bf169f15483e54b97d77ff0887cd1fde428af9
Mathieu Chartier [Tue, 10 Nov 2015 02:31:49 +0000 (02:31 +0000)]
Merge "Add low_4gb support to MapFile and MapFileAtAddress"
am:
ff12923229
* commit '
ff12923229e713c27b9a9588a3fdf8d59475d756':
Add low_4gb support to MapFile and MapFileAtAddress
Mathieu Chartier [Tue, 10 Nov 2015 02:07:04 +0000 (02:07 +0000)]
Merge "Add low_4gb support to MapFile and MapFileAtAddress"
Alex Light [Tue, 10 Nov 2015 01:39:51 +0000 (01:39 +0000)]
Merge "Some cleanup for tests 960-965 build scripts."
am:
02c330f6af
* commit '
02c330f6afdb2a528fc5d6c54a5fd683ddaa219f':
Some cleanup for tests 960-965 build scripts.
Alex Light [Tue, 10 Nov 2015 01:36:31 +0000 (01:36 +0000)]
Merge "Some cleanup for tests 960-965 build scripts."
Mathieu Chartier [Mon, 9 Nov 2015 23:16:56 +0000 (15:16 -0800)]
Add low_4gb support to MapFile and MapFileAtAddress
Motivation is to use this for loading app images in low 4GB at a
non fixed address.
Added test.
Bug:
22858531
Change-Id: I0f79a4a7bfbfbdfc112e41b25c8682b1fb932ab7
Alex Light [Mon, 9 Nov 2015 22:26:35 +0000 (14:26 -0800)]
Some cleanup for tests 960-965 build scripts.
Make all 96* build scripts consistent and update 965 to build and run
with jack.
Change-Id: If27ee9c92880c75307a18b054ba926670877073a
Andreas Gampe [Mon, 9 Nov 2015 21:30:04 +0000 (21:30 +0000)]
Merge "ART: Rerun the verifier for compile-time failures"
am:
78232f2482
* commit '
78232f2482e71fef255796633da68bb769baa93a':
ART: Rerun the verifier for compile-time failures
Andreas Gampe [Mon, 9 Nov 2015 21:25:47 +0000 (21:25 +0000)]
Merge "ART: Rerun the verifier for compile-time failures"
Alex Light [Mon, 9 Nov 2015 19:32:21 +0000 (19:32 +0000)]
Merge "Class Linker: Implement default interface verification ordering."
am:
f1584a6f52
* commit '
f1584a6f5251892509097c3bb30bd91d36634d0a':
Class Linker: Implement default interface verification ordering.
Alex Light [Mon, 9 Nov 2015 19:30:10 +0000 (19:30 +0000)]
Merge "Class Linker: Implement default interface verification ordering."
Alex Light [Wed, 7 Oct 2015 23:08:36 +0000 (16:08 -0700)]
Class Linker: Implement default interface verification ordering.
We ensure that default interface verification failure is propagated to
the implementing class so that the compiler is able to properly handle
verification failures. Furthermore we ensure that default interfaces
are verified at the same time their implementing classes are.
This does not add additional support for default methods to the verifier.
This adds a basic test of this functionality.
Previously assumptions made about the order of verification in our
code could cause a check failure during compilation. Our old code
assumed that all code that would be run during a classes
initialization had been verified before any of it was run. The default
interfaces broke this assumption. Now we will simply verify default
interfaces with any classes that implement them.
Bug:
24618811
Change-Id: Ia11a50a28889dbd7ca22ffa730ef443e39f3cb5b
Andreas Gampe [Fri, 6 Nov 2015 04:39:56 +0000 (20:39 -0800)]
ART: Rerun the verifier for compile-time failures
To aid app failure diagnosis, by default re-run the verifier at
runtime to compute a better VerifyError message.
Rewrite the verifier driver code to pass the last actual low-level
verifier message.
Bug:
25432718
Change-Id: Ib8e6dd1ce8121045c0d38f54969100094c3dde6e
Mathieu Chartier [Mon, 9 Nov 2015 18:09:43 +0000 (18:09 +0000)]
Merge "Add more image writer comments and clean up"
am:
3c58937626
* commit '
3c5893762675d90697d9205b76dc24e2d04e27ca':
Add more image writer comments and clean up
Mathieu Chartier [Mon, 9 Nov 2015 18:07:01 +0000 (18:07 +0000)]
Merge "Add more image writer comments and clean up"
Mathieu Chartier [Fri, 6 Nov 2015 00:33:15 +0000 (16:33 -0800)]
Add more image writer comments and clean up
Bug:
22858531
Change-Id: Ia3663856a7d9f67d9d9af329a54707ae2dc55a48
Nicolas Geoffray [Mon, 9 Nov 2015 14:27:11 +0000 (14:27 +0000)]
Merge "Revert "Revert "Revert "Use Jack lang dev version for compiling art tests""""
am:
ce0f43b97f
* commit '
ce0f43b97ffb5e4d14c5df6607d8efb46a5dc9d2':
Revert "Revert "Revert "Use Jack lang dev version for compiling art tests"""
Nicolas Geoffray [Mon, 9 Nov 2015 14:25:19 +0000 (14:25 +0000)]
Merge "Revert "Revert "Revert "Use Jack lang dev version for compiling art tests""""
Nicolas Geoffray [Mon, 9 Nov 2015 14:00:28 +0000 (14:00 +0000)]
Revert "Revert "Revert "Use Jack lang dev version for compiling art tests"""
Breaks 962 and 963 run-tests.
This reverts commit
a6017d8fa6acfa35f6fad8169162f0e5bd034bc4.
Change-Id: I185e803640309f0055e6a3d767da201527b523e2
Vladimir Marko [Mon, 9 Nov 2015 13:59:29 +0000 (13:59 +0000)]
Merge "Optimizing: Rewrite search for common dominators."
am:
31f1584b6b
* commit '
31f1584b6bc3fc39dfb396edb24ec42f193f587c':
Optimizing: Rewrite search for common dominators.
Vladimir Marko [Mon, 9 Nov 2015 13:53:13 +0000 (13:53 +0000)]
Merge "Optimizing: Rewrite search for common dominators."
Vladimir Marko [Fri, 6 Nov 2015 11:02:08 +0000 (11:02 +0000)]
Optimizing: Rewrite search for common dominators.
Provide a utility class that can be used to quickly search
for common dominators of two or more blocks. Change the
algorithm to avoid memory allocations.
Change-Id: Id72c975fc42377cb7622902f87c4262ea7b3cc38
Vladimir Marko [Mon, 9 Nov 2015 13:36:56 +0000 (13:36 +0000)]
Merge "Fix mip64 build: hide current method input only if it exists."
am:
934ea11065
* commit '
934ea11065c0806d3f57a632fac9032707afbfc6':
Fix mip64 build: hide current method input only if it exists.
Vladimir Marko [Mon, 9 Nov 2015 13:32:35 +0000 (13:32 +0000)]
Merge "Fix mip64 build: hide current method input only if it exists."
Vladimir Marko [Mon, 9 Nov 2015 12:54:16 +0000 (12:54 +0000)]
Fix mip64 build: hide current method input only if it exists.
Change-Id: I7d3cb34843d421babfb1f93469e770c05ee8d5a9
David Brazdil [Mon, 9 Nov 2015 12:49:26 +0000 (12:49 +0000)]
Merge "ART: Fix critical edge splitting under try/catch"
am:
f11f5ebe32
* commit '
f11f5ebe321fde9f6efb49d75b861606391b6502':
ART: Fix critical edge splitting under try/catch
David Brazdil [Mon, 9 Nov 2015 12:47:19 +0000 (12:47 +0000)]
Merge "ART: Fix critical edge splitting under try/catch"
Nicolas Geoffray [Mon, 9 Nov 2015 12:45:50 +0000 (12:45 +0000)]
Merge "Revert "Revert "Use Jack lang dev version for compiling art tests"""
am:
df7029f225
* commit '
df7029f2254f67230362c4bdfaddac00c342e660':
Revert "Revert "Use Jack lang dev version for compiling art tests""
Nicolas Geoffray [Mon, 9 Nov 2015 12:44:51 +0000 (12:44 +0000)]
Merge "Revert "Revert "Use Jack lang dev version for compiling art tests"""
David Srbecky [Mon, 9 Nov 2015 12:00:22 +0000 (12:00 +0000)]
Merge "Fix build: lint error in elf_builder.h"
am:
44612873bb
* commit '
44612873bb02be8a59e16aa50f61cce9e9cc9547':
Fix build: lint error in elf_builder.h
David Srbecky [Mon, 9 Nov 2015 11:58:43 +0000 (11:58 +0000)]
Merge "Fix build: lint error in elf_builder.h"
David Srbecky [Mon, 9 Nov 2015 11:56:52 +0000 (11:56 +0000)]
Fix build: lint error in elf_builder.h
Change-Id: I862bfe6c9a9f6ec3c16af2a720ce2ca75492e574
David Srbecky [Mon, 9 Nov 2015 11:32:30 +0000 (11:32 +0000)]
Merge "Rewrite ElfBuilder to make streaming directly to file easier."
am:
03771d84e8
* commit '
03771d84e83738313e5ccc0ce64bfccb1febd1b4':
Rewrite ElfBuilder to make streaming directly to file easier.
David Srbecky [Mon, 9 Nov 2015 11:30:31 +0000 (11:30 +0000)]
Merge "Rewrite ElfBuilder to make streaming directly to file easier."
David Brazdil [Fri, 6 Nov 2015 01:36:20 +0000 (01:36 +0000)]
ART: Fix critical edge splitting under try/catch
A critical edge would not be split if the predecessor ends with
TryBoundary. This would eventually trip liveness analysis because
a back edge block would have smaller liveness position than a nested
loop.
Another implication of this change is that an edge between a loop's
pre-header ending with TryBoundary and the header will be split,
guaranteeing that a pre-header always has just one successor.
Bug:
25493695
Bug:
25454012
Change-Id: I5a13b8bb74509b48f5d628906f7158af007f99ae
Vladimir Marko [Mon, 9 Nov 2015 10:16:23 +0000 (10:16 +0000)]
Merge "Optimizing: Remove unused ArtMethod* input from HInvokeStaticOrDirect."
am:
3e5b3c982a
* commit '
3e5b3c982a5837384829ffd6726c5a30714cbfcb':
Optimizing: Remove unused ArtMethod* input from HInvokeStaticOrDirect.
Vladimir Marko [Mon, 9 Nov 2015 10:14:35 +0000 (10:14 +0000)]
Merge "Optimizing: Remove unused ArtMethod* input from HInvokeStaticOrDirect."
Nicolas Geoffray [Mon, 9 Nov 2015 09:19:54 +0000 (09:19 +0000)]
Merge "Remove unused variable."
am:
2649cba0fb
* commit '
2649cba0fb7cdbd8fa60cb4f2fb320fb2b18ee37':
Remove unused variable.
Nicolas Geoffray [Mon, 9 Nov 2015 09:19:05 +0000 (09:19 +0000)]
Merge "Remove unused variable."
Nicolas Geoffray [Mon, 9 Nov 2015 09:15:15 +0000 (09:15 +0000)]
Remove unused variable.
Change-Id: I29d80004eba897b72304ec83fe89ed1071a24024
Nicolas Geoffray [Mon, 9 Nov 2015 08:59:12 +0000 (08:59 +0000)]
Merge "Fix interaction between JIT and instrumentation."
am:
dc18417745
* commit '
dc184177452ed438718befccd9d984cc93de51cc':
Fix interaction between JIT and instrumentation.
Nicolas Geoffray [Mon, 9 Nov 2015 08:57:28 +0000 (08:57 +0000)]
Merge "Fix interaction between JIT and instrumentation."
David Srbecky [Mon, 26 Oct 2015 10:57:09 +0000 (10:57 +0000)]
Rewrite ElfBuilder to make streaming directly to file easier.
The previous design required knowing all the sections and their
sizes before even the first byte of the file was written.
The new design allows sections to be written one by one without
any knowledge of later sections. Furthermore, as soon as
section is started, its virtual memory address is known,
which removes the need for the various patching passes.
The new ElfBuilder essentially tries to be a thin wrapper
around OutputStream which keeps track where the various
sections start/end and then writes their ELF headers.
Change-Id: I817e7f3b41882e4e4b9b442cfe56e4ef2e26babd
Nicolas Geoffray [Sat, 7 Nov 2015 14:18:18 +0000 (14:18 +0000)]
Merge "MIPS64: small improvements in code generation"
am:
2264f624e4
* commit '
2264f624e41acf09b17c3961bd52966e43f2b58f':
MIPS64: small improvements in code generation
Nicolas Geoffray [Sat, 7 Nov 2015 14:15:46 +0000 (14:15 +0000)]
Merge "MIPS64: small improvements in code generation"
Nicolas Geoffray [Sat, 7 Nov 2015 14:15:46 +0000 (14:15 +0000)]
Merge "MIPS64: Improve integer division by constants"
am:
4202a2ff49
* commit '
4202a2ff49d77eda813052d091675bf53c46cb0f':
MIPS64: Improve integer division by constants
Nicolas Geoffray [Sat, 7 Nov 2015 14:13:58 +0000 (14:13 +0000)]
Merge "MIPS64: Improve integer division by constants"
Andreas Gampe [Sat, 7 Nov 2015 01:12:11 +0000 (01:12 +0000)]
Merge "ART: Fix return-object verification"
am:
ba34e70223
* commit '
ba34e7022325250e453f52bb26eae7c9e0c92206':
ART: Fix return-object verification
Andreas Gampe [Sat, 7 Nov 2015 01:07:27 +0000 (01:07 +0000)]
Merge "ART: Fix return-object verification"
Andreas Gampe [Sat, 7 Nov 2015 00:24:49 +0000 (16:24 -0800)]
ART: Fix return-object verification
If the declared return type was unresolvable, we always threw a
soft failure, only. However, if the register type is not a reference,
this should always be a hard failure.
Add a test case.
Bug:
25494456
Change-Id: I6482a45ec36b58895816647da0ff3a731b31319f
Brian Carlstrom [Fri, 6 Nov 2015 23:17:30 +0000 (23:17 +0000)]
Merge "Use _exit instead of exit after exec fails"
am:
8249eac33f
* commit '
8249eac33fc9e97e361adfbaceb733d9d2ed514b':
Use _exit instead of exit after exec fails
Brian Carlstrom [Fri, 6 Nov 2015 23:16:22 +0000 (23:16 +0000)]
Merge "Use _exit instead of exit after exec fails"
Andreas Gampe [Fri, 6 Nov 2015 21:32:20 +0000 (21:32 +0000)]
Merge "Revert "Mark __jit_debug_register_code as a unique symbol""
am:
5729f5b897
* commit '
5729f5b897ffba17dacf5bff105f4ae2d101209b':
Revert "Mark __jit_debug_register_code as a unique symbol"
Andreas Gampe [Fri, 6 Nov 2015 21:28:39 +0000 (21:28 +0000)]
Merge "Revert "Mark __jit_debug_register_code as a unique symbol""
Andreas Gampe [Fri, 6 Nov 2015 21:27:49 +0000 (21:27 +0000)]
Revert "Mark __jit_debug_register_code as a unique symbol"
This reverts commit
5caf652d7bfb43bdd2f3addfe8021a5fb8e3f796.
Something's going wrong on the Mac host side, even though this should be target only.
Change-Id: I165f23ee25cb1c4b0732e1d1afcae75271abcb09
Alexey Frunze [Thu, 24 Sep 2015 21:41:59 +0000 (14:41 -0700)]
MIPS64: small improvements in code generation
Specifically:
- More efficient load/store of constant 0 (and +0.0)
- Improved swapping of floats/doubles in registers
- Use kNoOutputOverlap wherever possible
- More efficient 64-bit integer comparison with 0
- More efficient load of integer constants of the form (2**n)-1
Change-Id: Ic2914d8865aa6616b9a0b21b3cc173d4477eb8c7
Alexey Frunze [Wed, 23 Sep 2015 22:12:39 +0000 (15:12 -0700)]
MIPS64: Improve integer division by constants
This also removes some unused instructions and instructions not
available on MIPS64R6.
Change-Id: I44bfe12c60344312c88c45e97b6b07dcd5bdc630
Vladimir Marko [Fri, 6 Nov 2015 12:57:55 +0000 (12:57 +0000)]
Optimizing: Remove unused ArtMethod* input from HInvokeStaticOrDirect.
Change-Id: Iea99fa683440673ff517e246f35fade96600f229
David Brazdil [Fri, 6 Nov 2015 19:38:48 +0000 (19:38 +0000)]
Merge "ART: Fix simplification of catch blocks in the presence of dead code"
am:
b203aad7a0
* commit '
b203aad7a0db904efa8429d48b53e56583f61ec2':
ART: Fix simplification of catch blocks in the presence of dead code
David Brazdil [Fri, 6 Nov 2015 19:36:29 +0000 (19:36 +0000)]
Merge "ART: Fix simplification of catch blocks in the presence of dead code"
David Brazdil [Thu, 5 Nov 2015 21:25:24 +0000 (21:25 +0000)]
ART: Fix simplification of catch blocks in the presence of dead code
Simplification of catch blocks transforms the code so that catch
blocks have only exceptional predecessors. However, it is invoked
before trivially dead code is eliminated which breaks simple
assumptions such as the fact that a catch block cannot start with
move-exception if it has non-exceptional predecessors. This patch
fixes the algorithm to work under these relaxed conditions.
Bug:
25494450
Bug:
25492628
Change-Id: Idc8d010102a4b8b9a6cd918b98d6e11d1838db0c
Tamas Berghammer [Fri, 6 Nov 2015 18:55:42 +0000 (18:55 +0000)]
Merge "Mark __jit_debug_register_code as a unique symbol"
am:
52960cd1ae
* commit '
52960cd1ae1992522c8bae82fa872be49417187e':
Mark __jit_debug_register_code as a unique symbol
Tamas Berghammer [Fri, 6 Nov 2015 18:53:52 +0000 (18:53 +0000)]
Merge "Mark __jit_debug_register_code as a unique symbol"
Tamas Berghammer [Wed, 2 Sep 2015 10:24:33 +0000 (11:24 +0100)]
Mark __jit_debug_register_code as a unique symbol
This symbol is used to notify the debugger about JIT library load/unload
events. Because of ICF, several functions with the same body put to the
same adress by the linker what causes the debugger to get notifictaion
about JIT load/unload events in several case where it isn't really happened.
This change disable ICF for the __jit_debug_register_code symbol to prevent
this behavior with keeping the symbol unique in the object file.
Change-Id: I392be25d8a07f47f8217bf693c8e5919d29cac7b
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)"
Alex Light [Fri, 6 Nov 2015 18:01:11 +0000 (18:01 +0000)]
Revert "Revert "Use Jack lang dev version for compiling art tests""
This reverts commit
a5a79b6607471371bb80ff8fee36dbf05c807ee5.
Change-Id: Ie890882c1c344099fbf58abce022b2815e809e78
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."
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:18:27 +0000 (14:18 +0000)]
Fix interaction between JIT and instrumentation.
- The JIT needs to go through the instrumentation to update
entry points.
- The instrumention needs to know if a method got JITted
to know if needs to deoptimize.
bug:
25438583
Change-Id: I4b186a1da9f4a3fb329efd052a774d5502a902a1
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: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: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: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: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: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: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"