OSDN Git Service
Dmitriy Ivanov [Wed, 27 May 2015 23:40:58 +0000 (23:40 +0000)]
am
38bb2ab8: Merge "Fix valgrind includes"
* commit '
38bb2ab825f83488ec38c9b07072da0f53777867':
Fix valgrind includes
Dmitriy Ivanov [Wed, 27 May 2015 23:29:03 +0000 (23:29 +0000)]
Merge "Fix valgrind includes"
Dmitriy Ivanov [Wed, 27 May 2015 22:56:36 +0000 (22:56 +0000)]
am
d99aae11: Merge "Reset libc targetSdkVersion"
* commit '
d99aae117984dc655abbd408d1caa7cc09e4e6c8':
Reset libc targetSdkVersion
Andreas Gampe [Wed, 27 May 2015 22:56:34 +0000 (22:56 +0000)]
am
33d75bc7: Merge "ART: Fix VerifyObject runtime verification"
* commit '
33d75bc75c72db7e5b1ea4ad0be287b1dfd72e69':
ART: Fix VerifyObject runtime verification
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:48:52 +0000 (21:48 +0000)]
am
65efe919: Merge "Split .oat_patches to multiple sections."
* commit '
65efe9192390187674108b9c895ba225628bb07b':
Split .oat_patches to multiple sections.
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:26:40 +0000 (17:26 +0000)]
am
13df71ce: Merge "Bring Reference Type Propagation to NewArray"
* commit '
13df71cea8c774d28e834497288f67cb2bbb16b0':
Bring Reference Type Propagation to NewArray
Roland Levillain [Wed, 27 May 2015 17:26:38 +0000 (17:26 +0000)]
am
55bf5b4f: Merge "Improve art::CodeInfo dumping."
* commit '
55bf5b4f1a570fb10d7ba8c91ac49c6bc16639ac':
Improve art::CodeInfo dumping.
Roland Levillain [Wed, 27 May 2015 17:26:37 +0000 (17:26 +0000)]
am
19b6ab4c: Merge "Rename VisitCondition\'s argument in code generators."
* commit '
19b6ab4c71a1eafad755648820fa23306a4d0fb4':
Rename VisitCondition's argument in code generators.
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
Nicolas Geoffray [Wed, 27 May 2015 14:30:29 +0000 (14:30 +0000)]
am
6c70104d: Merge "[optimizing] x86: Prefer add over lea if possible"
* commit '
6c70104dc3ecd66b46f56cae068a14e12021c9f2':
[optimizing] x86: Prefer add over lea if possible
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:39:49 +0000 (13:39 +0000)]
am
f109cd22: Merge "ART: Use kBadFprBase on mips64 and arm64."
* commit '
f109cd2215ba23dac23a15eb64ad21ef2b15843c':
ART: Use kBadFprBase on mips64 and arm64.
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:26:38 +0000 (13:26 +0000)]
am
382f5c24: Merge "Fix another source of undeterministic inlining."
* commit '
382f5c24eb663ca8fa39a94a038349138a00272a':
Fix another source of undeterministic inlining.
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:21:15 +0000 (11:21 +0000)]
am
00f09ff9: Merge "Pass the dex method index directly to interface trampoline."
* commit '
00f09ff93480d5f43aaf657650a59d57330184aa':
Pass the dex method index directly to interface trampoline.
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 03:09:05 +0000 (03:09 +0000)]
am
ec1170a4: Merge "Add missing oatdump test dependency"
* commit '
ec1170a4bf9d1c0baa00640d2cbc1e6870bc7f68':
Add missing oatdump test dependency
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:42:45 +0000 (01:42 +0000)]
am
7c1a58bb: Merge "Add oatdump test"
* commit '
7c1a58bb2316fc5bc47b35ed9772454d2d061352':
Add oatdump test
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 22:01:39 +0000 (22:01 +0000)]
am
eabafcef: Merge "Fix alloc-dealloc-mismatch (new[] vs delete) in tests."
* commit '
eabafcefca8ead8309dccc1c5510e6e0845e471d':
Fix alloc-dealloc-mismatch (new[] vs delete) in tests.
David Srbecky [Tue, 26 May 2015 22:01:37 +0000 (22:01 +0000)]
am
2dde2a17: Merge "Switch to using .debug_frame for CFI."
* commit '
2dde2a17bfeca795d2ab17795952770487d848b0':
Switch to using .debug_frame for CFI.
David Srbecky [Tue, 26 May 2015 22:01:36 +0000 (22:01 +0000)]
am
6f3891ce: Merge "Generate just single ARM mapping symbol."
* commit '
6f3891cea11de6e247111563f49136e222f02b1c':
Generate just single ARM mapping symbol.
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 20:01:33 +0000 (20:01 +0000)]
am
e83635d0: Merge "Fix mac build: cast fpr callee save addresses."
* commit '
e83635d05b80d7e933f868431f6043aef04fd589':
Fix mac build: cast fpr callee save addresses.
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:30:23 +0000 (19:30 +0000)]
am
5c592b59: Merge "Fix mac build: include <sys/time.h> in time_utils.cc ."
* commit '
5c592b598742569be4819bdc0e32242a4e1a7693':
Fix mac build: include <sys/time.h> in time_utils.cc .
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:53:58 +0000 (17:53 +0000)]
am
dc31313c: Merge "ART: Clean up arm64 kNumberOfXRegisters usage."
* commit '
dc31313c4577bb4c00d90774159c84e738ed348d':
ART: Clean up arm64 kNumberOfXRegisters usage.
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:15:38 +0000 (17:15 +0000)]
am
03b5a398: Merge "Fix for potential moving GC bugs around proxy class."
* commit '
03b5a398a96ea29c39ddfe3d810245b868d2871f':
Fix for potential moving GC bugs around proxy class.
Hiroshi Yamauchi [Tue, 26 May 2015 17:15:36 +0000 (17:15 +0000)]
am
1b742fcc: Merge "Log the process memory maps on host SIGSEGV."
* commit '
1b742fccf9ca68b783fdbd559a3fcbdafab48852':
Log the process memory maps on host SIGSEGV.
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:46:34 +0000 (14:46 +0000)]
am
c06841da: Merge "Fix a few literals and assertions."
* commit '
c06841dac1443e99e92596f15caa82c99bfee010':
Fix a few literals and assertions.
Nicolas Geoffray [Tue, 26 May 2015 14:46:33 +0000 (14:46 +0000)]
am
41f27292: Merge "Move the catalog after the stack maps."
* commit '
41f27292e10792165bfdf67b9a35ccaea1a6872e':
Move the catalog after the stack maps.
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:23:04 +0000 (14:23 +0000)]
am
9470f045: Merge "Make inlining deterministic."
* commit '
9470f045c89cdb3de5175266bda523b8a1c2d96d':
Make inlining deterministic.
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:34:44 +0000 (13:34 +0000)]
am
ce63cf65: Merge "ART: Update graph\'s exit block field if removed"
* commit '
ce63cf656bb5b25051d580a58086f4bf15fb878b':
ART: Update graph's exit block field if removed
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:10:55 +0000 (13:10 +0000)]
am
092a5656: Merge "JDWP: fix breakpoint on catch statement"
* commit '
092a5656937a319449346e8c356f3f4c2870d81c':
JDWP: fix breakpoint on catch statement
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:12:13 +0000 (10:12 +0000)]
am
8a8d8252: Merge "Do not use dex_compilation_unit after inlining."
* commit '
8a8d8252f52bec14a8fe2b6f88e1f184c63cf351':
Do not use dex_compilation_unit after inlining.
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:21:13 +0000 (23:21 +0000)]
am
ca27be7a: Merge "ARM64: Move xSELF from x18 to x19."
* commit '
ca27be7a95e1b238c76a4a5fccaad2a3416766c2':
ARM64: Move xSELF from x18 to x19.
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:37:06 +0000 (22:37 +0000)]
am
e7654e5a: Merge "Revert "Switch to using ELF-64 for 64-bit architectures.""
* commit '
e7654e5ab8668d14aab0d4bf1b3631ef150b36dd':
Revert "Switch to using ELF-64 for 64-bit architectures."
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:55:02 +0000 (14:55 +0000)]
am
8c83ef7a: Merge "Return an invalid StackMap when one cannot be found."
* commit '
8c83ef7abff3b96d9551da6b1c0c68497617f3f7':
Return an invalid StackMap when one cannot be found.
Nicolas Geoffray [Fri, 22 May 2015 14:55:01 +0000 (14:55 +0000)]
am
bacdffbe: Merge "Revert "Revert "Introduce a NearLabel in thumb2."""
* commit '
bacdffbeed9ee3671854a1ec3d3aa169a4fb765e':
Revert "Revert "Introduce a NearLabel in thumb2.""
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 22:05:01 +0000 (22:05 +0000)]
am
aa49c23d: Merge "ART: Sometimes even empty methods take forever to verify"
* commit '
aa49c23d47e5fdfcf51380550ee864e9d30d082b':
ART: Sometimes even empty methods take forever to verify
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:37:04 +0000 (17:37 +0000)]
am
559b178e: Merge "Update failures"
* commit '
559b178e34c5d92e7932f92e5d8a981ac334606f':
Update failures
Nicolas Geoffray [Thu, 21 May 2015 17:24:31 +0000 (17:24 +0000)]
Merge "Update failures"
Andreas Gampe [Thu, 21 May 2015 17:20:44 +0000 (17:20 +0000)]
am
12beecf8: Merge "ART: Blacklist CFI test for Heap Poisoning"
* commit '
12beecf84130780915c1bdc97d80f9715ce941d2':
ART: Blacklist CFI test for Heap Poisoning
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