OSDN Git Service
Andreas Gampe [Mon, 4 Aug 2014 20:32:07 +0000 (20:32 +0000)]
am
34679315: am
7aaa8dbf: Merge "ART: Implement the easy long division/remainder by a constant"
* commit '
346793153db6cbe7bc34db05866fcd1e2dedc16f':
ART: Implement the easy long division/remainder by a constant
Andreas Gampe [Mon, 4 Aug 2014 20:24:30 +0000 (20:24 +0000)]
am
7aaa8dbf: Merge "ART: Implement the easy long division/remainder by a constant"
* commit '
7aaa8dbfbcde7f58564b42044892891559669838':
ART: Implement the easy long division/remainder by a constant
Brian Carlstrom [Mon, 4 Aug 2014 19:37:56 +0000 (19:37 +0000)]
am
51e9956f: am
4e97f656: Merge "Move image classes options from art to AndroidRuntime [art]"
* commit '
51e9956fd7ba9a43b7a907e89e9e82aec530fb50':
Move image classes options from art to AndroidRuntime [art]
Brian Carlstrom [Mon, 4 Aug 2014 19:37:55 +0000 (19:37 +0000)]
am
8cfccae4: am
dc3ca147: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]"
* commit '
8cfccae464825bc263245f898d4d45967c714356':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]
Brian Carlstrom [Mon, 4 Aug 2014 19:26:35 +0000 (19:26 +0000)]
am
4e97f656: Merge "Move image classes options from art to AndroidRuntime [art]"
* commit '
4e97f6564fa51609d5651374dcdd2a8f4e79f272':
Move image classes options from art to AndroidRuntime [art]
Brian Carlstrom [Mon, 4 Aug 2014 19:26:34 +0000 (19:26 +0000)]
am
dc3ca147: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]"
* commit '
dc3ca147ee880088eb2f52b7b0355062ba5749be':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]
Andreas Gampe [Mon, 4 Aug 2014 17:55:54 +0000 (17:55 +0000)]
am
d1831615: am
77a5b501: Merge "AArch64: Remove unnecessary work around for sp."
* commit '
d18316153256c5c2ef46db1cdd6c3e45b85b674f':
AArch64: Remove unnecessary work around for sp.
Andreas Gampe [Mon, 4 Aug 2014 17:52:59 +0000 (17:52 +0000)]
am
77a5b501: Merge "AArch64: Remove unnecessary work around for sp."
* commit '
77a5b50148633c2651edb7f35f5254e40cc878dc':
AArch64: Remove unnecessary work around for sp.
Narayan Kamath [Mon, 4 Aug 2014 17:43:04 +0000 (17:43 +0000)]
am
e7187d7f: am
f7f6c978: Merge "Inform about System.exit() call in logcat"
* commit '
e7187d7f3f184910139abcad630d0f7f653aa388':
Inform about System.exit() call in logcat
Narayan Kamath [Mon, 4 Aug 2014 17:38:47 +0000 (17:38 +0000)]
am
f7f6c978: Merge "Inform about System.exit() call in logcat"
* commit '
f7f6c978d44a785d4c12879c6ca20ca1832d3217':
Inform about System.exit() call in logcat
Andreas Gampe [Mon, 4 Aug 2014 16:45:53 +0000 (16:45 +0000)]
am
65b62ba0: am
7906b25f: Merge "ART: Rework ARM64 entry sequence"
* commit '
65b62ba00c01602f3eb22a2b88594fc9f2da5370':
ART: Rework ARM64 entry sequence
Andreas Gampe [Mon, 4 Aug 2014 16:40:46 +0000 (16:40 +0000)]
am
7906b25f: Merge "ART: Rework ARM64 entry sequence"
* commit '
7906b25f79f24af3a8b8eee0454b4db1278b9b77':
ART: Rework ARM64 entry sequence
Narayan Kamath [Mon, 4 Aug 2014 12:27:16 +0000 (12:27 +0000)]
am
ddce1213: am
d4c3c62c: Fix broken JNI IsAssignableFrom.
* commit '
ddce1213efce14fd9973eb47ef2fdcffec300550':
Fix broken JNI IsAssignableFrom.
Narayan Kamath [Mon, 4 Aug 2014 12:17:41 +0000 (12:17 +0000)]
am
d4c3c62c: Fix broken JNI IsAssignableFrom.
* commit '
d4c3c62cc68296fbaf35e7b37108c2fde2278a3b':
Fix broken JNI IsAssignableFrom.
Narayan Kamath [Mon, 4 Aug 2014 11:50:26 +0000 (11:50 +0000)]
am
93c6171c: am
43c63b5a: Merge "Fix broken JNI IsAssignableFrom."
* commit '
93c6171cfb3e4da2a5b07bcc647c15223cc90b12':
Fix broken JNI IsAssignableFrom.
Narayan Kamath [Mon, 4 Aug 2014 11:39:30 +0000 (11:39 +0000)]
am
43c63b5a: Merge "Fix broken JNI IsAssignableFrom."
* commit '
43c63b5aaa7cd1c6d0ca13b7ea28cc321848d127':
Fix broken JNI IsAssignableFrom.
Narayan Kamath [Fri, 11 Jul 2014 18:15:11 +0000 (19:15 +0100)]
Fix broken JNI IsAssignableFrom.
The expected argument order was the opposite of what the spec
dictated.
Reported-By: Mikhail Naganov <mnaganov@google.com>
bug:
16531674
(cherry picked from commit
1268b742c8cff7318dc0b5b283cbaeabfe0725ba)
Change-Id: I2b6636998c4e15c1eb10dc96a57940aca56c4d0d
Narayan Kamath [Mon, 4 Aug 2014 17:31:49 +0000 (17:31 +0000)]
Merge "Inform about System.exit() call in logcat"
Dmitry Petrochenko [Thu, 3 Jul 2014 10:07:45 +0000 (17:07 +0700)]
Inform about System.exit() call in logcat
This diagnostic message helps to filter out crashes during System.exit()
when thread's behaviour is undefined.
Change-Id: I772932a35b503b1efca695e7da7bf2e562c03a7c
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Narayan Kamath [Mon, 4 Aug 2014 11:24:20 +0000 (11:24 +0000)]
Merge "Fix broken JNI IsAssignableFrom."
Narayan Kamath [Fri, 11 Jul 2014 18:15:11 +0000 (19:15 +0100)]
Fix broken JNI IsAssignableFrom.
The expected argument order was the opposite of what the spec
dictated.
Reported-By: Mikhail Naganov <mnaganov@google.com>
bug:
16531674
Change-Id: I1ebc6d5814ebb4feeb96f3ecdf1a4602da4ba7ce
Andreas Gampe [Mon, 4 Aug 2014 19:36:53 +0000 (19:36 +0000)]
Merge "ART: Implement the easy long division/remainder by a constant"
Alexei Zavjalov [Mon, 14 Jul 2014 19:19:41 +0000 (02:19 +0700)]
ART: Implement the easy long division/remainder by a constant
Also optimizes long/int divisions by power-of-two values.
Also do some clean-up.
Change-Id: Ie414e64aac251c81361ae107d157c14439e6dab5
Signed-off-by: Alexei Zavjalov <alexei.zavjalov@intel.com>
Brian Carlstrom [Mon, 4 Aug 2014 18:27:31 +0000 (18:27 +0000)]
Merge "Move image classes options from art to AndroidRuntime [art]"
Brian Carlstrom [Mon, 4 Aug 2014 18:27:30 +0000 (18:27 +0000)]
Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]"
Andreas Gampe [Mon, 4 Aug 2014 16:32:25 +0000 (16:32 +0000)]
Merge "ART: Rework ARM64 entry sequence"
Andreas Gampe [Tue, 29 Jul 2014 07:35:00 +0000 (00:35 -0700)]
ART: Rework ARM64 entry sequence
Try to fold one sub of SP in the ARM64 entry sequence. When the
framesize is small, generate a sub over the full frame-size, and
adjust the spill offsets accordingly. If the framesize is too
large, use a pre-indexed store and fill upwards from there.
Change-Id: I1c15ac6276fb62b8164372de02fd92437f605938
Andreas Gampe [Mon, 4 Aug 2014 17:46:05 +0000 (17:46 +0000)]
Merge "AArch64: Remove unnecessary work around for sp."
Zheng Xu [Tue, 1 Jul 2014 01:53:22 +0000 (09:53 +0800)]
AArch64: Remove unnecessary work around for sp.
Use RegRegRegExtend to encode instruction for "sub/add sp, sp, Xm".
Change-Id: I13d3d2d386a7bd827e1396f291a7dcb9bffd5a29
Bill Buzbee [Thu, 31 Jul 2014 22:40:05 +0000 (22:40 +0000)]
am
dbfae92c: am
89c210bf: Merge "Revert "Revert "Enable Load Store Elimination for ARM and ARM64"""
* commit '
dbfae92cdf7bc446f52dbfa807b112b20be0119e':
Revert "Revert "Enable Load Store Elimination for ARM and ARM64""
Hiroshi Yamauchi [Thu, 31 Jul 2014 22:40:03 +0000 (22:40 +0000)]
am
212704ab: am
59a5525e: Merge "Add read barriers for the roots in the verifier."
* commit '
212704ab469ef40cd74c796b767f04808bc15ac9':
Add read barriers for the roots in the verifier.
Bill Buzbee [Thu, 31 Jul 2014 22:29:01 +0000 (22:29 +0000)]
am
89c210bf: Merge "Revert "Revert "Enable Load Store Elimination for ARM and ARM64"""
* commit '
89c210bf418a152ccabfbbf853ddcce33aea450d':
Revert "Revert "Enable Load Store Elimination for ARM and ARM64""
Hiroshi Yamauchi [Thu, 31 Jul 2014 22:28:53 +0000 (22:28 +0000)]
am
59a5525e: Merge "Add read barriers for the roots in the verifier."
* commit '
59a5525e72d723c8598b6271c7b09845999beeb0':
Add read barriers for the roots in the verifier.
Bill Buzbee [Thu, 31 Jul 2014 21:02:56 +0000 (21:02 +0000)]
Merge "Revert "Revert "Enable Load Store Elimination for ARM and ARM64"""
Narayan Kamath [Thu, 31 Jul 2014 18:18:14 +0000 (18:18 +0000)]
am
b8642b03: am
2eb3769c: Merge "Make ImageSpace skip validation if we are using a relocated image"
* commit '
b8642b0353e3128fed986bbdfd64ed0d3851bd06':
Make ImageSpace skip validation if we are using a relocated image
Narayan Kamath [Thu, 31 Jul 2014 18:14:23 +0000 (18:14 +0000)]
am
2eb3769c: Merge "Make ImageSpace skip validation if we are using a relocated image"
* commit '
2eb3769cf75724ce84dcb1b11bddcc1247444799':
Make ImageSpace skip validation if we are using a relocated image
Narayan Kamath [Thu, 31 Jul 2014 17:23:47 +0000 (17:23 +0000)]
am
46bf004f: am
1175aec5: Merge "Fix image not regenerating on changes to bootclasspath"
* commit '
46bf004f3825802adc439e8934e9610ddc7fc46a':
Fix image not regenerating on changes to bootclasspath
Narayan Kamath [Thu, 31 Jul 2014 17:18:41 +0000 (17:18 +0000)]
am
1175aec5: Merge "Fix image not regenerating on changes to bootclasspath"
* commit '
1175aec5f686b9e3d429282d7d4022c39436f71f':
Fix image not regenerating on changes to bootclasspath
Vladimir Marko [Thu, 31 Jul 2014 14:34:46 +0000 (14:34 +0000)]
am
b17235f4: am
07206af3: Reduce time and memory usage of GVN.
* commit '
b17235f4b5d3d60085e4c39db03697e48f3e2c85':
Reduce time and memory usage of GVN.
Vladimir Marko [Thu, 31 Jul 2014 14:28:47 +0000 (14:28 +0000)]
am
07206af3: Reduce time and memory usage of GVN.
* commit '
07206af370746e6d7cf528e655b4854e7a865cfa':
Reduce time and memory usage of GVN.
Bill Buzbee [Thu, 31 Jul 2014 14:19:24 +0000 (14:19 +0000)]
am
334c6c33: am
00d1ef41: Merge "ART: LoadConstWide should clobber temp reg"
* commit '
334c6c337dcdb221983a6ffd7c4b696348ba5989':
ART: LoadConstWide should clobber temp reg
Bill Buzbee [Thu, 31 Jul 2014 14:15:48 +0000 (14:15 +0000)]
am
00d1ef41: Merge "ART: LoadConstWide should clobber temp reg"
* commit '
00d1ef41d0d0d438d604d102183a6bfac58643e7':
ART: LoadConstWide should clobber temp reg
Vladimir Marko [Thu, 31 Jul 2014 13:35:12 +0000 (13:35 +0000)]
am
608d1dac: am
70f7d48b: Merge "Reduce time and memory usage of GVN."
* commit '
608d1dac29e2f48edc47f979fa4736dfda28a04c':
Reduce time and memory usage of GVN.
Andreas Gampe [Thu, 31 Jul 2014 13:35:11 +0000 (13:35 +0000)]
am
805fbf31: am
36b111c7: Merge "ART: Build fix"
* commit '
805fbf3182e1835507558c678c477ac56e12aa52':
ART: Build fix
Ian Rogers [Thu, 31 Jul 2014 13:35:11 +0000 (13:35 +0000)]
am
2a3e3d02: am
cc75c1b3: Merge "1. Fix CFI for quick compiled code in x86 & x86_64; 2. Emit CFI in .eh_frame instead of .debug_frame."
* commit '
2a3e3d02d322725134972ef1fb22d1974e21c684':
1. Fix CFI for quick compiled code in x86 & x86_64; 2. Emit CFI in .eh_frame instead of .debug_frame.
Ian Rogers [Thu, 31 Jul 2014 13:35:10 +0000 (13:35 +0000)]
am
c7636760: am
9900a610: Merge "Add --always-clean flag to run-test."
* commit '
c7636760460013494d3204445b22aa86fb873226':
Add --always-clean flag to run-test.
Vladimir Marko [Thu, 31 Jul 2014 13:26:38 +0000 (13:26 +0000)]
am
70f7d48b: Merge "Reduce time and memory usage of GVN."
* commit '
70f7d48b9f2ad768c1e1a5bd96979870379f05e2':
Reduce time and memory usage of GVN.
Andreas Gampe [Thu, 31 Jul 2014 13:26:31 +0000 (13:26 +0000)]
am
36b111c7: Merge "ART: Build fix"
* commit '
36b111c7d3d635e262114dabde4c26952c7dcbe6':
ART: Build fix
Ian Rogers [Thu, 31 Jul 2014 13:26:15 +0000 (13:26 +0000)]
am
cc75c1b3: Merge "1. Fix CFI for quick compiled code in x86 & x86_64; 2. Emit CFI in .eh_frame instead of .debug_frame."
* commit '
cc75c1b38e811cc1cb93ce8f8fcc9a83e20844fb':
1. Fix CFI for quick compiled code in x86 & x86_64; 2. Emit CFI in .eh_frame instead of .debug_frame.
Ian Rogers [Thu, 31 Jul 2014 13:26:14 +0000 (13:26 +0000)]
am
9900a610: Merge "Add --always-clean flag to run-test."
* commit '
9900a610fbb40c49b0503183b79c4bbb376c4128':
Add --always-clean flag to run-test.
Vladimir Marko [Tue, 29 Jul 2014 11:04:10 +0000 (12:04 +0100)]
Reduce time and memory usage of GVN.
Filter out dead sregs in GVN. Reclaim memory after each LVN
in the GVN modification phase.
Bug:
16398693
(cherry picked from commit
b19955d3c8fbd9588f7e17299e559d02938154b6)
Change-Id: I33c7912258a768b4c99d787056979fbc3b023b3b
Andreas Gampe [Thu, 31 Jul 2014 04:03:27 +0000 (04:03 +0000)]
am
5cc3f418: am
b99b8d6c: ART: Fix verifier mishandling erroneous array component types
* commit '
5cc3f4182ffd952e17f1924fb76df112d76e9e86':
ART: Fix verifier mishandling erroneous array component types
Andreas Gampe [Thu, 31 Jul 2014 03:59:42 +0000 (03:59 +0000)]
am
b99b8d6c: ART: Fix verifier mishandling erroneous array component types
* commit '
b99b8d6cffe08d8c9d30175c936e5c88d3101802':
ART: Fix verifier mishandling erroneous array component types
Andreas Gampe [Thu, 31 Jul 2014 03:51:45 +0000 (03:51 +0000)]
am
58c8f556: am
e34e467f: Merge "ART: Fix verifier mishandling erroneous array component types"
* commit '
58c8f556dac34ce4e0cfc5f364116e67d513638f':
ART: Fix verifier mishandling erroneous array component types
Andreas Gampe [Thu, 31 Jul 2014 03:48:14 +0000 (03:48 +0000)]
am
e34e467f: Merge "ART: Fix verifier mishandling erroneous array component types"
* commit '
e34e467f9adf59ba7febdc22b6329ef4b853e123':
ART: Fix verifier mishandling erroneous array component types
Andreas Gampe [Thu, 31 Jul 2014 01:59:05 +0000 (18:59 -0700)]
ART: Fix verifier mishandling erroneous array component types
The verifier must not assume that component types are not erroneous.
Bug:
16661259
(cherry picked from commit
aa910d5ef43256102809e397de305c23f1c315e6)
Change-Id: I6d607310593ac337616581bfdff5eb29a8dd1b9d
Mathieu Chartier [Thu, 31 Jul 2014 00:46:00 +0000 (00:46 +0000)]
am
87a14afc: am
6bff7130: Add support for bump pointer spaces to DdmSendHeapSegments.
* commit '
87a14afc7b69ac36c9cf8ca14c5036b500458576':
Add support for bump pointer spaces to DdmSendHeapSegments.
Mathieu Chartier [Thu, 31 Jul 2014 00:39:58 +0000 (00:39 +0000)]
am
6bff7130: Add support for bump pointer spaces to DdmSendHeapSegments.
* commit '
6bff7130878128c9836a21ae58d0cfdb0075b1b5':
Add support for bump pointer spaces to DdmSendHeapSegments.
Mathieu Chartier [Thu, 31 Jul 2014 00:30:21 +0000 (00:30 +0000)]
am
4ce0c3b4: am
da4a1264: Merge "Add support for bump pointer spaces to DdmSendHeapSegments."
* commit '
4ce0c3b4c3d26d97f6547c988494182584d53761':
Add support for bump pointer spaces to DdmSendHeapSegments.
Mathieu Chartier [Thu, 31 Jul 2014 00:26:19 +0000 (00:26 +0000)]
am
da4a1264: Merge "Add support for bump pointer spaces to DdmSendHeapSegments."
* commit '
da4a1264cd7d5db9ed01cfd1eeaed71cb11c6c71':
Add support for bump pointer spaces to DdmSendHeapSegments.
Mathieu Chartier [Wed, 30 Jul 2014 21:59:56 +0000 (14:59 -0700)]
Add support for bump pointer spaces to DdmSendHeapSegments.
Added support for bump pointer spaces as well as
differentiating between DlMallocSpaces and RosAllocSpaces.
Added logic to reset the start of next chunk to prevent
inbetween space regions counted as free.
Fixed a debug build bug where we were doing an mprotect after
creating a rosalloc space. In debug builds, this writes a magic
value in the page. This was faulting since it was set to PROT_NONE.
The fix moves the mprotect before the RosAlloc space creation.
Bug:
16408851
(cherry picked from commit
36dab3607e77505ce139eacef1c62a1c4bc4affd)
Change-Id: I5095feb01fa7e248178a2833da7f821f4fd52c89
Brian Carlstrom [Wed, 30 Jul 2014 22:13:25 +0000 (15:13 -0700)]
Move image classes options from art to AndroidRuntime [art]
Bug:
15165413
Change-Id: I3dfa702ac29279cf76d4cc451138c03a5158ac3a
Brian Carlstrom [Tue, 29 Jul 2014 02:13:27 +0000 (19:13 -0700)]
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]
This will allow us to conditionally change the compiler-filter based on other properties.
Bug:
15165413
Change-Id: I6877a6eab221ab142909b595fd28191b5d3a095b
Andreas Gampe [Thu, 31 Jul 2014 06:24:06 +0000 (06:24 +0000)]
Merge "ART: Build fix"
Andreas Gampe [Thu, 31 Jul 2014 06:21:36 +0000 (23:21 -0700)]
ART: Build fix
Make lint happy, as comments should be separated from code.
Change-Id: I4bfd88357302be9a6a104f1152e3b1fda386371e
Andreas Gampe [Thu, 31 Jul 2014 03:39:34 +0000 (03:39 +0000)]
Merge "ART: Fix verifier mishandling erroneous array component types"
Andreas Gampe [Thu, 31 Jul 2014 01:59:05 +0000 (18:59 -0700)]
ART: Fix verifier mishandling erroneous array component types
The verifier must not assume that component types are not erroneous.
Bug:
16661259
Change-Id: I23b2f517259ca9c0b8a1aa38f6348fcd61e0b22e
Mathieu Chartier [Thu, 31 Jul 2014 00:15:37 +0000 (00:15 +0000)]
Merge "Add support for bump pointer spaces to DdmSendHeapSegments."
Mathieu Chartier [Wed, 30 Jul 2014 21:59:56 +0000 (14:59 -0700)]
Add support for bump pointer spaces to DdmSendHeapSegments.
Added support for bump pointer spaces as well as
differentiating between DlMallocSpaces and RosAllocSpaces.
Added logic to reset the start of next chunk to prevent
inbetween space regions counted as free.
Fixed a debug build bug where we were doing an mprotect after
creating a rosalloc space. In debug builds, this writes a magic
value in the page. This was faulting since it was set to PROT_NONE.
The fix moves the mprotect before the RosAlloc space creation.
Bug:
16408851
Change-Id: Ibe18198d05ff353fbb57d10b2f7719fdcbf1c5f0
Brian Carlstrom [Wed, 30 Jul 2014 17:55:11 +0000 (17:55 +0000)]
am
3623c1c2: am
01a0ebb6: Merge "Make 32bit run-tests work correctly on 64bit default devices."
* commit '
3623c1c254f660e51605d9f02aeb8c41441201b5':
Make 32bit run-tests work correctly on 64bit default devices.
Brian Carlstrom [Wed, 30 Jul 2014 17:49:42 +0000 (17:49 +0000)]
am
01a0ebb6: Merge "Make 32bit run-tests work correctly on 64bit default devices."
* commit '
01a0ebb6b96c32879dcad99d515fc0cd8de2a266':
Make 32bit run-tests work correctly on 64bit default devices.
Jeff Hao [Wed, 30 Jul 2014 16:54:54 +0000 (16:54 +0000)]
am
edf7bbb9: am
c7c6d18a: Stop thread from reattaching during runtime shutdown while tracing.
* commit '
edf7bbb9c32ca62a6bdfa8ecb9ba19c08c36177d':
Stop thread from reattaching during runtime shutdown while tracing.
Jeff Hao [Wed, 30 Jul 2014 16:54:48 +0000 (16:54 +0000)]
am
923c7b00: am
78b367a6: Merge "Submitted wrong changelist!" into lmp-dev
* commit '
923c7b00ce0bea0578a5687837f8c7e531300cc3':
Submitted wrong changelist!
Jeff Hao [Wed, 30 Jul 2014 16:54:47 +0000 (16:54 +0000)]
am
69c914e8: am
fb74d873: Merge "Stop thread from reattaching during runtime shutdown while tracing." into lmp-dev
* commit '
69c914e85145439d5145ff9be702ab17950a24e9':
Stop thread from reattaching during runtime shutdown while tracing.
Andreas Gampe [Wed, 30 Jul 2014 16:54:46 +0000 (16:54 +0000)]
am
1ff86944: am
5cac343e: ART: Check for duplicate class definitions in dex file verifier
* commit '
1ff86944b70dd42a1d5235afc1ee41061db2ea5c':
ART: Check for duplicate class definitions in dex file verifier
Jeff Hao [Wed, 30 Jul 2014 16:42:18 +0000 (16:42 +0000)]
am
c7c6d18a: Stop thread from reattaching during runtime shutdown while tracing.
* commit '
c7c6d18a90079b67a7592d3f2cb3d4c6f0081512':
Stop thread from reattaching during runtime shutdown while tracing.
Jeff Hao [Wed, 30 Jul 2014 16:41:54 +0000 (16:41 +0000)]
am
78b367a6: Merge "Submitted wrong changelist!" into lmp-dev
* commit '
78b367a666deb0325b5f509021b14a53625d3786':
Submitted wrong changelist!
Jeff Hao [Wed, 30 Jul 2014 16:41:54 +0000 (16:41 +0000)]
am
fb74d873: Merge "Stop thread from reattaching during runtime shutdown while tracing." into lmp-dev
* commit '
fb74d873bde1ea396f5e8603f2c193e7b539345f':
Stop thread from reattaching during runtime shutdown while tracing.
Andreas Gampe [Wed, 30 Jul 2014 16:38:51 +0000 (16:38 +0000)]
am
5cac343e: ART: Check for duplicate class definitions in dex file verifier
* commit '
5cac343e28fe28d4bc9ccc6db5cab38db1f2b59d':
ART: Check for duplicate class definitions in dex file verifier
Andreas Gampe [Wed, 30 Jul 2014 15:34:46 +0000 (15:34 +0000)]
am
610b4492: am
ef57ed72: Merge "ART: Remove bogus dcheck"
* commit '
610b449297336ccec25697352ad3c5d1bdb1af01':
ART: Remove bogus dcheck
Andreas Gampe [Wed, 30 Jul 2014 15:31:53 +0000 (15:31 +0000)]
am
ef57ed72: Merge "ART: Remove bogus dcheck"
* commit '
ef57ed72a3ac856f6115ae89c609d4fd892e8c41':
ART: Remove bogus dcheck
Andreas Gampe [Wed, 30 Jul 2014 14:29:12 +0000 (14:29 +0000)]
am
ecce76be: am
eaa6da1b: ART: Bump oat version for embedded vtable
* commit '
ecce76be903f430c1889c8759fcc091dc5637b5f':
ART: Bump oat version for embedded vtable
Mingyao Yang [Wed, 30 Jul 2014 14:29:10 +0000 (14:29 +0000)]
am
865a18bf: am
9854fe24: Fix build, missing spaces around =/<.
* commit '
865a18bfe79aaca1dfafdcb84d6a3a134d6394cc':
Fix build, missing spaces around =/<.
Andreas Gampe [Wed, 30 Jul 2014 14:14:58 +0000 (14:14 +0000)]
am
eaa6da1b: ART: Bump oat version for embedded vtable
* commit '
eaa6da1b8381bc7cb9076e90b7ec06812b9d0d2d':
ART: Bump oat version for embedded vtable
Mingyao Yang [Wed, 30 Jul 2014 14:14:57 +0000 (14:14 +0000)]
am
9854fe24: Fix build, missing spaces around =/<.
* commit '
9854fe24d3e22a2e232597b4334ac93205ff17ed':
Fix build, missing spaces around =/<.
Mingyao Yang [Wed, 30 Jul 2014 13:04:08 +0000 (13:04 +0000)]
am
f3fc5a6d: resolved conflicts for merge of
e19f2b00 to lmp-dev-plus-aosp
* commit '
f3fc5a6d29cf7cadc0ac1bd4567042aac27ec543':
Set vtable in class object to null after linking.
Mingyao Yang [Wed, 30 Jul 2014 04:47:26 +0000 (21:47 -0700)]
resolved conflicts for merge of
e19f2b00 to lmp-dev-plus-aosp
Change-Id: I678a541f0bcef726db44ccb50cb6feb71ec498e5
Jeff Hao [Tue, 29 Jul 2014 01:35:38 +0000 (18:35 -0700)]
Stop thread from reattaching during runtime shutdown while tracing.
Bug:
16024763
(cherry picked from commit
c5d824a20c225763761a6dff43294b229ff35469)
Change-Id: Ideab9adedabf3c58f5162e43e79c72af0642bdfa
Andreas Gampe [Tue, 29 Jul 2014 23:29:37 +0000 (23:29 +0000)]
am
4b8fb144: am
f90283f6: Merge "ART: Check for duplicate class definitions in dex file verifier"
* commit '
4b8fb144c790ccfa7556d2c4bda143d3725d5d9c':
ART: Check for duplicate class definitions in dex file verifier
Andreas Gampe [Tue, 29 Jul 2014 23:26:04 +0000 (23:26 +0000)]
am
f90283f6: Merge "ART: Check for duplicate class definitions in dex file verifier"
* commit '
f90283f61d6ca37abf3a9fb8447d05e79caf0160':
ART: Check for duplicate class definitions in dex file verifier
Andreas Gampe [Tue, 29 Jul 2014 08:22:07 +0000 (01:22 -0700)]
ART: Check for duplicate class definitions in dex file verifier
Reject dex files that try to define two classes with the same type id.
Bug:
16016492
(cherry picked from commit
0ba238dcc21ae3544e1e8cb5d108725db8a1c134)
Change-Id: Ie04a684b41b50313449b87c5c3574e89f800e254
Narayan Kamath [Thu, 31 Jul 2014 18:06:57 +0000 (18:06 +0000)]
Merge "Make ImageSpace skip validation if we are using a relocated image"
Alex Light [Thu, 31 Jul 2014 17:48:46 +0000 (10:48 -0700)]
Make ImageSpace skip validation if we are using a relocated image
Change-Id: I0682d1870f5b3e27adb9c9de803fbb7d364ad00d
Narayan Kamath [Thu, 31 Jul 2014 16:56:26 +0000 (16:56 +0000)]
Merge "Fix image not regenerating on changes to bootclasspath"
Alex Light [Thu, 31 Jul 2014 16:32:13 +0000 (09:32 -0700)]
Fix image not regenerating on changes to bootclasspath
Bug:
16367410
Change-Id: I10e81d068ffc2ab712a287f88ef67f6a1be4df4c
Jeff Hao [Tue, 29 Jul 2014 22:25:53 +0000 (22:25 +0000)]
am
83e33c05: am
58e17cea: Merge "Stop thread from reattaching during runtime shutdown while tracing."
* commit '
83e33c05267e64085c7454bbfbe29dc00b70536d':
Stop thread from reattaching during runtime shutdown while tracing.
Hiroshi Yamauchi [Tue, 29 Jul 2014 22:25:52 +0000 (22:25 +0000)]
am
88e251f0: am
f2e92073: Merge "Add GcRoot to clean up and enforce read barriers."
* commit '
88e251f031cec2b81818e7b7b836bfdfb229ac1e':
Add GcRoot to clean up and enforce read barriers.
Jeff Hao [Tue, 29 Jul 2014 22:21:52 +0000 (22:21 +0000)]
am
58e17cea: Merge "Stop thread from reattaching during runtime shutdown while tracing."
* commit '
58e17cea2da3e541610e9bcdf8ef3efd983e1390':
Stop thread from reattaching during runtime shutdown while tracing.
Hiroshi Yamauchi [Tue, 29 Jul 2014 22:21:51 +0000 (22:21 +0000)]
am
f2e92073: Merge "Add GcRoot to clean up and enforce read barriers."
* commit '
f2e920734dddbc0eee35c3ba27b88b732df4f82c':
Add GcRoot to clean up and enforce read barriers.
Andreas Gampe [Tue, 29 Jul 2014 21:45:33 +0000 (14:45 -0700)]
ART: Bump oat version for embedded vtable
Change-Id: Ieb84a8d9486a3d99d48e8395ef3634a365142f2f