OSDN Git Service
Nicolas Geoffray [Wed, 20 Aug 2014 20:48:42 +0000 (20:48 +0000)]
am
418a6980: Merge "Fix bug introduced in https://android-review.googlesource.com/102610."
* commit '
418a6980fe461f57bea1e3bc431264c81ae890aa':
Fix bug introduced in https://android-review.googlesource.com/102610.
Dave Allison [Wed, 20 Aug 2014 20:48:41 +0000 (20:48 +0000)]
am
10dac8ee: (-s ours) Merge "Merge stack usage reduction for overflow checks"
* commit '
10dac8ee833a297ad0ffc5877305f2d132259478':
Merge stack usage reduction for overflow checks
Vladimir Marko [Wed, 20 Aug 2014 15:22:41 +0000 (15:22 +0000)]
am
0fcd6873: am
a846c1ac: Merge "X86: Fix alias info in GenInlinedIndexOf()." into lmp-dev
* commit '
0fcd6873941d55d69c7cd9bb3b458d2230a9bd0b':
X86: Fix alias info in GenInlinedIndexOf().
Vladimir Marko [Wed, 20 Aug 2014 15:13:51 +0000 (15:13 +0000)]
am
a846c1ac: Merge "X86: Fix alias info in GenInlinedIndexOf()." into lmp-dev
* commit '
a846c1ac65b197844380b8d28377a850dfa1fc94':
X86: Fix alias info in GenInlinedIndexOf().
buzbee [Wed, 20 Aug 2014 13:06:54 +0000 (13:06 +0000)]
am
2239f5e7: am
c6a62592: Merge "Quick compiler: fix Arm64 inline locking code" into lmp-dev
* commit '
2239f5e7542e62a78c814e0b1306537480d0e298':
Quick compiler: fix Arm64 inline locking code
buzbee [Wed, 20 Aug 2014 12:59:10 +0000 (12:59 +0000)]
am
c6a62592: Merge "Quick compiler: fix Arm64 inline locking code" into lmp-dev
* commit '
c6a62592836612b09ff1a8021e49b1328d85493b':
Quick compiler: fix Arm64 inline locking code
Brian Carlstrom [Tue, 19 Aug 2014 23:43:43 +0000 (23:43 +0000)]
am
a99a95b5: (-s ours) am
d6ee5033: Merge "Make apps able to run with a failing patchoat" into lmp-dev
* commit '
a99a95b5df2d34ed5747fbb6085382b90d7f8737':
Make apps able to run with a failing patchoat
Dave Allison [Wed, 20 Aug 2014 01:08:13 +0000 (01:08 +0000)]
Merge "Merge stack usage reduction for overflow checks"
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:39:01 +0000 (22:39 +0000)]
am
d6ee5033: Merge "Make apps able to run with a failing patchoat" into lmp-dev
* commit '
d6ee5033433619a893a8f20319efcf8c8b1d1016':
Make apps able to run with a failing patchoat
Dave Allison [Tue, 19 Aug 2014 22:24:25 +0000 (22:24 +0000)]
am
daf2d8da: am
20e4afeb: Merge "Workaround problem reading main stack on intel devices." into lmp-dev
* commit '
daf2d8daee2a6766860874402f9980dc25a11fce':
Workaround problem reading main stack on intel devices.
Dave Allison [Tue, 19 Aug 2014 22:15:51 +0000 (22:15 +0000)]
am
20e4afeb: Merge "Workaround problem reading main stack on intel devices." into lmp-dev
* commit '
20e4afeb1ad9d142fe9e46efe812f0d562c28f1f':
Workaround problem reading main stack on intel devices.
Hiroshi Yamauchi [Tue, 19 Aug 2014 22:15:31 +0000 (22:15 +0000)]
am
ed9fe4ff: Merge "Avoid handle-less methods in ClassLinker::LinkInterfaceMethods()."
* commit '
ed9fe4ffd9516cfb01b53a3a2c81d3e223ee352c':
Avoid handle-less methods in ClassLinker::LinkInterfaceMethods().
Andreas Gampe [Tue, 19 Aug 2014 22:10:38 +0000 (22:10 +0000)]
am
64a88b25: am
38bd1e1b: ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test
* commit '
64a88b25482180fdae5cba4b0feeaa176356b424':
ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test
Andreas Gampe [Tue, 19 Aug 2014 22:02:12 +0000 (22:02 +0000)]
am
38bd1e1b: ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test
* commit '
38bd1e1b8aa39bdc6e67c5dc205cc8d294d985c5':
ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test
Brian Carlstrom [Tue, 19 Aug 2014 21:24:18 +0000 (21:24 +0000)]
am
40be3b81: Merge "Make apps able to run with a failing patchoat"
* commit '
40be3b816c860a42e2761e1a614762ea24d12a32':
Make apps able to run with a failing patchoat
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 [Tue, 19 Aug 2014 21:16:27 +0000 (21:16 +0000)]
am
57101be6: Merge "ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test"
* commit '
57101be6db093d9d27776f77eb8880ae5bae9913':
ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test
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 20:21:50 +0000 (20:21 +0000)]
am
e30100f1: Merge "ART: Set default visibility to protected"
* commit '
e30100f164f8ac46f0428c28be87ad289adf4ac2':
ART: Set default visibility to protected
Andreas Gampe [Tue, 19 Aug 2014 19:33:58 +0000 (19:33 +0000)]
am
1a8f106d: am
e22c03ce: Merge "ART: Set default visibility to protected" into lmp-dev
* commit '
1a8f106d36539781f286b56fdecdc0de706b251a':
ART: Set default visibility to protected
Andreas Gampe [Tue, 19 Aug 2014 19:25:22 +0000 (19:25 +0000)]
am
e22c03ce: Merge "ART: Set default visibility to protected" into lmp-dev
* commit '
e22c03ceaa847e3b6c8fcb7ee9d838f61945cda7':
ART: Set default visibility to protected
Andreas Gampe [Tue, 19 Aug 2014 18:22:34 +0000 (18:22 +0000)]
am
fd5a3f79: Merge "ART: More failure output on run-test"
* commit '
fd5a3f796797c32c0346d13589f25cfd8bc4e465':
ART: More failure output on run-test
Jeff Hao [Tue, 19 Aug 2014 17:58:00 +0000 (17:58 +0000)]
am
82771c03: Merge "Check for constructor first when installing tracing stubs."
* commit '
82771c03ac7e5ed01aec036ff894235bc4dd0cd4':
Check for constructor first when installing tracing stubs.
Jeff Hao [Tue, 19 Aug 2014 17:45:06 +0000 (17:45 +0000)]
am
614fbb86: am
5afe466c: Check for constructor first when installing tracing stubs.
* commit '
614fbb8630351c8a69345fd7bc6bef08cefe3658':
Check for constructor first when installing tracing stubs.
Jeff Hao [Tue, 19 Aug 2014 17:35:59 +0000 (17:35 +0000)]
am
5afe466c: Check for constructor first when installing tracing stubs.
* commit '
5afe466c027c6ac821bf7c9a88cd7de5260a639b':
Check for constructor first when installing tracing stubs.
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
Dave Allison [Thu, 14 Aug 2014 17:02:48 +0000 (17:02 +0000)]
Merge stack usage reduction for overflow checks
Cherry pick from:
b038ba66a166fb264ca121632f447712e0973b5b
Change-Id: I19999e72ff731d4fc73d91b9ff767de5858c15ee
Andreas Gampe [Tue, 19 Aug 2014 21:03:22 +0000 (21:03 +0000)]
Merge "ART: Fix ARM invoke stub, run Generic JNI in jni_compiler_test"
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
Change-Id: Ibce423949846e447d2b0246d07973b6b717691ac
Andreas Gampe [Tue, 19 Aug 2014 19:16:29 +0000 (19:16 +0000)]
Merge "ART: Set default visibility to protected" into lmp-dev
Sebastien Hertz [Tue, 19 Aug 2014 12:22:30 +0000 (12:22 +0000)]
am
75dd9883: Merge "Fix JDWP event races"
* commit '
75dd98835859ca98c9f98339da8b64640d09a175':
Fix JDWP event races
Vladimir Marko [Tue, 19 Aug 2014 10:06:47 +0000 (10:06 +0000)]
am
9be4be58: Merge "AArch64: Add tbz/tbnz and tst."
* commit '
9be4be5882a05b3aa6ec822901ff4092203d8dc5':
AArch64: Add tbz/tbnz and tst.
Sebastien Hertz [Tue, 19 Aug 2014 09:21:44 +0000 (09:21 +0000)]
am
b71adf18: am
214f4f15: Merge "Fix JDWP event races" into lmp-dev
* commit '
b71adf18363d852f568b1ca125f5fdd468760e1f':
Fix JDWP event races
Sebastien Hertz [Tue, 19 Aug 2014 09:12:07 +0000 (09:12 +0000)]
am
214f4f15: Merge "Fix JDWP event races" into lmp-dev
* commit '
214f4f15fe0137c285a05b3f70e52a211aecfdb5':
Fix JDWP event races
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
Mathieu Chartier [Tue, 19 Aug 2014 01:00:50 +0000 (01:00 +0000)]
am
562f0ef6: Merge "Fix heap corruption and verification."
* commit '
562f0ef60bb1498fdf3c43fe747ba067ffe6ebed':
Fix heap corruption and verification.
Brian Carlstrom [Tue, 19 Aug 2014 00:56:42 +0000 (00:56 +0000)]
am
5638b7ee: am
5a001b3e: Merge "AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled." into lmp-dev
* commit '
5638b7ee01bb7e64662fcf4beffd14523488d6bd':
AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled.
Brian Carlstrom [Tue, 19 Aug 2014 00:48:48 +0000 (00:48 +0000)]
am
5a001b3e: Merge "AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled." into lmp-dev
* commit '
5a001b3e4a4b4d066fd987071eb38b2b97493807':
AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled.
Brian Carlstrom [Mon, 18 Aug 2014 23:56:41 +0000 (23:56 +0000)]
am
7df1754a: Merge "Really fix target gtest dependencies"
* commit '
7df1754ae17acd891995159fc50f3bb176b770dd':
Really fix target gtest dependencies
Brian Carlstrom [Mon, 18 Aug 2014 23:56:40 +0000 (23:56 +0000)]
am
7968bfc8: Merge "AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled."
* commit '
7968bfc840c926fbb1e4955b165e6eeb67bcc3f5':
AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled.
Mathieu Chartier [Mon, 18 Aug 2014 23:50:28 +0000 (23:50 +0000)]
am
84438f89: am
6724d864: Fix heap corruption and verification.
* commit '
84438f891c83a064b243d89e57b958770f86323d':
Fix heap corruption and verification.
Mathieu Chartier [Mon, 18 Aug 2014 23:41:25 +0000 (23:41 +0000)]
am
6724d864: Fix heap corruption and verification.
* commit '
6724d8649ab73e4fb86c8014bda51b13bddf2f3f':
Fix heap corruption and verification.
Brian Carlstrom [Mon, 18 Aug 2014 23:42:43 +0000 (23:42 +0000)]
Merge "Really fix target gtest dependencies"
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
Brian Carlstrom [Mon, 18 Aug 2014 23:07:10 +0000 (16:07 -0700)]
Really fix target gtest dependencies
In
64006834b26f7138131fac87c3b0973cda70e560 we started depending on
TARGET_CORE_JARS which are phony targets and undefined when using
"mm test-art-target".
Change-Id: I671c5d6068ff999782ad5f388f3077f4c1594884
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
Change-Id: I346cc090e091605c552e5954d7ea1ca4874cea5f
Brian Carlstrom [Tue, 19 Aug 2014 21:11:18 +0000 (21:11 +0000)]
Merge "Make apps able to run with a failing patchoat"
Alex Light [Thu, 14 Aug 2014 21:16:26 +0000 (14:16 -0700)]
Make apps able to run with a failing patchoat
Bug:
17000769
Change-Id: I0a1a4dc7f5d4bb268530840302ecfb1555231e05
Andreas Gampe [Tue, 19 Aug 2014 20:05:38 +0000 (20:05 +0000)]
Merge "ART: Set default visibility to protected"
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
(cherry picked from commit
235e77bd9f19e4faefda109be40f8744f3a66f40)
Change-Id: I9030dcf6116251f434f94a2b08e56e12085af652
Andreas Gampe [Tue, 19 Aug 2014 18:13:41 +0000 (18:13 +0000)]
Merge "ART: More failure output on run-test"
Andreas Gampe [Tue, 19 Aug 2014 05:26:49 +0000 (22:26 -0700)]
ART: More failure output on run-test
Change-Id: Ifdf1516e950117069b3cfa58c4bda03281dad661
Jeff Hao [Tue, 19 Aug 2014 17:47:41 +0000 (17:47 +0000)]
Merge "Check for constructor first when installing tracing stubs."
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
(cherry picked from commit
5afe466c027c6ac821bf7c9a88cd7de5260a639b)
Change-Id: Ic81161d0b96a0633c4c534a93172cff59312fa61
Mathieu Chartier [Tue, 19 Aug 2014 00:44:50 +0000 (00:44 +0000)]
Merge "Fix heap corruption and verification."
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
(cherry picked from commit
6724d8649ab73e4fb86c8014bda51b13bddf2f3f)
Change-Id: I931149421c738653863eb6105dfdf7ecd750601a
Brian Carlstrom [Mon, 18 Aug 2014 23:42:35 +0000 (23:42 +0000)]
Merge "AttachCurrentThread should only warn on missing thread name if CheckJNI is enabled."
Andreas Gampe [Mon, 18 Aug 2014 20:10:55 +0000 (20:10 +0000)]
am
76bc718d: Merge "[MIPS] Fix the code generated by GenSelectConst32"
* commit '
76bc718dc2cf0279ec5afd08c3a82b6ad61756d8':
[MIPS] Fix the code generated by GenSelectConst32
Hiroshi Yamauchi [Mon, 18 Aug 2014 19:34:21 +0000 (19:34 +0000)]
am
92fd388b: Merge "Check that we don\'t accidentally invoke compiled code when -Xint."
* commit '
92fd388b9bb433a54e9e7a4e6ab9415f59d8956c':
Check that we don't accidentally invoke compiled code when -Xint.
Ian Rogers [Mon, 18 Aug 2014 19:34:20 +0000 (19:34 +0000)]
am
506a79fd: Merge "Optimized instrumentation listener handling"
* commit '
506a79fd8a698911b5a82575eed59b9320ae97cd':
Optimized instrumentation listener handling
Andreas Gampe [Mon, 18 Aug 2014 16:52:21 +0000 (16:52 +0000)]
am
90b180ee: Merge "ART: Do not recursively abort when visiting locks in a bad state"
* commit '
90b180ee1edd17b8dca34ea9e58624818d2ee15a':
ART: Do not recursively abort when visiting locks in a bad state
Andreas Gampe [Mon, 18 Aug 2014 16:52:20 +0000 (16:52 +0000)]
am
9d352c06: Merge "ART: Avoid expensive class lookup in compiler driver"
* commit '
9d352c06d8b6e9ea6343cc4f361a3309c2ce7ebe':
ART: Avoid expensive class lookup in compiler driver
Vladimir Marko [Mon, 18 Aug 2014 13:27:54 +0000 (13:27 +0000)]
am
2311e3db: am
dfa7a6c8: Disable load/store elimination. DO NOT MERGE
* commit '
2311e3db454dcad1546a1b67f0443b3b742b5d7f':
Disable load/store elimination. DO NOT MERGE
Vladimir Marko [Mon, 18 Aug 2014 13:20:29 +0000 (13:20 +0000)]
am
dfa7a6c8: Disable load/store elimination. DO NOT MERGE
* commit '
dfa7a6c8711623bf20aad58f57ae980b497ef4d7':
Disable load/store elimination. DO NOT MERGE
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
Piotr Jastrzebski [Mon, 18 Aug 2014 09:12:34 +0000 (09:12 +0000)]
am
76288481: Merge "Update ziparchive usage to the new API."
* commit '
7628848182492bdcdcd7e4161680a4e24ce9486e':
Update ziparchive usage to the new API.
Andreas Gampe [Mon, 18 Aug 2014 05:19:46 +0000 (05:19 +0000)]
am
d75383af: am
5e8a63ae: Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev
* commit '
d75383af2f0843ecd2f493fd64b4eb38630c6071':
ART: Do not recursively abort when visiting locks in a bad state
Andreas Gampe [Mon, 18 Aug 2014 05:12:55 +0000 (05:12 +0000)]
am
5e8a63ae: Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev
* commit '
5e8a63ae39cb5db996229c6c4a1a21a4b8dec5a2':
ART: Do not recursively abort when visiting locks in a bad state
Andreas Gampe [Sun, 17 Aug 2014 09:54:48 +0000 (09:54 +0000)]
am
73386e5e: am
d84f916d: ART: Avoid expensive class lookup in compiler driver
* commit '
73386e5e0358a43c18bd0952a36ef5d4f89ed02b':
ART: Avoid expensive class lookup in compiler driver
Andreas Gampe [Sun, 17 Aug 2014 09:39:32 +0000 (09:39 +0000)]
am
d84f916d: ART: Avoid expensive class lookup in compiler driver
* commit '
d84f916d35bb0dc74d7daa075b883e5ee1ce1109':
ART: Avoid expensive class lookup in compiler driver
Nicolas Geoffray [Wed, 20 Aug 2014 10:22:35 +0000 (10:22 +0000)]
Merge "Fix bug introduced in https://android-review.googlesource.com/102610."
Nicolas Geoffray [Wed, 20 Aug 2014 03:59:12 +0000 (04:59 +0100)]
Fix bug introduced in https://android-review.googlesource.com/102610.
Also make oatdump work again.
Change-Id: Iab96971645f40585bc04769d410f2273d3977f51
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
Sebastien Hertz [Tue, 19 Aug 2014 12:09:20 +0000 (12:09 +0000)]
Merge "Fix JDWP event races"
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
(cherry picked from commit
d8b3537b89fa68599534a65afc3b272639cd4a75)
Change-Id: I4b8996ade6a38fa8f7f23c3000b7184b162907d7
Vladimir Marko [Tue, 19 Aug 2014 09:58:50 +0000 (09:58 +0000)]
Merge "AArch64: Add tbz/tbnz and tst."
Zheng Xu [Mon, 18 Aug 2014 09:28:22 +0000 (17:28 +0800)]
AArch64: Add tbz/tbnz and tst.
Since the branch offset supported by tbz/tbnz is quite small(-32k ~ +32k),
it will be replaced by tst and beq/bneq in the fix-up stage if the branch
offset is too large.
Change-Id: I4cace06bec6425e0f2e1f5f7c471eec08d06bca6
Piotr Jastrzebski [Mon, 18 Aug 2014 08:27:04 +0000 (08:27 +0000)]
Merge "Update ziparchive usage to the new API."
Vladimir Marko [Wed, 20 Aug 2014 15:08:59 +0000 (15:08 +0000)]
Merge "X86: Fix alias info in GenInlinedIndexOf()." into lmp-dev
Vladimir Marko [Tue, 19 Aug 2014 14:00:34 +0000 (15:00 +0100)]
X86: Fix alias info in GenInlinedIndexOf().
For 32-bit X86, GenInlinedIndexOf() pushes and pops EDI. In
one branch it then calls Load32Disp() with adjusted stack
offset. That calculates wrong alias_info for the generated
insn. If left unfixed, this could confuse load hoisting.
Bug:
17128502
(cherry picked from commit
74de63bb1cc275b411cae28a96f9b3a78b939bc2)
Change-Id: I5dc82b7aae9e9655e75843a952b8ebb04269f46b
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
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
Ian Rogers [Mon, 18 Aug 2014 18:22:03 +0000 (18:22 +0000)]
Merge "Optimized instrumentation listener handling"
Daniel Mihalyi [Mon, 18 Aug 2014 16:45:31 +0000 (18:45 +0200)]
Optimized instrumentation listener handling
Some instrumentation listener lists may be modified while iterating
over the list to deliver an instrumentation event. Therefore the
previous implementation copied the list of listeners before starting
the iteration.
This new implementation only copies the list of instrumentation
listeners when the list is changed. Instances of the list are
reference counted using std::shared_ptr<>.
Change-Id: I1b84db1f2042836dc1110925243f49e5790156d6
Andreas Gampe [Mon, 18 Aug 2014 16:40:13 +0000 (16:40 +0000)]
Merge "ART: Avoid expensive class lookup in compiler driver"
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
(cherry picked from commit
d84f916d35bb0dc74d7daa075b883e5ee1ce1109)
Change-Id: I19bcb2a2928207fcae0badd466cdc52945bd37c4
Andreas Gampe [Mon, 18 Aug 2014 20:00:14 +0000 (20:00 +0000)]
Merge "[MIPS] Fix the code generated by GenSelectConst32"
Hiroshi Yamauchi [Mon, 18 Aug 2014 18:53:39 +0000 (18:53 +0000)]
Merge "Check that we don't accidentally invoke compiled code when -Xint."
Hiroshi Yamauchi [Sat, 16 Aug 2014 00:11:12 +0000 (17:11 -0700)]
Check that we don't accidentally invoke compiled code when -Xint.
The heap poisoning breakge (b/
17018234) would have been detected with
this check.
Bug:
17018234
Change-Id: If4827ea1b02396d41012f0955e55c887387a0565
Andreas Gampe [Mon, 18 Aug 2014 16:41:58 +0000 (16:41 +0000)]
Merge "ART: Do not recursively abort when visiting locks in a bad state"
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
(cherry picked from commit
760172c3ccd6e75f6f1a89d8006934e8ffb1303e)
Change-Id: Id604976ac9dcac0e319fb25cab4d2cbc98d7ee24
Hiroshi Yamauchi [Tue, 19 Aug 2014 21:58:24 +0000 (21:58 +0000)]
Merge "Avoid handle-less methods in ClassLinker::LinkInterfaceMethods()."
Hiroshi Yamauchi [Tue, 19 Aug 2014 20:10:36 +0000 (13:10 -0700)]
Avoid handle-less methods in ClassLinker::LinkInterfaceMethods().
There were some handle-less methods in local variables across
potential GC points.
Bug:
12687968
Change-Id: I786fbaadf7a52e98194080c67c90fc1c35060d59
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