OSDN Git Service
Calin Juravle [Fri, 22 Aug 2014 11:53:59 +0000 (12:53 +0100)]
Always setup the native bridge library
... even if the string is empty. This will initialize the native bridge
library but mark it as unavailable.
- also, rename native_bridge_library_path to
native_bridge_library_filename to be closer to the actual meaning (it's
just the filename without any path).
Bug:
16404669.
Change-Id: I94628639691459d48d1fbf0841f36b68d51818e7
buzbee [Wed, 20 Aug 2014 12:54:11 +0000 (12:54 +0000)]
Merge "Quick compiler: fix Arm64 inline locking code" into lmp-dev
buzbee [Tue, 19 Aug 2014 23:47:06 +0000 (16:47 -0700)]
Quick compiler: fix Arm64 inline locking code
The Arm64 monitor enter code was incorrectly comparing the
thread ID to zero rather than the lock value to determine if the
inline fast path was doable. As a result, we ended up always
using the out-of-line case.
This fix delivers a 6% improvement to DeltaBlue.
b/
16707253
Change-Id: I499530da84beecf1f3f5c5ebb666e3eb12599ac0
Brian Carlstrom [Tue, 19 Aug 2014 22:30:21 +0000 (22:30 +0000)]
Merge "Make apps able to run with a failing patchoat" into lmp-dev
Alex Light [Thu, 14 Aug 2014 21:16:26 +0000 (14:16 -0700)]
Make apps able to run with a failing patchoat
Bug:
17000769
(cherry picked from commit
9dcc4572949f6a8231a1b4ed859676ba6f411726)
Change-Id: I0a1a4dc7f5d4bb268530840302ecfb1555231e05
Dave Allison [Tue, 19 Aug 2014 22:08:31 +0000 (22:08 +0000)]
Merge "Workaround problem reading main stack on intel devices." into lmp-dev
Andreas Gampe [Mon, 18 Aug 2014 23:43:12 +0000 (16:43 -0700)]
ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test
On devices which support it, run all jni compiler tests also with
the Generic JNI infrastructure.
Fix art_quick_invoke_stub for ARM32 to enforce 16B stack alignment.
As the native convention does not require as much, the previous
code would keep it unaligned.
Bug:
17107929
(cherry picked from commit
6e498695b60f1532d2264ec6badb1cd6e10ecaa9)
Change-Id: I1481500ff7c627ab4e5bfbfd7245099a639aa049
Dave Allison [Mon, 18 Aug 2014 22:49:51 +0000 (15:49 -0700)]
Workaround problem reading main stack on intel devices.
This works around a problem where ART can't read the lowest page
of the main stack. The workaround is to add 4K to the stack
start address on the main stack on Intel.
Please see https://b2.corp.google.com/issues/
17111575 for
underlying cause.
Bug:
17031544
Change-Id: Ifc3216e10160bb1eec9d989fd57b10345bc89537
Andreas Gampe [Tue, 19 Aug 2014 19:16:29 +0000 (19:16 +0000)]
Merge "ART: Set default visibility to protected" into lmp-dev
Jeff Hao [Tue, 19 Aug 2014 17:17:36 +0000 (10:17 -0700)]
Check for constructor first when installing tracing stubs.
Addresses comments in
https://android-review.googlesource.com/#/c/104383/ made after the commit.
Bug:
16386215
Change-Id: I0e59b8507f601fd6508fbda8d24dd3c98ead1537
Vladimir Marko [Mon, 18 Aug 2014 10:42:51 +0000 (11:42 +0100)]
Disable load/store elimination. DO NOT MERGE
The optimization has several issues and it has been
effectively disabled by
https://android-review.googlesource.com/103511
Disable it completely to avoid wasting compilation time.
Bug:
16862804
Change-Id: I42f69ae64170dc44f5fd6455b6a51c9bd3f93672
Sebastien Hertz [Tue, 19 Aug 2014 09:05:47 +0000 (09:05 +0000)]
Merge "Fix JDWP event races" into lmp-dev
Sebastien Hertz [Mon, 18 Aug 2014 17:26:39 +0000 (19:26 +0200)]
Fix JDWP event races
Fix a race where the JDWP connection could be closed before the VM_DEATH event
is sent during runtime shutdown.
Fix potential race where we could wait forever for the JDWP thread to establish
connection.
Bug:
16720689
Change-Id: I227e0a15a2fd17d7bfe2a66a35d719d558fcd32d
Brian Carlstrom [Tue, 19 Aug 2014 00:42:52 +0000 (00:42 +0000)]
Merge "AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled." into lmp-dev
Brian Carlstrom [Mon, 18 Aug 2014 22:38:34 +0000 (15:38 -0700)]
AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled.
Bug:
17108693
(cherry picked from commit
3ea69c0abce1b81b3c45033867d49b00e6d6b709)
Change-Id: Ide8158cc3e12e604f4fa344cd881fe6f68476ab7
Mathieu Chartier [Mon, 18 Aug 2014 22:02:59 +0000 (15:02 -0700)]
Fix heap corruption and verification.
There was a faulty assumption that space End() was always aligned to
card boundaries. This was true for all spaces other than the image
and resulted in heap corruption when the last object of the image
space contained a reference to an object in another space.
Also fixed an error where we called the pre GC verification post GC.
Bug:
17080623
Change-Id: I041ee564518f53b79c6e8dc2ad782a3152577a4e
Andreas Gampe [Mon, 18 Aug 2014 05:06:15 +0000 (05:06 +0000)]
Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev
Andreas Gampe [Sat, 16 Aug 2014 20:41:10 +0000 (13:41 -0700)]
ART: Do not recursively abort when visiting locks in a bad state
This avoids a nested abort in VisitLocks.
Bug:
17080621,
16382675
Change-Id: Id604976ac9dcac0e319fb25cab4d2cbc98d7ee24
Andreas Gampe [Sat, 16 Aug 2014 05:35:46 +0000 (22:35 -0700)]
ART: Avoid expensive class lookup in compiler driver
When we are not compiling multidex, avoid an expensive by-descriptor
lookup for classes when deciding whether to skip compilation.
Bug:
17072698
Change-Id: I19bcb2a2928207fcae0badd466cdc52945bd37c4
Nicolas Geoffray [Wed, 13 Aug 2014 02:40:45 +0000 (03:40 +0100)]
Fix bugs in the x86 and arm versions of generic JNI.
Also fix the run script of 116-nodex2oat to use the non-prebuild
script for target.
Bug:
17000769
(cherry-picked from commit
54accbca0b549b1b1ad3ef09655dad438bc1e104)
Change-Id: I439fcd710fb8bb408f3288ff8fb34fef23890adb
Nicolas Geoffray [Tue, 22 Jul 2014 09:48:00 +0000 (10:48 +0100)]
Execute an application even when dex2oat crashes.
Bug:
17000769
(cherry picked from commit
4fcdc94d22a4608e355aa8df36240181149d10e8)
Change-Id: Iccb1fec94fe64ce4c3097510952f275482b86aa9
Calin Juravle [Tue, 12 Aug 2014 19:55:20 +0000 (20:55 +0100)]
[ART] Move to system/core native bridge library
Some cleanups on the way:
- move NativeBridgeRuntimeCallbacks from a global to a field
- rename native_bridge_library_string to the more suggestive
navtive_bridge_library_path
- clean up imports
Bug:
16884833
(cherry picked from commit I73aab8e212860ba5aee9444d801806d3da326a41)
Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
Ian Rogers [Fri, 15 Aug 2014 18:34:19 +0000 (18:34 +0000)]
Merge "Make Monitor::Wait more robust to spurious Inflate failures." into lmp-dev
Ian Rogers [Fri, 15 Aug 2014 18:09:28 +0000 (11:09 -0700)]
Make Monitor::Wait more robust to spurious Inflate failures.
Bug:
17062710
Change-Id: Ife5f6b335caacc70cab543cd568676d277d3beb6
Narayan Kamath [Fri, 15 Aug 2014 09:08:15 +0000 (09:08 +0000)]
Merge "More efficient stack walk in exception throwing." into lmp-dev
Mathieu Chartier [Fri, 15 Aug 2014 17:45:30 +0000 (17:45 +0000)]
Merge "Use handle in one case that spans a gc-point." into lmp-dev
Mingyao Yang [Wed, 13 Aug 2014 21:51:03 +0000 (14:51 -0700)]
Use handle in one case that spans a gc-point.
Bug:
16689428
(cherry picked from commit
38eecb0f4288a374c9b0b4b4df8793eb5fc6697c)
Change-Id: Id4a1bde9012e4dd333493e46997c200537c9cf55
Jeff Hao [Fri, 15 Aug 2014 00:18:52 +0000 (17:18 -0700)]
Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
This CL is a better fix for proxy tracing and undoes the changes in
https://android-review.googlesource.com/#/c/103025/
Bug:
16386215
(cherry picked from commit
db8a664e0b68c7c4d36270cd21dce8de1912d7f9)
Change-Id: Ic9e0ea2af7cb2da5d90c56aa009de92dba14cc47
Jeff Hao [Thu, 24 Jul 2014 23:26:09 +0000 (16:26 -0700)]
Fix proxy tracing and enable tests that now work with tracing.
Also updates proxy_test to generate an image for GetQuickOatCodeFor.
Bug:
16386215
(cherry picked from commit
f0a3f09c3d54646166a55c05a6b39c7dd504129c)
Change-Id: I138edbad9e1646db8590f2b1b73f2788d9710e68
Andreas Gampe [Thu, 14 Aug 2014 22:40:19 +0000 (22:40 +0000)]
Revert "Revert "ART: Fix mac build""
This reverts commit
350b03bca65f87895275d1ed4bb895d5afeeeff1.
Also fixes a fault_handler symbol.
Change-Id: I1315527400bffc8ded9f2a7e7fdb1c8a6c104b96
Dave Allison [Thu, 14 Aug 2014 17:02:48 +0000 (17:02 +0000)]
Revert "Revert "Reduce stack usage for overflow checks""
Fixes stack protection issue.
Fixes mac build issue.
This reverts commit
83b1940e6482b9d8feba5c492507735686650ea5.
Change-Id: I7ba17252882b23a740bcda2ea94aacf398255406
Hiroshi Yamauchi [Wed, 13 Aug 2014 18:12:22 +0000 (11:12 -0700)]
More efficient stack walk in exception throwing.
In the exception handling code, we currently walk down the stack
twice, once to get the stack height which we use to compute frame IDs
(the bottom frame is zero), and once more to find the catch block to
jump to.
For a deep stack, this could result in very slow exception
handling. That is, if have a lot of finally or catch blocks that we
end up jumping to in a deep stack, we need to do a lot of
catch/rethrow chains. Since we'd need to walk down to the bottom each
time to compute frames IDs in each catch/rethrow, we'd need to walk
down O(N^2) frames at the worst case.
Instead of frames IDs ((the bottom frame is zero), we will use the
frame depth (the top frame is zero) and no longer need to walk down
the stack just to get the stack height. We walk down O(N) frames.
This was what was happening with
code.google.gson.functional.CircularReferenceTest. With this change,
the test run time went from ~120s down to ~3s on N5 and it no longer
crashes due to the thread suspension timeout.
(cherry pick commit
649278cec7119cdd1bea3d0b710dbb2aa7c650b6)
Bug:
16800209
Change-Id: Ie815df1e3e8fb9d82e40685d4cc2b8838fd8aa07
Mathieu Chartier [Thu, 14 Aug 2014 01:07:31 +0000 (18:07 -0700)]
Use homogeneous space compaction if proper flag is set.
If the flag ART_USE_HSPACE_COMPACT is set then we use
hspace compaction.
Bug:
16401001
Change-Id: I74e1db764f9ff16c007fa3bd16cb2c9b468ec83c
Andreas Gampe [Wed, 13 Aug 2014 07:15:43 +0000 (00:15 -0700)]
ART: Set default visibility to protected
Set default visibility of symbols to protected. This allows the
linker to optimize internal calls and helps avoid plt calls.
Make almost all assembly stubs hidden, as -fvisibility does not
seem to apply to them. Change the assembly tests accordingly. Also
allows to clean up previous hacks to avoid plt calls.
Bug:
16974467
Change-Id: I9030dcf6116251f434f94a2b08e56e12085af652
Dave Allison [Fri, 25 Jul 2014 23:15:27 +0000 (16:15 -0700)]
Reduce stack usage for overflow checks
This reduces the stack space reserved for overflow checks to 12K, split
into an 8K gap and a 4K protected region. GC needs over 8K when running
in a stack overflow situation.
Also prevents signal runaway by detecting a signal inside code that
resulted from a signal handler invokation. And adds a max signal count to
the SignalTest to prevent it running forever.
Also reduces the number of iterations for the InterfaceTest as this was
taking (almost) forever with the --trace option on run-test.
Bug:
15435566
Change-Id: Id4fd46f22d52d42a9eb431ca07948673e8fda694
Conflicts:
compiler/optimizing/code_generator_x86_64.cc
runtime/arch/x86/fault_handler_x86.cc
runtime/arch/x86_64/quick_entrypoints_x86_64.S
Andreas Gampe [Thu, 14 Aug 2014 18:37:56 +0000 (18:37 +0000)]
Merge "ART: Fix run-test in case of relative TMPDIR" into lmp-dev
Andreas Gampe [Wed, 13 Aug 2014 22:40:22 +0000 (15:40 -0700)]
ART: Fix run-test in case of relative TMPDIR
Relative paths should be resolved to absolute paths, as we are
chdir-ing in the test.
Bug:
16499668
Change-Id: Ic7db35e21f519ced77c4ac468d8e909bcb40b24d
Mathieu Chartier [Wed, 13 Aug 2014 17:08:05 +0000 (10:08 -0700)]
Add allocation rate tracking to systrace.
Bug:
16956980
Change-Id: I7074f4ae0f75d1bb58e9860ded4e17ce6978d74e
Dave Allison [Wed, 16 Jul 2014 23:04:32 +0000 (16:04 -0700)]
Add implicit checks for x86_64 architecture.
This combines the x86 and x86_64 fault handlers into one. It also
merges in the change to the entrypoints for X86_64.
Replaces generic instruction length calculator with one that only
works with the specific instructions we use.
Bug:
16256184
Change-Id: I1e8ab5ad43f46060de9597615b423c89a836035c
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Andreas Gampe [Wed, 13 Aug 2014 06:24:16 +0000 (23:24 -0700)]
ART: Don't leave rex_ & length_ uninitialized
Don't leave fields uninitialized in the x86-64 utils assembler.
Bug:
16993295
(cherry picked from commit
181211de89df5615395a55114fe551b08e86bc4d)
Change-Id: I2d648991fc2a6a4d5f518eb9ef0bb10857f6318a
Sebastien Hertz [Wed, 13 Aug 2014 06:09:49 +0000 (06:09 +0000)]
Merge "Fix crash in VirtualMachine.AllThreads JDWP command" into lmp-dev
Ian Rogers [Wed, 13 Aug 2014 21:34:53 +0000 (21:34 +0000)]
Merge "Avoid use of std::string where we have const char*." into lmp-dev
Ian Rogers [Tue, 12 Aug 2014 09:30:58 +0000 (02:30 -0700)]
Avoid use of std::string where we have const char*.
Removing the ClassHelper caused std::string creation for all calls to
Class::GetDescriptor and a significant performance regression. Make the
std::string an out argument so the caller can maintain it and its life time
while allowing GetDescriptor to return the common const char* case.
Don't generate GC maps when compilation is disabled.
Remove other uses of std::string that are occuring on critical paths.
Use the cheaper SkipClass in CompileMethod in CompilerDriver.
Specialize the utf8 as utf16 comparison code for the common shorter byte
encoding.
Force a bit of inlining, remove some UNLIKELYs (they are prone to pessimizing
code), add some LIKELYs.
x86-64 host 1-thread interpret-only of 57 apks:
Before: 29.539s
After: 23.467s
Regular compile:
Before: 1m35.347s
After: 1m20.056s
Bug:
16853450
Change-Id: Ic705ea24784bee24ab80084d06174cbf87d557ad
Conflicts:
runtime/utils.cc
Andreas Gampe [Thu, 14 Aug 2014 18:05:50 +0000 (18:05 +0000)]
Merge "Revert "ART: Fix mac build"" into lmp-dev
Andreas Gampe [Thu, 14 Aug 2014 18:04:12 +0000 (18:04 +0000)]
Revert "ART: Fix mac build"
The underlying CL was reverted.
This reverts commit
564f58305961986591ccb2fff04b9ccdd430a6db.
Change-Id: Ic9fe93a95c4357d0045a430713be7da517f626b5
Andreas Gampe [Thu, 14 Aug 2014 02:54:09 +0000 (19:54 -0700)]
ART: Fix mac build
is_main_thread is unused in the case of a mac.
Bug:
15435566
(cherry picked from commit
7b1bf42dbc765524d54d45a70cb7eb1cccf0c617)
Change-Id: I9848d0156a4903ce73d20b5ce282b61ceb3039ff
Andreas Gampe [Thu, 14 Aug 2014 15:40:19 +0000 (15:40 +0000)]
Merge "ART: Fix class-linker handling" into lmp-dev
Andreas Gampe [Fri, 8 Aug 2014 19:05:10 +0000 (12:05 -0700)]
ART: Fix wrong command line parameter
Bug:
16843953
(cherry picked from commit
c4a7acf505944e7d937f0670b322e12302dd38dc)
Change-Id: Ib59e10a5d97a20ea1a013587645e0eeb204eda8d
Calin Juravle [Thu, 7 Aug 2014 13:53:41 +0000 (14:53 +0100)]
Get the native bridge library from the framework.
Framework now passes the name of the native bridge to the runtime so
there's no need to do the reading in libart.
Bug:
16843953
(cherry picked from commit
421b6466977d4b1ccd453f23b7b492f219099702)
Change-Id: I9a0a8b8c64949e05c6f90bc846d68f0797640f6d
Ian Rogers [Thu, 17 Jul 2014 18:09:10 +0000 (11:09 -0700)]
Clean up native bridge
(partially cherry picked from commit
68d8b42ddec39ec0174162d90d4abaa004d1983e)
Change-Id: I85813e97d73b1b331646dd0e880108dfbfe80f69
Andreas Gampe [Thu, 14 Aug 2014 04:49:37 +0000 (21:49 -0700)]
ART: Fix class-linker handling
ResolveMethod did not account correctly for the mutual exclusivity
of direct and static methods. In such a case we threw a NoSuchMethodError,
while the correct behavior is to throw an IncompatibleClassChangeError.
Bug:
16956477
Change-Id: Id014affe0b8a43dbd75570b123b921d5853ab135
Andreas Gampe [Thu, 14 Aug 2014 05:18:47 +0000 (05:18 +0000)]
Merge "ART: Tolerate shallow call stack in VMStack_getCallingClassLoader" into lmp-dev
Dan Albert [Mon, 11 Aug 2014 23:38:02 +0000 (16:38 -0700)]
Revert "Revert "Remove GCC atomic workarounds.""
This reverts commit
626a2468e4e4f39db7b0f35a4fee87293e360e92.
(cherry picked from commit
aab0f86e3b079598d41c3a00bfa765a7589c5110)
Change-Id: I2333b54dcfd5ee8227a6479d2e3814b25377bdfd
Dan Albert [Tue, 12 Aug 2014 18:48:34 +0000 (11:48 -0700)]
Initialize art::Atomic's value to 0.
art::Mutex and art::ConditionVariable were DCHECKing that the value was
zero on entering the constructor without ever initializing the value.
Since 0 is a sensible default, make it the default for art::Atomic
rather than initializing for each use.
Bug:
16301104
(cherry picked from commit
6a3f8d93ddf09b5f6667820089e488958cba8361)
Change-Id: Iab69bccac9f904111a72eff8162c7f0ca979a08a
Andreas Gampe [Tue, 12 Aug 2014 01:51:53 +0000 (18:51 -0700)]
ART: Tolerate shallow call stack in VMStack_getCallingClassLoader
When the call stack does not have the three methods we expect,
the visitor will return a nullptr value.
Add a test to JniTest (and refactor the test a little for code reuse).
Bug:
16867274
Change-Id: I5fb8f91f372a41e0bc11ef9f70640834591afa53
Vladimir Marko [Thu, 14 Aug 2014 17:53:07 +0000 (17:53 +0000)]
Merge "Fix intrinsic Math.abs(double) for ARM." into lmp-dev
Vladimir Marko [Thu, 14 Aug 2014 14:23:32 +0000 (15:23 +0100)]
Fix intrinsic Math.abs(double) for ARM.
Bug:
16930909
(cherry picked from commit
a5f90b6f0f5b33487e71eaeb05508555f17dcf30)
Change-Id: I3ee40ffbeeabf53c72ea5781d02cda1b92b13289
Dave Allison [Thu, 14 Aug 2014 16:59:07 +0000 (16:59 +0000)]
Merge "Revert "Reduce stack usage for overflow checks"" into lmp-dev
Dave Allison [Thu, 14 Aug 2014 16:54:09 +0000 (16:54 +0000)]
Revert "Reduce stack usage for overflow checks"
This reverts commit
63c051a540e6dfc806f656b88ac3a63e99395429.
Change-Id: I282a048994fcd130fe73842b16c21680053c592f
Mathieu Chartier [Mon, 11 Aug 2014 20:52:12 +0000 (13:52 -0700)]
Move explicit GC after we are done initalizing all classes.
Previously we had the GC happen for each dex file, this added a
few seconds of time on boot.oat creation.
Bug:
16853450
(cherry picked from commit
093ef212b7db4c17ed62df5cac0c1ac3a24e691d)
Change-Id: Ia469838eff1550c175c3465a478d8081023601bd
Andreas Gampe [Thu, 14 Aug 2014 16:11:58 +0000 (16:11 +0000)]
Merge "ART: Fix another potential N-th visitor issue" into lmp-dev
Andreas Gampe [Thu, 14 Aug 2014 06:05:38 +0000 (23:05 -0700)]
ART: Fix another potential N-th visitor issue
Bug:
16867274
Change-Id: I5466af563032041ef4a547894f40f303871302c6
Mathieu Chartier [Tue, 12 Aug 2014 17:39:22 +0000 (17:39 +0000)]
Merge "Change FreeMemory and TotalMemory behavior." into lmp-dev
Jeff Hao [Tue, 12 Aug 2014 01:00:29 +0000 (18:00 -0700)]
Make method tracing deoptimize on startup.
Bug:
16848366
(cherry picked from commit
bc678bba8ec45dfcb1865676dd6d8188da9e56fc)
Change-Id: Idf75288026a837b95f4619acadec57e38bacbd7b
Mathieu Chartier [Thu, 7 Aug 2014 00:06:33 +0000 (17:06 -0700)]
Change FreeMemory and TotalMemory behavior.
TotalMemory is now equal to the footprint limit (around when the
next GC will occur).
FreeMemory is now equal to TotalMemory() - bytes_allocated_.
Also added more memory dumping info to DumpGcPerformanceInfo.
Bug:
16520008
Bug:
15819878
(cherry picked from commit
dd162fb5990cedf80a5093ecc0e77df82af5f754)
Change-Id: I68239a5295cc1372b3995eb781d67b9e25d6eaed
Sebastien Hertz [Tue, 12 Aug 2014 07:09:37 +0000 (09:09 +0200)]
Fix crash in VirtualMachine.AllThreads JDWP command
When collecting all the started threads, we may encounter a thread in the
process of being started from Java code (Thread.start) in the threads list. The
crash occurs when we attempt to access the java.lang.Thread peer (calling
Thread::GetPeer) but the JNI global reference to it (Thread::jpeer) has not
been destroyed yet (which is verified with a check). This only happens when the
thread is starting up.
We now check the thread finished starting up before accessing the Java peer.
This also prevents from returning non-started threads in the reply.
Bug:
16660101
Change-Id: I9e445e5da3a6951143d6c3c9a0d4f136398fde2f
Zheng Xu [Tue, 12 Aug 2014 09:19:12 +0000 (17:19 +0800)]
AArch64: Fix art_quick_string_compareto.
Though __memcmp16() is implemented in the same module as the caller, it
is still possible that the toolchain would put __memcmp16() into plt. In
that case, IP registers can be trashed when loading the function address.
Use x14/x15 to replace IP0/IP1.
Bug:
16974467
(cherry picked from commit
62ddb328860e907eb76ccd3abed63ba75438fea8)
Change-Id: I40e39d075860bc78624ce6ef8b4f8e33e57fc58c
Calin Juravle [Wed, 6 Aug 2014 19:07:41 +0000 (19:07 +0000)]
Revert "Rename openDexFileNative to openDexFile."
https://android-review.googlesource.com/#/c/103383/ introduces
absolute paths so we need back the old method name
Bug:
16644204
Bug:
16930747
This reverts commit
350b626eb1cfbaee7619e9453a4c018c07aed003.
(cherry picked from commit
a2069c7152eb46e8c64b4c8d7e19e5fab5de6df4)
Change-Id: I55c8cb31bb79b1ed8ea51f63ec504d77f76a582a
Andreas Gampe [Mon, 11 Aug 2014 15:03:15 +0000 (15:03 +0000)]
Merge "ART: Skip compiling redefined classes in apps" into lmp-dev
Dan Albert [Sun, 10 Aug 2014 06:43:10 +0000 (23:43 -0700)]
Fix the Mac build.
Apparently Mac uses a different assembler directive for .hidden.
Change-Id: Ic2adb6bef82e376c3e5f4a29258a85a0dac00cd5
Dan Albert [Sun, 10 Aug 2014 01:12:10 +0000 (18:12 -0700)]
Proper fix after -Bsymbolic change.
Marking the offending symbols as hidden allows the linker to resolve
them at build time.
Bug:
16853291
Change-Id: I1480c1520c23f81e42831a66737bba7bdf3433c2
Andreas Gampe [Tue, 29 Jul 2014 01:38:57 +0000 (18:38 -0700)]
ART: Skip compiling redefined classes in apps
If for an app a class is defined in more than one dex file, skip
all classes after the first.
Bug:
16057120
(cherry picked from commit
de7b43626c49567cefb258669aac70a289b74b85)
Change-Id: I461942f762354b696c305dcae3a0d1c7de40f9df
Dan Albert [Sat, 9 Aug 2014 06:47:01 +0000 (06:47 +0000)]
Merge "Workaround for test failures after Bsymbolic fix." into lmp-dev
Andreas Gampe [Sat, 9 Aug 2014 06:30:49 +0000 (06:30 +0000)]
Merge "ART: Turn on dex2oat watchdog on target" into lmp-dev
Andreas Gampe [Thu, 17 Jul 2014 17:18:46 +0000 (10:18 -0700)]
ART: Turn on dex2oat watchdog on target
Activates the watchdog on device.
Bug:
16364458
(cherry picked from commit
bf40ddb83e1ea05ba4bc101149cd79f0160c8996)
Change-Id: I06deafa4436991f07bce44ecc6fd9df333f905ee
Andreas Gampe [Wed, 6 Aug 2014 17:09:01 +0000 (10:09 -0700)]
ART: Generate chained compare-and-branch for short switches
Refactor Mir2Lir to generate chained compare-and-branch sequences
for short switches on all architectures.
Bug:
16241558
(cherry picked from commit
48971b3242e5126bcd800cc9c68df64596b43d13)
Change-Id: I0bb3071b8676523e90e0258e9b0e3fd69c1237f4
Andreas Gampe [Sat, 9 Aug 2014 05:52:17 +0000 (05:52 +0000)]
Merge "ART: Use TMPDIR for test directories" into lmp-dev
Brian Carlstrom [Sat, 9 Aug 2014 04:29:02 +0000 (21:29 -0700)]
Remove clang detected warning on tautological comparison
Bug:
16903117
(cherry picked from commit
c991107a90698012c2b0babc030b8ab85491d1e3)
Change-Id: I94d36d8d26d4090b4c2ad128fde9dab2b1173533
Andreas Gampe [Wed, 6 Aug 2014 20:12:26 +0000 (13:12 -0700)]
ART: Use TMPDIR for test directories
Bug:
16499668
(cherry picked from commit
5a79fdecffbea657ebecd4cf19078925239eb1c3)
Change-Id: I6981f707862bf4a9cc79800db85b0416f30115af
Andreas Gampe [Sat, 9 Aug 2014 04:39:58 +0000 (04:39 +0000)]
Merge "ART: Do not check interface being subclass for member access" into lmp-dev
Andreas Gampe [Sat, 9 Aug 2014 02:55:37 +0000 (19:55 -0700)]
ART: Do not check interface being subclass for member access
When checking access to a protected member, do not try to see
whether an interface is a subclass of the declaring class.
Bug:
16904661
Change-Id: I3e1fa4ce9753e0a96633fff0fba807d72bc0b19d
Andreas Gampe [Wed, 6 Aug 2014 21:53:03 +0000 (14:53 -0700)]
ART: Remove test files after test
The unix_file tests should remove files and directories when they
are done testing.
Bug:
16505797
(cherry picked from commit
7747c8de402f64e3009ca3bcccebddbb70f617ee)
Change-Id: I9c3c8f1a80ec0d37628a742193267e182c25b0cd
Andreas Gampe [Thu, 31 Jul 2014 23:23:49 +0000 (16:23 -0700)]
ART: Add guards to the dex cache and its shortcuts
Do not return fields, methods or classes if the (declaring) class is
erroneous.
Bug:
16692788
(cherry picked from commit
58a5af8568d224ca7eccf2483396ff9862f8d1ee)
Change-Id: I7d3e4cb8113e2e764ed7433eed25e1031e6a0f14
Dan Albert [Fri, 8 Aug 2014 00:39:34 +0000 (17:39 -0700)]
Workaround for test failures after Bsymbolic fix.
Bug:
16853291
Change-Id: I0c2e2efbeb5060d4ec5ba706dab422b3c2caaa96
(cherry picked from commit
3bed41cf3ace3105686f626fed2ac802376852f3)
Zheng Xu [Thu, 7 Aug 2014 06:05:23 +0000 (14:05 +0800)]
Add arraycopy intrinsic for arm and arm64.
Implement intrinsic for
java.lang.System.arraycopy(char[], int, char[], int, int).
Bug:
16241558
(cherry picked from commit
947717a2b085f36ea007ac64f728e19ff1c8db0b)
Change-Id: I8199f5c9ce9827f869f0f93aaff7ec359a84d922
Christopher Ferris [Tue, 5 Aug 2014 22:43:13 +0000 (15:43 -0700)]
Check for a NULL pointer, do not call Build.
When calling BacktraceMap::Create(), a NULL pointer is returned if Build
fails. Building twice can cause problems and might leak memory.
(cherry picked from commit
836572a07142627ff291d686a4e9e03a0988344b)
Change-Id: I59d29bb6e5324de6eb099916045c2ab1d9e56630
Stuart Monteith [Wed, 11 Jun 2014 15:44:46 +0000 (16:44 +0100)]
AArch64: Implicit StackOverflow/NPE/Suspend checks.
This implements implicit stack overflow checks and null pointer exceptions
for AArch64. Suspend checks are implemented but not switched on yet.
Bug:
16256184
Change-Id: I2eb076f2c0c9d94793d5a898fea49cf409b4eb66
Signed-off-by: Stuart Monteith <stuart.monteith@arm.com>
Dave Allison [Wed, 6 Aug 2014 04:32:46 +0000 (21:32 -0700)]
Fix checks for kLiteral in local optimizations.
The check for kLiteral (literal load) just checked the kLiteral
bit in the def mask. The kEncodeAll mask has the kLiteral bit
set so this check was triggering. The fix is to check for
only the kLiteral bit being set and no other special bits.
The semantics of the special bits in the use/def mask is that
only one of them can be set at the same time.
Bug:
16824330
Change-Id: I0f1c1157e017870414ffef11767e5433d1fd4401
Hiroshi Yamauchi [Fri, 8 Aug 2014 21:17:06 +0000 (21:17 +0000)]
Merge "Fix a SIGSEGV at background-to-foreground collector transition." into lmp-dev
Andreas Gampe [Wed, 6 Aug 2014 22:31:06 +0000 (15:31 -0700)]
ART: Make assembler_test less chatty
Do not save temporaries in case we use a different encoding than
the host assembler.
Bug:
16505797
(cherry picked from commit
54e15de4a3ea869488d50694fa01138901e70c4e)
Change-Id: I9508d9b09d930db70587a69c04bb3c8950339d79
Hiroshi Yamauchi [Thu, 7 Aug 2014 17:27:17 +0000 (10:27 -0700)]
Fix a SIGSEGV at background-to-foreground collector transition.
The mem map that's used to create the backup main rosalloc space is
set to PROT_NONE by the compaction and the rosalloc space creation
attempts to write the debug magic number in the first page.
This is a debug build only issue.
Cherry pick commit
c1276c838d1d0896048b8c14458432b94274e869.
Bug:
16854263
Change-Id: Ide2545d92bcafd3a095ac7f0c89c5b43d6dd78de
Narayan Kamath [Fri, 8 Aug 2014 15:48:07 +0000 (15:48 +0000)]
Merge "Use the right instruction set for checking dex-cache staleness." into lmp-dev
Narayan Kamath [Fri, 8 Aug 2014 15:19:44 +0000 (16:19 +0100)]
Use the right instruction set for checking dex-cache staleness.
We should use the instruction set we're asked to use, and not
the instruction set of the current runtime.
bug:
16876489
Change-Id: Ic2a30b7e7d23192b0189c1f868b73c5f4c7eb8f9
Vladimir Marko [Thu, 7 Aug 2014 17:07:18 +0000 (18:07 +0100)]
Fix performance regression in OatFile::GetOatDexFile().
Try to avoid calculating the canonical location of the
dex file if possible and when we have to calculate it,
cache the lookup result for subsequent lookups.
Bug:
16828525
Bug:
16859671
(cherry picked from commit
3f5838d7d0b9fc63db0ccc35c2ea05ed29264986)
Change-Id: Ifd9a45dada2cc724382fd03c10f6437a6b71e666
Brian Carlstrom [Wed, 6 Aug 2014 21:32:22 +0000 (14:32 -0700)]
Reset goog/lmp-dev to goog/master
Change-Id: If30071b5f86bfe723abf799c9248397e8840a8a0
Mathieu Chartier [Wed, 6 Aug 2014 18:46:51 +0000 (18:46 +0000)]
am
56a49adb: am
860feb0a: Merge "Add card table test."
* commit '
56a49adb43fa1c8c8485f7ce07286d3b3829ee7d':
Add card table test.
Mathieu Chartier [Wed, 6 Aug 2014 18:43:17 +0000 (18:43 +0000)]
am
860feb0a: Merge "Add card table test."
* commit '
860feb0a60d0fe9311f28bd590058f6660d130b1':
Add card table test.
Brian Carlstrom [Wed, 6 Aug 2014 17:40:57 +0000 (17:40 +0000)]
am
82ec2f07: am
484e2c2d: Merge "Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.""
* commit '
82ec2f0790eb59a7ed71490d503a9b7cdef25ce4':
Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."
Jeff Hao [Wed, 6 Aug 2014 17:40:41 +0000 (17:40 +0000)]
am
c75dc324: am
38449637: Merge "When performing a long jump, update SP last."
* commit '
c75dc3242ab3d1a1d8684b049b6299a4b2ca57cf':
When performing a long jump, update SP last.
Jeff Hao [Wed, 6 Aug 2014 17:40:40 +0000 (17:40 +0000)]
am
dc6414fe: am
cd0d9b5a: Merge "When performing a long jump, update SP last." into lmp-dev
* commit '
dc6414fe6b56f2854dacbaac82c2b0b4b57d1e6f':
When performing a long jump, update SP last.