OSDN Git Service
Andreas Gampe [Thu, 14 Aug 2014 16:08:46 +0000 (16:08 +0000)]
am
564f5830: ART: Fix mac build
* commit '
564f58305961986591ccb2fff04b9ccdd430a6db':
ART: Fix mac build
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:43:58 +0000 (15:43 +0000)]
am
c483a73c: Merge "ART: Fix class-linker handling" into lmp-dev
* commit '
c483a73cc2f9d63c1b6bccd1007117cf0d6dcd56':
ART: Fix class-linker handling
Andreas Gampe [Thu, 14 Aug 2014 12:20:48 +0000 (12:20 +0000)]
am
f8c4ed08: ART: Fix wrong command line parameter
* commit '
f8c4ed08832ec5302c9ea8441ec8cb39b87075ab':
ART: Fix wrong command line parameter
Calin Juravle [Thu, 14 Aug 2014 12:20:47 +0000 (12:20 +0000)]
am
4c37afb7: Get the native bridge library from the framework.
* commit '
4c37afb7b207424ff788ab8d8778ea4e8d4ac324':
Get the native bridge library from the framework.
Ian Rogers [Thu, 14 Aug 2014 12:20:46 +0000 (12:20 +0000)]
am
20ae1d77: Clean up native bridge
* commit '
20ae1d77463d1c3f206eac8d541124b4555464de':
Clean up native bridge
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 05:21:55 +0000 (05:21 +0000)]
am
7e9cdbbc: Merge "ART: Tolerate shallow call stack in VMStack_getCallingClassLoader" into lmp-dev
* commit '
7e9cdbbc14c015028d4b239a09c5af33ffc2087c':
ART: Tolerate shallow call stack in VMStack_getCallingClassLoader
Dan Albert [Thu, 14 Aug 2014 05:21:54 +0000 (05:21 +0000)]
am
c85a899b: Revert "Revert "Remove GCC atomic workarounds.""
* commit '
c85a899b23327c3d5693c8dabf5b482c3fb5ded8':
Revert "Revert "Remove GCC atomic workarounds.""
Dan Albert [Thu, 14 Aug 2014 05:14:18 +0000 (05:14 +0000)]
am
f0a37663: Initialize art::Atomic\'s value to 0.
* commit '
f0a37663309e468f11858bffa3221e7223cf577d':
Initialize art::Atomic's value to 0.
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
Dave Allison [Wed, 13 Aug 2014 23:00:21 +0000 (23:00 +0000)]
am
63c051a5: Reduce stack usage for overflow checks
* commit '
63c051a540e6dfc806f656b88ac3a63e99395429':
Reduce stack usage for overflow checks
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
Ian Rogers [Wed, 13 Aug 2014 21:38:41 +0000 (21:38 +0000)]
am
c739de01: Merge "Avoid use of std::string where we have const char*." into lmp-dev
* commit '
c739de01b905729b8587003a52a55b62358e979d':
Avoid use of std::string where we have const char*.
Mathieu Chartier [Wed, 13 Aug 2014 19:01:33 +0000 (19:01 +0000)]
am
83715081: Add allocation rate tracking to systrace.
* commit '
837150818af0eee993f7d93c5a50c3c7b46f1dab':
Add allocation rate tracking to systrace.
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, 13 Aug 2014 18:08:06 +0000 (18:08 +0000)]
am
b0f05b96: Add implicit checks for x86_64 architecture.
* commit '
b0f05b9654eb005bc8c8e15f615a7f5a312f640c':
Add implicit checks for x86_64 architecture.
Andreas Gampe [Thu, 14 Aug 2014 15:40:19 +0000 (15:40 +0000)]
Merge "ART: Fix class-linker handling" into lmp-dev
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
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
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 07:50:56 +0000 (07:50 +0000)]
am
4527f61c: ART: Don\'t leave rex_ & length_ uninitialized
* commit '
4527f61cbc1a3b01ab249181900b8ea547edaf90':
ART: Don't leave rex_ & length_ uninitialized
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:14:50 +0000 (06:14 +0000)]
am
13cccfa3: Merge "Fix crash in VirtualMachine.AllThreads JDWP command" into lmp-dev
* commit '
13cccfa3ce61a41a176358ff2aa53e60d0acacd5':
Fix crash in VirtualMachine.AllThreads JDWP command
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
Mathieu Chartier [Tue, 12 Aug 2014 17:45:00 +0000 (17:45 +0000)]
am
5f1dcee2: Merge "Change FreeMemory and TotalMemory behavior." into lmp-dev
* commit '
5f1dcee2b3cdaf0f745958ff366a84279940c65e':
Change FreeMemory and TotalMemory behavior.
Jeff Hao [Tue, 12 Aug 2014 17:23:26 +0000 (17:23 +0000)]
am
b21f1336: Make method tracing deoptimize on startup.
* commit '
b21f1336be9dd0c2607b2ff53834d62a218d1c83':
Make method tracing deoptimize on startup.
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 [Tue, 12 Aug 2014 17:39:22 +0000 (17:39 +0000)]
Merge "Change FreeMemory and TotalMemory behavior." into lmp-dev
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 15:49:08 +0000 (15:49 +0000)]
am
d74824bd: AArch64: Fix art_quick_string_compareto.
* commit '
d74824bdd01b2a76b310e1275a1114d39833a708':
AArch64: Fix art_quick_string_compareto.
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 [Tue, 12 Aug 2014 11:40:34 +0000 (11:40 +0000)]
am
8c6c5211: Revert "Rename openDexFileNative to openDexFile."
* commit '
8c6c52110c5afd438741694520203a6d7e81a2a4':
Revert "Rename openDexFileNative to openDexFile."
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:07:05 +0000 (15:07 +0000)]
am
1c98286d: Merge "ART: Skip compiling redefined classes in apps" into lmp-dev
* commit '
1c98286d8ceaf3715e06f50acd6f3b0aa5a06f2e':
ART: Skip compiling redefined classes in apps
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 17:20:16 +0000 (17:20 +0000)]
am
a0b530dd: Fix the Mac build.
* commit '
a0b530dd5e76662156b40c8a84ebb446b6332598':
Fix the Mac build.
Dan Albert [Sun, 10 Aug 2014 08:16:40 +0000 (08:16 +0000)]
am
6a763f14: Proper fix after -Bsymbolic change.
* commit '
6a763f149f0c6f705cab8fb1984aa6f9198b2841':
Proper fix after -Bsymbolic change.
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
Dan Albert [Sat, 9 Aug 2014 06:51:23 +0000 (06:51 +0000)]
am
679ec1bf: Merge "Workaround for test failures after Bsymbolic fix." into lmp-dev
* commit '
679ec1bf0fb5cfd2c74cdf0747b5b8b8f4a5bc06':
Workaround for test failures after Bsymbolic fix.
Andreas Gampe [Sat, 9 Aug 2014 06:33:01 +0000 (06:33 +0000)]
am
55a39dbf: Merge "ART: Turn on dex2oat watchdog on target" into lmp-dev
* commit '
55a39dbfae0935a60e0de3a05573b3b1ee25f579':
ART: Turn on dex2oat watchdog on target
Andreas Gampe [Sat, 9 Aug 2014 06:15:57 +0000 (06:15 +0000)]
am
8c18c2aa: ART: Generate chained compare-and-branch for short switches
* commit '
8c18c2aaedb171f9b03ec49c94b0e33449dc411b':
ART: Generate chained compare-and-branch for short switches
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:54:46 +0000 (05:54 +0000)]
am
9f642e83: Merge "ART: Use TMPDIR for test directories" into lmp-dev
* commit '
9f642e83c176fec52e496be0ae4b0b97fb2905b4':
ART: Use TMPDIR for test directories
Brian Carlstrom [Sat, 9 Aug 2014 05:46:30 +0000 (05:46 +0000)]
am
2d48bb71: Remove clang detected warning on tautological comparison
* commit '
2d48bb7109802c8a7a4580288f3a5bde270f062f':
Remove clang detected warning on tautological comparison
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 [Sat, 9 Aug 2014 04:43:13 +0000 (04:43 +0000)]
am
3a56e4d0: Merge "ART: Do not check interface being subclass for member access" into lmp-dev
* commit '
3a56e4d089b58bcb61e0c5b7c0ebdcc266a89d82':
ART: Do not check interface being subclass for member access
Andreas Gampe [Sat, 9 Aug 2014 04:39:14 +0000 (04:39 +0000)]
am
f8969650: ART: Remove test files after test
* commit '
f896965072343a2d6ad64d46a61112b10b3645dd':
ART: Remove test files after test
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
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 [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 [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
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 05:52:17 +0000 (05:52 +0000)]
Merge "ART: Use TMPDIR for test directories" into lmp-dev
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 [Fri, 8 Aug 2014 22:14:57 +0000 (22:14 +0000)]
am
4ef12f5b: ART: Add guards to the dex cache and its shortcuts
* commit '
4ef12f5b0e26c6016c87866f6a33da5ed8e98d74':
ART: Add guards to the dex cache and its shortcuts
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
Hiroshi Yamauchi [Fri, 8 Aug 2014 21:21:27 +0000 (21:21 +0000)]
am
47ba978e: Merge "Fix a SIGSEGV at background-to-foreground collector transition." into lmp-dev
* commit '
47ba978e95896c932300fb3236ce5eb4b438d971':
Fix a SIGSEGV at background-to-foreground collector transition.
Andreas Gampe [Fri, 8 Aug 2014 19:47:17 +0000 (19:47 +0000)]
am
f0d30ed8: ART: Make assembler_test less chatty
* commit '
f0d30ed8fcffc839ceb91359a547c0efb7641d53':
ART: Make assembler_test less chatty
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
Narayan Kamath [Fri, 8 Aug 2014 15:50:43 +0000 (15:50 +0000)]
am
31fa14fd: Merge "Use the right instruction set for checking dex-cache staleness." into lmp-dev
* commit '
31fa14fdbbccfcd9b50bc6db6aae6168b4fc2249':
Use the right instruction set for checking dex-cache staleness.
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)
Vladimir Marko [Fri, 8 Aug 2014 15:17:01 +0000 (15:17 +0000)]
am
4bb93277: Fix performance regression in OatFile::GetOatDexFile().
* commit '
4bb932773e47b1ce04602d81ffa5a8a7d863eb10':
Fix performance regression in OatFile::GetOatDexFile().
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
Zheng Xu [Thu, 7 Aug 2014 21:53:03 +0000 (21:53 +0000)]
am
fa9c8ec3: Add arraycopy intrinsic for arm and arm64.
* commit '
fa9c8ec37c66574654e448513e1bb59af7cb9365':
Add arraycopy intrinsic for arm and arm64.
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 [Thu, 7 Aug 2014 21:17:09 +0000 (21:17 +0000)]
am
35388e93: Check for a NULL pointer, do not call Build.
* commit '
35388e93f7dc45257bbffc675710728aeb663394':
Check for a NULL pointer, do not call Build.
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
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
Stuart Monteith [Thu, 7 Aug 2014 18:15:54 +0000 (18:15 +0000)]
am
7204c04d: AArch64: Implicit StackOverflow/NPE/Suspend checks.
* commit '
7204c04dd86ae8ce05690e38737b2abf017a0a69':
AArch64: Implicit StackOverflow/NPE/Suspend checks.
Dave Allison [Thu, 7 Aug 2014 18:15:53 +0000 (18:15 +0000)]
am
a7894cdb: Fix checks for kLiteral in local optimizations.
* commit '
a7894cdb063edb88f1420a42207e0c4bd27ab4f9':
Fix checks for kLiteral in local optimizations.
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
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
Brian Carlstrom [Thu, 7 Aug 2014 06:08:38 +0000 (23:08 -0700)]
Merge from goog/lmp-dev goog/lmp-ub-dev
Change-Id: I04c4169910fe5200532fcb9e3df8e22b77922e5d
Ian Rogers [Thu, 7 Aug 2014 05:31:31 +0000 (05:31 +0000)]
am
97e2c638: am
ce5b5219: am
267b1f22: Merge "Make generate-operator-out.py compatible with Python 3.x"
* commit '
97e2c638dc6ed95d8e59158d376edf777707436e':
Make generate-operator-out.py compatible with Python 3.x
Nicolas Geoffray [Thu, 7 Aug 2014 05:31:29 +0000 (05:31 +0000)]
am
18dadbc7: am
c26efd15: am
c35c60ff: Merge "Bailout if the field access is not supported."
* commit '
18dadbc741e2f63fe58c257641a1ad3155eee549':
Bailout if the field access is not supported.
Nicolas Geoffray [Thu, 7 Aug 2014 05:31:28 +0000 (05:31 +0000)]
am
d1ef1c7f: am
53583ade: am
3914a79d: Merge "Add two phi pruning phases."
* commit '
d1ef1c7ff67233bd0d0c43b5502817251695163f':
Add two phi pruning phases.
Nicolas Geoffray [Thu, 7 Aug 2014 05:31:27 +0000 (05:31 +0000)]
am
eba098fe: am
5e1e8eeb: am
1cad41d9: Merge "Support fields in optimizing compiler."
* commit '
eba098fe690f2287bc73a9dd934abe8a4eb14d61':
Support fields in optimizing compiler.
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.
Nicolas Geoffray [Wed, 6 Aug 2014 17:40:23 +0000 (17:40 +0000)]
am
da113966: am
1d5c4953: Merge "Fix SIB for base + index addressing in x86_64 assembler."
* commit '
da113966c3a06facd1073e71436c12a4d470f12b':
Fix SIB for base + index addressing in x86_64 assembler.
Andreas Gampe [Wed, 6 Aug 2014 17:40:12 +0000 (17:40 +0000)]
am
a84690e3: am
0a1143de: Merge "Add x86_64 optimized __memcmp16 implementation; fix tabs in 32-bit implementation."
* commit '
a84690e3b0607f286e4680350b98d54e208fa614':
Add x86_64 optimized __memcmp16 implementation; fix tabs in 32-bit implementation.
Mathieu Chartier [Wed, 6 Aug 2014 17:37:35 +0000 (17:37 +0000)]
am
0b8c1530: am
a1227a18: Fix byte_cas to use uintptr_t Atomic.
* commit '
0b8c153082caf6a970e238c9ac34ce0601947dd2':
Fix byte_cas to use uintptr_t Atomic.