OSDN Git Service
Nicolas Geoffray [Thu, 28 May 2015 09:27:40 +0000 (09:27 +0000)]
Merge "Fix rule: the exe must be first dependency."
Nicolas Geoffray [Thu, 28 May 2015 09:21:03 +0000 (10:21 +0100)]
Fix rule: the exe must be first dependency.
Change-Id: Ic59a0c38ae8d7d1efc439014e694a95063a7589d
Nicolas Geoffray [Thu, 28 May 2015 08:37:21 +0000 (08:37 +0000)]
Merge "Refactor makefiles to allow just building tests."
Nicolas Geoffray [Wed, 27 May 2015 18:10:27 +0000 (19:10 +0100)]
Refactor makefiles to allow just building tests.
Also add a way to avoid syncing to the device, in case
a previous sync did it.
Change-Id: I38673cad712f8ddff641589cea50ca0d0dc04850
David Srbecky [Thu, 28 May 2015 01:04:02 +0000 (01:04 +0000)]
Merge "Fix build - large frame size of ElfWriterQuick<ElfTypes>::Write (again)."
David Srbecky [Wed, 27 May 2015 23:59:08 +0000 (00:59 +0100)]
Fix build - large frame size of ElfWriterQuick<ElfTypes>::Write (again).
Change-Id: I8a3277835f22a23c31063eda9b7f1fdc9423a5b0
Dmitriy Ivanov [Wed, 27 May 2015 23:29:03 +0000 (23:29 +0000)]
Merge "Fix valgrind includes"
Dmitriy Ivanov [Wed, 27 May 2015 22:44:25 +0000 (22:44 +0000)]
Merge "Reset libc targetSdkVersion"
Andreas Gampe [Wed, 27 May 2015 22:41:30 +0000 (22:41 +0000)]
Merge "ART: Fix VerifyObject runtime verification"
Dmitriy Ivanov [Wed, 27 May 2015 22:34:38 +0000 (15:34 -0700)]
Fix valgrind includes
external/valgrind structure has been changed
to reflect upstream projects struture.
Making corresponding changes to art includes.
Change-Id: I2434a270f88502528df82c4820afedb002b65b8d
David Srbecky [Wed, 27 May 2015 21:39:29 +0000 (21:39 +0000)]
Merge "Split .oat_patches to multiple sections."
Dmitriy Ivanov [Sat, 23 May 2015 01:03:34 +0000 (18:03 -0700)]
Reset libc targetSdkVersion
This will let libc/linker know which sdk version
is targeted by the app. This is needed to work around
incorrect DT_NEEDED entries in old apps.
Bug: http://b/
21364029
Change-Id: I2f2907104106aac6c8831381ca171dc0302e6a9d
Nicolas Geoffray [Wed, 27 May 2015 17:13:03 +0000 (17:13 +0000)]
Merge "Bring Reference Type Propagation to NewArray"
Guillaume "Vermeille" Sanchez [Wed, 20 May 2015 11:42:25 +0000 (12:42 +0100)]
Bring Reference Type Propagation to NewArray
Change-Id: Ieff4f38854e06b0ed4b5689ced94a4289053d80d
Roland Levillain [Wed, 27 May 2015 16:01:50 +0000 (16:01 +0000)]
Merge "Improve art::CodeInfo dumping."
Roland Levillain [Wed, 27 May 2015 16:01:13 +0000 (16:01 +0000)]
Merge "Rename VisitCondition's argument in code generators."
Roland Levillain [Wed, 27 May 2015 15:39:19 +0000 (16:39 +0100)]
Rename VisitCondition's argument in code generators.
This argument is a condition instruction, not a comparison.
Change-Id: I026f799d2161df58b0c8a84600eb8fffd6f7b998
Andreas Gampe [Wed, 27 May 2015 04:34:09 +0000 (21:34 -0700)]
ART: Fix VerifyObject runtime verification
Update some bit-rotted code to work again. Most tests now work, for
some the verification overhead results in a timeout.
Change-Id: Ieab4f2de474a05e915e24abc93da3c2eeed996eb
Roland Levillain [Wed, 27 May 2015 14:12:19 +0000 (15:12 +0100)]
Improve art::CodeInfo dumping.
- Refactor existing dumping code into a set of new routines.
- Use art::Indenter to properly indent in the output.
- Add an additional argument to art::CodeInfo::Dump to
enable or disable the dumping of stack maps and Dex
register maps.
Change-Id: I52814095ff465522302d5d69d416726369ca5258
Nicolas Geoffray [Wed, 27 May 2015 14:17:08 +0000 (14:17 +0000)]
Merge "[optimizing] x86: Prefer add over lea if possible"
Mark Mendell [Wed, 27 May 2015 14:08:24 +0000 (10:08 -0400)]
[optimizing] x86: Prefer add over lea if possible
Looking at some generated code, I noticed an lea being used when an add
was sufficient. Check for that case, and generate the add.
Fixed for x86 and x86_64.
Change-Id: I110304ff0fed8837ada96d34353a293d29022ce5
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Vladimir Marko [Wed, 27 May 2015 13:32:57 +0000 (13:32 +0000)]
Merge "ART: Use kBadFprBase on mips64 and arm64."
Nicolas Geoffray [Wed, 27 May 2015 13:14:27 +0000 (13:14 +0000)]
Merge "Fix another source of undeterministic inlining."
Vladimir Marko [Wed, 27 May 2015 13:07:08 +0000 (14:07 +0100)]
ART: Use kBadFprBase on mips64 and arm64.
Fix incorrect usage of kBadGprBase to avoid misleading and
ambiguous data in crash investigations.
Bug:
21266656
Change-Id: I1de6cd621d770be586f8140e86833769865b42c6
Nicolas Geoffray [Wed, 27 May 2015 11:53:36 +0000 (12:53 +0100)]
Fix another source of undeterministic inlining.
bug:
20037935
Change-Id: Ifad234a331ec616f065aabc65576c5636ad8ec21
Nicolas Geoffray [Wed, 27 May 2015 11:08:51 +0000 (11:08 +0000)]
Merge "Pass the dex method index directly to interface trampoline."
Nicolas Geoffray [Tue, 26 May 2015 15:29:08 +0000 (16:29 +0100)]
Pass the dex method index directly to interface trampoline.
This avoids computing the dex pc and re-finding the method
index again. I have kept the code for kDebugBuild.
Change-Id: Icd60e0deade755e32b54021c0875b1af592b8c3e
Mathieu Chartier [Wed, 27 May 2015 02:57:09 +0000 (02:57 +0000)]
Merge "Add missing oatdump test dependency"
Mathieu Chartier [Wed, 27 May 2015 02:48:16 +0000 (19:48 -0700)]
Add missing oatdump test dependency
Bug:
18000316
Change-Id: Ic828e8be8e5d3ef7e112facd0db57013740d449a
Mathieu Chartier [Wed, 27 May 2015 01:27:16 +0000 (01:27 +0000)]
Merge "Add oatdump test"
Mathieu Chartier [Tue, 26 May 2015 21:44:35 +0000 (14:44 -0700)]
Add oatdump test
Bug:
18000316
Change-Id: Ic22d63dc64a9b7a492b5e6bfbd4c75f30c35dfd5
David Srbecky [Fri, 22 May 2015 16:04:47 +0000 (17:04 +0100)]
Split .oat_patches to multiple sections.
.oat_patches section currently contains encoded patch locations for
several other sections. Split it to several sections - one for each
of the destination sections. For example, .text.oat_patches section
contains patch locations for the .text section.
This ensures that if we strip some the sections using standard
tools, we strip the corresponding .oat_patches section as well.
It also makes the overall design simpler.
I should have done it this way in the first place.
Since ApplyOatPatches has been simplified and uses unaligned memory
access, this also fixes bug
21403573.
Bug:
20556771
Bug:
21403573
Change-Id: Iae7c423911507b524eec500e8d61744046fcd3ba
Evgenii Stepanov [Tue, 26 May 2015 21:49:25 +0000 (21:49 +0000)]
Merge "Fix alloc-dealloc-mismatch (new[] vs delete) in tests."
David Srbecky [Tue, 26 May 2015 21:46:40 +0000 (21:46 +0000)]
Merge "Switch to using .debug_frame for CFI."
David Srbecky [Tue, 26 May 2015 21:45:59 +0000 (21:45 +0000)]
Merge "Generate just single ARM mapping symbol."
Evgenii Stepanov [Tue, 26 May 2015 21:44:23 +0000 (14:44 -0700)]
Fix alloc-dealloc-mismatch (new[] vs delete) in tests.
Change-Id: I680eaf819f7d7d3a4149c833b6739cba4b7e21be
Vladimir Marko [Tue, 26 May 2015 19:51:30 +0000 (19:51 +0000)]
Merge "Fix mac build: cast fpr callee save addresses."
Vladimir Marko [Tue, 26 May 2015 19:42:30 +0000 (20:42 +0100)]
Fix mac build: cast fpr callee save addresses.
Bring back reinterpret_cast<>s removed by
https://android-review.googlesource.com/151309 .
They are needed for mac builds.
Bug :
13925192
Change-Id: I7728c39a867a278000c84d75440b31e818c3bfcf
Vladimir Marko [Tue, 26 May 2015 19:19:44 +0000 (19:19 +0000)]
Merge "Fix mac build: include <sys/time.h> in time_utils.cc ."
Vladimir Marko [Tue, 26 May 2015 18:57:30 +0000 (19:57 +0100)]
Fix mac build: include <sys/time.h> in time_utils.cc .
Required for gettimeofday(). Not needed in utils.cc .
Bug:
13925192
Change-Id: If06840d8a47c9193ccc7bd4cee5c16fcf76d9729
Vladimir Marko [Tue, 26 May 2015 17:42:31 +0000 (17:42 +0000)]
Merge "ART: Clean up arm64 kNumberOfXRegisters usage."
Hiroshi Yamauchi [Tue, 26 May 2015 17:02:43 +0000 (17:02 +0000)]
Merge "Fix for potential moving GC bugs around proxy class."
Hiroshi Yamauchi [Tue, 26 May 2015 17:01:24 +0000 (17:01 +0000)]
Merge "Log the process memory maps on host SIGSEGV."
Hiroshi Yamauchi [Thu, 21 May 2015 19:05:27 +0000 (12:05 -0700)]
Fix for potential moving GC bugs around proxy class.
- Handlerize proxy_class which is live across multiple allocation
points in ClassLinker::CreateProxyClass().
- In ClassLinker::CreateProxyClass(), insert a proxy class into the
class table before creating ArtFields for it (and update it later in
LinkClass()) because the field roots (ArtField::declaring_class_)
won't be updated by GC unless the class is in the class table. If GC
happens before they are updated by FixupTemporaryDeclaringClass()
from LinkClass(), FixupTemporaryDeclaringClass() may not update the
field roots correctly because the old class may already be moved but
the fields roots may not. Reduce a window of time where the fields
roots could be stale.
- In ClassLinker::LinkClass(), directly wrap a new class in a handle
to avoid a window of time where new_class may be potentially stale.
- Print more diagnostic info about the holder of the field upon a mark
sweep invalid ref crash.
- Add an additional sanity check in Field::GetArtField().
(cherry pick commit
08d1b5f2296c0f51507b8b443f4e39dfc161572c)
Bug:
20557050
Change-Id: I9ad32d304922da96b7e1fad262d97de21cbac776
Vladimir Marko [Tue, 19 May 2015 17:08:00 +0000 (18:08 +0100)]
ART: Clean up arm64 kNumberOfXRegisters usage.
Avoid undefined behavior for arm64 stemming from 1u << 32 in
loops with upper bound kNumberOfXRegisters.
Create iterators for enumerating bits in an integer either
from high to low or from low to high and use them for
<arch>Context::FillCalleeSaves() on all architectures.
Refactor runtime/utils.{h,cc} by moving all bit-fiddling
functions to runtime/base/bit_utils.{h,cc} (together with
the new bit iterators) and all time-related functions to
runtime/base/time_utils.{h,cc}. Improve test coverage and
fix some corner cases for the bit-fiddling functions.
Bug:
13925192
Change-Id: I704884dab15b41ecf7a1c47d397ab1c3fc7ee0f7
Roland Levillain [Tue, 26 May 2015 14:43:33 +0000 (14:43 +0000)]
Merge "Fix a few literals and assertions."
Nicolas Geoffray [Tue, 26 May 2015 14:34:57 +0000 (14:34 +0000)]
Merge "Move the catalog after the stack maps."
Nicolas Geoffray [Tue, 26 May 2015 14:22:58 +0000 (15:22 +0100)]
Move the catalog after the stack maps.
Fetching a stack map should be cheap, and therefore we should
not compute the size of the catalog.
Change-Id: Iff6accb7832bdfa6d209a0928d6088b8b57c1aa4
Nicolas Geoffray [Tue, 26 May 2015 14:12:51 +0000 (14:12 +0000)]
Merge "Make inlining deterministic."
Roland Levillain [Tue, 26 May 2015 14:02:07 +0000 (15:02 +0100)]
Fix a few literals and assertions.
Change-Id: I0a1e9db607ec7325e17568b034ba90e68d2298f9
Nicolas Geoffray [Tue, 26 May 2015 13:35:06 +0000 (14:35 +0100)]
Make inlining deterministic.
Only the case where two methods are not in the same dex
file could lead to undeterministic behavior.
bug:
20037935
Change-Id: I1a7642a979302b17e76d196894437c1aacbbbe9d
David Brazdil [Tue, 26 May 2015 13:23:51 +0000 (13:23 +0000)]
Merge "ART: Update graph's exit block field if removed"
Sebastien Hertz [Tue, 26 May 2015 13:00:34 +0000 (13:00 +0000)]
Merge "JDWP: fix breakpoint on catch statement"
David Brazdil [Tue, 26 May 2015 11:05:55 +0000 (12:05 +0100)]
ART: Update graph's exit block field if removed
Running DCE on an infinite loop will delete the exit block but the
corresponding field is currently not cleared in the parent graph.
This does not cause any problems at the moment as that information is
only used in codegens to DCHECK that a block is not the exit block.
However, it will be necessary to update the inliner once we start to
inline methods with loops.
With this patch, DCE will update the HGraph::exit_block_ field. DCHECK
was also added to HGraph::InlineInto to make sure that the inlined
graph does have an exit block.
Change-Id: Ia8ddca375bbc6830cd919af6059a52cc9b73a023
Sebastien Hertz [Tue, 26 May 2015 09:53:39 +0000 (11:53 +0200)]
JDWP: fix breakpoint on catch statement
Setting a breakpoint on a catch statement in the source actually
installs the breakpoint on a DEX move-exception instruction. At this
point, an exception is pending in the current thread.
The issue is no exception must be pending in the current thread to
report the breakpoint event. This is required to be able to call JNI
functions to create JDWP ids.
This CL fixes it by clearing the pending exception before reporting
event and restore it after reporting the event.
Bug:
21382373
Change-Id: Id3c60cca398135a3e0859a1ccb645b9c99d5ca76
Nicolas Geoffray [Tue, 26 May 2015 10:02:31 +0000 (10:02 +0000)]
Merge "Do not use dex_compilation_unit after inlining."
Hiroshi Yamauchi [Sat, 23 May 2015 01:15:10 +0000 (18:15 -0700)]
Log the process memory maps on host SIGSEGV.
Bug:
19894268
Change-Id: Ib35f858de2519e24422a2ed19c68cfbdfd4173b3
Andreas Gampe [Fri, 22 May 2015 23:07:36 +0000 (23:07 +0000)]
Merge "ARM64: Move xSELF from x18 to x19."
Hiroshi Yamauchi [Fri, 22 May 2015 22:30:43 +0000 (22:30 +0000)]
Merge "Revert "Switch to using ELF-64 for 64-bit architectures.""
Hiroshi Yamauchi [Fri, 22 May 2015 22:28:59 +0000 (22:28 +0000)]
Revert "Switch to using ELF-64 for 64-bit architectures."
This reverts commit
a3a49fe863e0bcf423ed0b4082136d1439fb2e79.
Change-Id: I0afabec15f5d9110de0d4105cbab7d040f2b86e2
Nicolas Geoffray [Fri, 22 May 2015 14:45:52 +0000 (14:45 +0000)]
Merge "Return an invalid StackMap when one cannot be found."
Nicolas Geoffray [Fri, 22 May 2015 14:45:36 +0000 (14:45 +0000)]
Merge "Revert "Revert "Introduce a NearLabel in thumb2."""
Nicolas Geoffray [Fri, 22 May 2015 14:37:09 +0000 (15:37 +0100)]
Do not use dex_compilation_unit after inlining.
It's incompatible with inlining, as inlined invokes/load class/new
can be from another dex file.
Change-Id: I8897b6a012942bc8e136f2bea70252d3fb3a7fa5
Nicolas Geoffray [Thu, 21 May 2015 12:32:34 +0000 (12:32 +0000)]
Revert "Revert "Introduce a NearLabel in thumb2.""
This reverts commit
1f277e3cef6c33cd35e91123978491d83338d2ad.
- Fix CompareAndBranch to not use cbz/cbnz with high registers.
- Add a test for CompareAndBranch with the *inc file, as the
other assembler test infrastructure does not handle labels.
Change-Id: If552bf1112b96caa3b9bb6c73c4b40bb90a33db7
Nicolas Geoffray [Fri, 22 May 2015 13:01:33 +0000 (14:01 +0100)]
Return an invalid StackMap when one cannot be found.
This avoids aborting when handling a crash.
Change-Id: Ie5b5d48061fa9258b349b0284f7b00c5855d9fbd
David Srbecky [Thu, 21 May 2015 18:11:18 +0000 (19:11 +0100)]
Generate just single ARM mapping symbol.
It is unnecessary to keep repeating the $t symbol if there
are no $d symbols. The last $t should still be in effect.
This shrinks the .symtab section by half.
Change-Id: Ic57c8c2d412c10f0d040e966379ec524ece87d4a
Serban Constantinescu [Wed, 22 Apr 2015 15:24:46 +0000 (16:24 +0100)]
ARM64: Move xSELF from x18 to x19.
This patch moves xSELF to callee saved x19 and removes support for
ETR (external thread register), previously used across native calls.
Change-Id: Icee07fbb9292425947f7de33d10a0ddf98c7899b
Signed-off-by: Serban Constantinescu <serban.constantinescu@linaro.org>
Andreas Gampe [Thu, 21 May 2015 21:57:46 +0000 (21:57 +0000)]
Merge "ART: Sometimes even empty methods take forever to verify"
Andreas Gampe [Thu, 21 May 2015 21:06:46 +0000 (14:06 -0700)]
ART: Sometimes even empty methods take forever to verify
In cases of very high load and/or bad scheduling, the verifier may
take longer than the threshold duration to verify an empty method.
The LargeMethod detection needs to accept that the code_item may
be null.
Bug:
21364300
(cherry picked from commit
8110447356f559688d6290563e912af7f8d4709b)
Change-Id: Iceff3e4688cc1a5fe7a836f7a9bf6c49a392b618
Nicolas Geoffray [Thu, 21 May 2015 17:24:31 +0000 (17:24 +0000)]
Merge "Update failures"
Andreas Gampe [Thu, 21 May 2015 17:09:21 +0000 (17:09 +0000)]
Merge "ART: Blacklist CFI test for Heap Poisoning"
Andreas Gampe [Thu, 21 May 2015 17:01:42 +0000 (10:01 -0700)]
ART: Blacklist CFI test for Heap Poisoning
The test expects Java frames on the stack.
Change-Id: I19e7429f06fac107c2cf9f85325e8f071e5799fb
Wojciech Staszkiewicz [Thu, 21 May 2015 16:43:09 +0000 (17:43 +0100)]
Update failures
Some failures have been removed too eagerly, this CL reverts that.
Change-Id: I897b1b7f936d2c001c44db604905c22242797e46
David Srbecky [Thu, 21 May 2015 15:36:21 +0000 (15:36 +0000)]
Merge "Write 64-bit address in DWARF if we are on 64-bit architecture."
Nicolas Geoffray [Thu, 21 May 2015 15:00:46 +0000 (15:00 +0000)]
Merge "Update libcore failures"
Wojciech Staszkiewicz [Thu, 21 May 2015 14:29:30 +0000 (15:29 +0100)]
Update libcore failures
Updated libcore failures.
Change-Id: I570846220c5b4dea43fd39a4a777c37eb3595a08
David Srbecky [Thu, 21 May 2015 13:03:48 +0000 (14:03 +0100)]
Switch to using .debug_frame for CFI.
This will make it easier to strip or compress CFI using standard tools.
It also saves some space since we do not need .eh_frame_hdr anymore.
Bug:
20556771
Change-Id: I8656b1ff248e4b12cb94924800c3a91fac8bdda4
Roland Levillain [Thu, 21 May 2015 12:49:31 +0000 (12:49 +0000)]
Merge "Fix the size of a StackHandleScope in art::CompilerDriver."
Nicolas Geoffray [Thu, 21 May 2015 12:26:43 +0000 (12:26 +0000)]
Merge "Revert "Introduce a NearLabel in thumb2.""
Nicolas Geoffray [Thu, 21 May 2015 12:26:31 +0000 (12:26 +0000)]
Revert "Introduce a NearLabel in thumb2."
Fails some benchmarks and libcore tests.
This reverts commit
db0bbab279534974dca507946c66cff2d05dc9f9.
Change-Id: I5d1afef5ede87e65d61f49529027c5c2f35b17fb
Nicolas Geoffray [Thu, 21 May 2015 11:11:17 +0000 (11:11 +0000)]
Merge "Also encode the InvokeType in an InlineInfo."
Nicolas Geoffray [Wed, 20 May 2015 17:48:31 +0000 (18:48 +0100)]
Also encode the InvokeType in an InlineInfo.
This will be needed to recover the call stack.
Change-Id: I2fe10785eb1167939c8cce1862b2d7f4066e16ec
David Brazdil [Thu, 21 May 2015 11:08:59 +0000 (11:08 +0000)]
Merge "ART: Rename graph dump file name to 'graph.cfg'"
David Brazdil [Thu, 21 May 2015 11:06:13 +0000 (12:06 +0100)]
ART: Rename graph dump file name to 'graph.cfg'
Change-Id: I91f6a6bf5efac5b3bba92b9a89e22e1b7be6e02f
David Brazdil [Thu, 21 May 2015 10:38:41 +0000 (10:38 +0000)]
Merge "ART: Implement next-line assertions in Checker"
Nicolas Geoffray [Thu, 21 May 2015 10:29:26 +0000 (10:29 +0000)]
Merge "Introduce a NearLabel in thumb2."
David Brazdil [Tue, 19 May 2015 17:29:40 +0000 (18:29 +0100)]
ART: Implement next-line assertions in Checker
Some tests require verifying an exact sequence of lines in the graph
dump. This was already possible by inserting 'CHECK-NOT: {{.*}}'
between the individual lines, but hardly a convenient way of doing so.
This patch introduces a new 'CHECK-NEXT' kind of assertions that
replaces the old method and will become useful for testing assembly.
Change-Id: I1bb951707bda44320166dc7ef828866a6957a113
David Brazdil [Thu, 21 May 2015 09:16:24 +0000 (09:16 +0000)]
Merge "ART: Refactor and simplify matching in Checker"
David Brazdil [Wed, 20 May 2015 13:57:54 +0000 (14:57 +0100)]
ART: Refactor and simplify matching in Checker
Change-Id: Ib8a2b51488f66a7239e799f5fa5910b4ac2dfe08
Jeff Hao [Thu, 21 May 2015 02:17:02 +0000 (02:17 +0000)]
Merge "Intercept JNI invocation of String.<init> methods."
Jeff Hao [Wed, 20 May 2015 03:30:23 +0000 (20:30 -0700)]
Intercept JNI invocation of String.<init> methods.
libmono uses JNI AllocObject and CallNonvirtualVoidMethod to create and
initialize a string instead of using the recommended NewObject. This
change adds an intercept to change the String.<init> call to a
StringFactory call instead. Then, it uses the object id of the original
string object referrer and maps it to the result of the StringFactory.
Bug:
21288130
(cherry picked from commit
15e9ad1d028d7f12cb598b075453173532a00d91)
Change-Id: I3421c43722c07397da4a398c2ca9110e1d40bcfa
Andreas Gampe [Thu, 21 May 2015 01:03:10 +0000 (01:03 +0000)]
Merge "ART: Use v2 version of NativeBridge struct"
Andreas Gampe [Thu, 21 May 2015 01:01:30 +0000 (18:01 -0700)]
ART: Use v2 version of NativeBridge struct
Update the struct to the new version, but without implementation.
Bug:
20217701
Change-Id: Ic23a60b949f119c7d8b0e7cb27a61e6c16532a23
Hiroshi Yamauchi [Thu, 21 May 2015 00:52:25 +0000 (00:52 +0000)]
Merge "Fix a cts crash around proxy class fields."
Hiroshi Yamauchi [Wed, 20 May 2015 22:51:29 +0000 (15:51 -0700)]
Fix a cts crash around proxy class fields.
org.apache.harmony.tests.java.io.SerializationStressTest4#test_writeObject_Proxy
As the static fields of proxy classes share the dex file indices, they
shouldn't be resolved in the dex cache or else Field::GetArtField()
may return a wrong art field that belong to a different proxy class.
(cherry pick commit
a56ce5e267c9744ed99e40ae5cd9b527971e1d63)
Bug:
20557050
Change-Id: If672c0e67bc49e672e34d75ffbe29c65f5a423b9
Andreas Gampe [Wed, 20 May 2015 23:28:04 +0000 (23:28 +0000)]
Merge "ART: Fix gtest dependency"
Andreas Gampe [Wed, 20 May 2015 23:09:36 +0000 (16:09 -0700)]
ART: Fix gtest dependency
Gtests should depend on the debug version of libart-disassembler.
Bug:
21273194
Change-Id: Iaf216a1c0cff650296ebf83fe4e8352f5614cb28
Andreas Gampe [Wed, 20 May 2015 21:52:35 +0000 (21:52 +0000)]
Merge "ART: Blacklist CFI test for JIT"
Andreas Gampe [Wed, 20 May 2015 21:50:06 +0000 (14:50 -0700)]
ART: Blacklist CFI test for JIT
The test expects Java frames on the stack.
Change-Id: I485a7a2a3d15fb52c207bd8723bed3b01289c000
Andreas Gampe [Wed, 20 May 2015 21:18:27 +0000 (21:18 +0000)]
Merge "ART: Fix RegisterNative order"