OSDN Git Service
Mathieu Chartier [Mon, 4 May 2015 18:44:45 +0000 (18:44 +0000)]
am
1384f29a: am
a93b104b: Merge "Improve JNI registration failure logging"
* commit '
1384f29a2e5c9c7e560f17672f0634fb51451044':
Improve JNI registration failure logging
Mathieu Chartier [Mon, 4 May 2015 18:32:27 +0000 (18:32 +0000)]
am
a93b104b: Merge "Improve JNI registration failure logging"
* commit '
a93b104b47da67eaa50f8a6b7280cc6c438ef37b':
Improve JNI registration failure logging
Mathieu Chartier [Mon, 4 May 2015 18:17:40 +0000 (18:17 +0000)]
Merge "Improve JNI registration failure logging"
Mathieu Chartier [Mon, 4 May 2015 17:18:24 +0000 (10:18 -0700)]
Improve JNI registration failure logging
Print INTERNAL_FATAL instead of ERROR, print the
"Failed to register native method" message last.
Bug:
13885477
Change-Id: I9f1a7ea45bd926f3984b8008d84c75e676a1ed10
Mathieu Chartier [Mon, 4 May 2015 17:37:08 +0000 (17:37 +0000)]
am
46578a4a: Fix NanoSleep and add test
* commit '
46578a4a3bf235fde35ed80c6e6cbe8fb5f06b48':
Fix NanoSleep and add test
Mathieu Chartier [Mon, 4 May 2015 17:30:47 +0000 (17:30 +0000)]
am
b2a62122: am
a6f2a7e0: Merge "Fix NanoSleep and add test"
* commit '
b2a62122e8f512915836a12a703b2567cebddd99':
Fix NanoSleep and add test
Mathieu Chartier [Mon, 4 May 2015 17:25:02 +0000 (17:25 +0000)]
am
414369a2: Add some more DISALLOW_COPY_AND_ASSIGN
* commit '
414369a2e3f23e1408fc1cbf4f623014bd95cb8f':
Add some more DISALLOW_COPY_AND_ASSIGN
Mathieu Chartier [Mon, 4 May 2015 17:18:55 +0000 (17:18 +0000)]
am
a6f2a7e0: Merge "Fix NanoSleep and add test"
* commit '
a6f2a7e01433926339866afc2b413770774c6d9f':
Fix NanoSleep and add test
Mathieu Chartier [Mon, 4 May 2015 17:10:47 +0000 (17:10 +0000)]
Merge "Fix NanoSleep and add test"
Mathieu Chartier [Mon, 4 May 2015 16:53:43 +0000 (09:53 -0700)]
Fix NanoSleep and add test
Fixed a bug where tv_nsec was't between 0 and 999,999,999.
(cherry picked from commit
0b063d9ba7a11779667c0888e9f3495de0118b74)
Bug:
14450052
Change-Id: I30b29a716bfa63c6b57d589dd1102d2ca934c061
Mathieu Chartier [Mon, 4 May 2015 16:53:43 +0000 (09:53 -0700)]
Fix NanoSleep and add test
Fixed a bug where tv_nsec was't between 0 and 999,999,999.
Bug:
14450052
Change-Id: I30b29a716bfa63c6b57d589dd1102d2ca934c061
Mathieu Chartier [Sun, 3 May 2015 22:20:23 +0000 (15:20 -0700)]
Add some more DISALLOW_COPY_AND_ASSIGN
May help prevent bugs maybe.
(cherry picked from commit
3130cdf29eb203be0c38d1107a65d920ec39c106)
Change-Id: Ie73d469dfcd078492ecb3aa28682b42707221202
Mathieu Chartier [Sun, 3 May 2015 22:40:56 +0000 (22:40 +0000)]
am
25919277: am
8a30bf23: Merge "Add some more DISALLOW_COPY_AND_ASSIGN"
* commit '
2591927761cbec8665a38d23980e36037d08ee07':
Add some more DISALLOW_COPY_AND_ASSIGN
Mathieu Chartier [Sun, 3 May 2015 22:33:05 +0000 (22:33 +0000)]
am
8a30bf23: Merge "Add some more DISALLOW_COPY_AND_ASSIGN"
* commit '
8a30bf23bcb1ad8d4ed9060ddbb27edbfd57a897':
Add some more DISALLOW_COPY_AND_ASSIGN
Mathieu Chartier [Sun, 3 May 2015 22:26:22 +0000 (22:26 +0000)]
Merge "Add some more DISALLOW_COPY_AND_ASSIGN"
Mathieu Chartier [Sun, 3 May 2015 22:20:23 +0000 (15:20 -0700)]
Add some more DISALLOW_COPY_AND_ASSIGN
May help prevent bugs maybe.
Change-Id: Ie73d469dfcd078492ecb3aa28682b42707221202
Christopher Ferris [Sat, 2 May 2015 00:46:06 +0000 (00:46 +0000)]
am
d718236c: am
25dcb259: Merge "Let the map function compute the relative pc."
* commit '
d718236cc45ec761bb72c894343d91645fe1fa92':
Let the map function compute the relative pc.
Christopher Ferris [Sat, 2 May 2015 00:31:01 +0000 (00:31 +0000)]
am
6f1be449: Merge "Let the map function compute the relative pc." into mnc-dev
* commit '
6f1be4493a558e8dabdc981b37852a2008f7bef1':
Let the map function compute the relative pc.
Christopher Ferris [Sat, 2 May 2015 00:29:42 +0000 (00:29 +0000)]
am
25dcb259: Merge "Let the map function compute the relative pc."
* commit '
25dcb2594a21a565ef82faa66a79bcf595c3a780':
Let the map function compute the relative pc.
Christopher Ferris [Sat, 2 May 2015 00:20:15 +0000 (00:20 +0000)]
Merge "Let the map function compute the relative pc."
Christopher Ferris [Fri, 1 May 2015 23:03:49 +0000 (16:03 -0700)]
Let the map function compute the relative pc.
The new packed relocations linker option creates an elf with a non-zero
load base. It's no longer an easy task to compute the relative pc yourself
so call the helper function to do it for us.
Bug:
20687795
(cherry picked from commit
332ef327c2b1a5e1774ba0d1da23e07303002af9)
Change-Id: I3d61c767f21a3f240a14f9e8bc6bee53b6cdb60d
Christopher Ferris [Sat, 2 May 2015 00:07:16 +0000 (00:07 +0000)]
Merge "Let the map function compute the relative pc." into mnc-dev
Hiroshi Yamauchi [Fri, 1 May 2015 23:45:53 +0000 (23:45 +0000)]
am
5b19928e: am
43e1bc66: Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()."
* commit '
5b19928e7adc9749e3d4c306c5955ee14f76717c':
Request full/partial GC type from VMRuntime.requestConcurrentGC().
Hiroshi Yamauchi [Fri, 1 May 2015 23:34:11 +0000 (23:34 +0000)]
am
43e1bc66: Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()."
* commit '
43e1bc667e66386443aee6477d767d9b8ef5aa79':
Request full/partial GC type from VMRuntime.requestConcurrentGC().
Andreas Gampe [Fri, 1 May 2015 23:34:09 +0000 (23:34 +0000)]
am
b60cae5a: am
376d941d: Merge "ART: Fix max build"
* commit '
b60cae5a2e02b025201bb9db1bb7487e1f7992f2':
ART: Fix max build
Christopher Ferris [Fri, 1 May 2015 23:03:49 +0000 (16:03 -0700)]
Let the map function compute the relative pc.
The new packed relocations linker option creates an elf with a non-zero
load base. It's no longer an easy task to compute the relative pc yourself
so call the helper function to do it for us.
Bug:
20687795
Change-Id: If11c1a596bc79382d44e35a86d5035ab29d29864
Hiroshi Yamauchi [Fri, 1 May 2015 23:22:51 +0000 (23:22 +0000)]
Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()."
Andreas Gampe [Fri, 1 May 2015 23:21:12 +0000 (23:21 +0000)]
am
376d941d: Merge "ART: Fix max build"
* commit '
376d941d5d8ad23ca2880aecffbe8381be963f35':
ART: Fix max build
Andreas Gampe [Fri, 1 May 2015 23:13:38 +0000 (23:13 +0000)]
Merge "ART: Fix max build"
Andreas Gampe [Fri, 1 May 2015 23:11:04 +0000 (16:11 -0700)]
ART: Fix max build
Change-Id: Id1b9c0ee05b61195d1c1f09a8938df3110c2f2b3
Chih-hung Hsieh [Fri, 1 May 2015 22:53:06 +0000 (22:53 +0000)]
am
cb2e4125: am
b0d9f0dd: Merge "Re-enable clang for Mips/Mips64 targets."
* commit '
cb2e41257a8b0244aef72241d0af3226a348b88c':
Re-enable clang for Mips/Mips64 targets.
Chih-hung Hsieh [Fri, 1 May 2015 22:40:58 +0000 (22:40 +0000)]
am
b0d9f0dd: Merge "Re-enable clang for Mips/Mips64 targets."
* commit '
b0d9f0ddd6189564f359f989d9ff606d6c691ed0':
Re-enable clang for Mips/Mips64 targets.
Chih-hung Hsieh [Fri, 1 May 2015 22:30:07 +0000 (22:30 +0000)]
Merge "Re-enable clang for Mips/Mips64 targets."
Hiroshi Yamauchi [Fri, 1 May 2015 21:33:19 +0000 (14:33 -0700)]
Request full/partial GC type from VMRuntime.requestConcurrentGC().
Bug:
20554807
Change-Id: I1cd855507c3f4e191035dbc2c429e1b8b344d81b
Hiroshi Yamauchi [Fri, 1 May 2015 21:08:40 +0000 (21:08 +0000)]
am
3bf2d475: Print memory maps on GC crash.
* commit '
3bf2d475f0f1d1c2d292714b48a1ccb9c9eadac2':
Print memory maps on GC crash.
Hiroshi Yamauchi [Fri, 1 May 2015 20:59:08 +0000 (20:59 +0000)]
am
2e018102: am
1db3554c: Merge "Print memory maps on GC crash."
* commit '
2e018102a2d4b9d1d4177b1975a68f42b81b463c':
Print memory maps on GC crash.
Andreas Gampe [Fri, 1 May 2015 20:59:07 +0000 (20:59 +0000)]
am
491fa88a: am
772b617c: Merge "Add binary search table to .eh_frame_hdr"
* commit '
491fa88ae3c628707803dcb8a01fa198bc4a4174':
Add binary search table to .eh_frame_hdr
Mathieu Chartier [Fri, 1 May 2015 20:46:59 +0000 (20:46 +0000)]
am
732e886d: Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)
* commit '
732e886df618f8f8f67a184da3bf079aec22eca5':
Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)
Hiroshi Yamauchi [Fri, 1 May 2015 20:46:48 +0000 (20:46 +0000)]
am
1db3554c: Merge "Print memory maps on GC crash."
* commit '
1db3554cf9751d4328d5514b6bee15b6a92b82c4':
Print memory maps on GC crash.
Andreas Gampe [Fri, 1 May 2015 20:46:46 +0000 (20:46 +0000)]
am
772b617c: Merge "Add binary search table to .eh_frame_hdr"
* commit '
772b617ce920ea1924b0ad2fd429c99274f0ccd5':
Add binary search table to .eh_frame_hdr
Hiroshi Yamauchi [Fri, 1 May 2015 18:50:24 +0000 (11:50 -0700)]
Print memory maps on GC crash.
Bug:
20557050
(cherry picked from commit
d38ec80b163af1639fbaae382a319c73be67c560)
Change-Id: I0fc35bace77b11181f06199c121bc4e246d02100
Duane Sand [Fri, 1 May 2015 18:34:51 +0000 (11:34 -0700)]
Re-enable clang for Mips/Mips64 targets.
The build-time errors described in
https://android-review.googlesource.com/#/c/120512
are no longer happening.
BUG:
18807290
BUG:
18789639
Change-Id: I195bbb7d102fecd6a6e6a3357b0863dd6fddb01f
Hiroshi Yamauchi [Fri, 1 May 2015 20:35:57 +0000 (20:35 +0000)]
Merge "Print memory maps on GC crash."
Andreas Gampe [Fri, 1 May 2015 20:34:11 +0000 (20:34 +0000)]
Merge "Add binary search table to .eh_frame_hdr"
Andreas Gampe [Fri, 1 May 2015 20:34:07 +0000 (20:34 +0000)]
am
956f71a8: am
485971cf: Merge "Do not write CFI and symbols for deduplicate methods."
* commit '
956f71a8b4f3e06fecdb5a30bcc3e9b1876d243a':
Do not write CFI and symbols for deduplicate methods.
Mathieu Chartier [Fri, 1 May 2015 20:34:06 +0000 (20:34 +0000)]
am
d7d1d2e6: am
f274519c: Merge "Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)"
* commit '
d7d1d2e640b97a55313760f5e628daf70a797069':
Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)
Andreas Gampe [Fri, 1 May 2015 20:25:08 +0000 (20:25 +0000)]
am
485971cf: Merge "Do not write CFI and symbols for deduplicate methods."
* commit '
485971cf4105886773a3fd10a0021738d4cd4de7':
Do not write CFI and symbols for deduplicate methods.
Mathieu Chartier [Fri, 1 May 2015 20:25:06 +0000 (20:25 +0000)]
am
f274519c: Merge "Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)"
* commit '
f274519ce9fc3a9df477ffb320bcdcddab505b58':
Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)
David Srbecky [Thu, 30 Apr 2015 18:57:35 +0000 (19:57 +0100)]
Add binary search table to .eh_frame_hdr
The addresses in the search table must be relative to the start
of .eh_frame_hdr which results in yet another pointer type to patch.
I have moved the Patch method back to elf_writer_quick where
it can be specialized to one of the three pointer types.
The .eh_frame_hdr takes around 17% of .eh_frame now.
Change-Id: I4770d1355ded6cdff9489c33380f6b06c4e3f9fe
Andreas Gampe [Fri, 1 May 2015 20:22:57 +0000 (20:22 +0000)]
Merge "Do not write CFI and symbols for deduplicate methods."
Hiroshi Yamauchi [Fri, 1 May 2015 18:50:24 +0000 (11:50 -0700)]
Print memory maps on GC crash.
Bug:
20557050
Change-Id: I0fc35bace77b11181f06199c121bc4e246d02100
Mathieu Chartier [Fri, 1 May 2015 20:00:23 +0000 (13:00 -0700)]
Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)
INTERNAL_FATAL is more likely to remain in bug reports.
(cherry picked from commit
175746ac9039e9b741d3521420dcaa9c59341738)
Bug:
20736048
Change-Id: I518f079d8d1839e22b3595e807730edf36318f1d
Mathieu Chartier [Fri, 1 May 2015 20:19:14 +0000 (20:19 +0000)]
Merge "Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)"
Mathieu Chartier [Fri, 1 May 2015 20:00:23 +0000 (13:00 -0700)]
Change invalid root from LOG(ERROR) to LOG(INTERNAL_FATAL)
INTERNAL_FATAL is more likely to remain in bug reports.
Bug:
20736048
Change-Id: I518f079d8d1839e22b3595e807730edf36318f1d
David Srbecky [Fri, 1 May 2015 14:00:40 +0000 (15:00 +0100)]
Do not write CFI and symbols for deduplicate methods.
There is no need to have multiple symbols for a given address
since libunwind still has to pick only one to print.
Likewise, there is no need to duplicate the CFI.
There is fair number of duplicate methods in the boot image,
so this saves over 20% from those debug sections.
Change-Id: Ib4390150257d009a6303b084076750ce56afed60
Nicolas Geoffray [Fri, 1 May 2015 12:00:07 +0000 (12:00 +0000)]
am
6db49a74: Update the remaining input index of phis after deleting an input.
* commit '
6db49a74e8402d3b6c66536ea7ec988144c05d24':
Update the remaining input index of phis after deleting an input.
Nicolas Geoffray [Fri, 1 May 2015 09:31:11 +0000 (09:31 +0000)]
am
30259bfc: am
0697e849: Merge "Update the remaining input index of phis after deleting an input."
* commit '
30259bfcd9869acb9b68247de8814b648235f9dd':
Update the remaining input index of phis after deleting an input.
Nicolas Geoffray [Fri, 1 May 2015 09:18:53 +0000 (09:18 +0000)]
am
0697e849: Merge "Update the remaining input index of phis after deleting an input."
* commit '
0697e8491217f980d90a769f241fed67f6827d6f':
Update the remaining input index of phis after deleting an input.
Nicolas Geoffray [Mon, 27 Apr 2015 23:52:43 +0000 (00:52 +0100)]
Update the remaining input index of phis after deleting an input.
bug:
20715803
bug:
20690906
(cherry picked from commit
5d7b7f81ed5455893f984752c00571ef27cc97c5)
Change-Id: Ie55739601b8d6fedc830d6e19d8a053392047d34
Nicolas Geoffray [Fri, 1 May 2015 09:10:56 +0000 (09:10 +0000)]
Merge "Update the remaining input index of phis after deleting an input."
Nicolas Geoffray [Mon, 27 Apr 2015 23:52:43 +0000 (00:52 +0100)]
Update the remaining input index of phis after deleting an input.
bug:
20715803
bug:
20690906
Change-Id: Iaf08f0c30d629e766be2b04815dc3e38b6e7ff35
Jeff Hao [Thu, 30 Apr 2015 18:25:10 +0000 (11:25 -0700)]
Merge art project from goog/master into goog/mnc-dev.
David Srbecky [Thu, 30 Apr 2015 16:39:23 +0000 (16:39 +0000)]
am
e70d1bc0: am
204a4a0e: am
01ce4984: Merge "Move .eh_frame to the end of ELF file."
* commit '
e70d1bc02c1aacc02a5ed421d15dd110ed36d947':
Move .eh_frame to the end of ELF file.
David Srbecky [Thu, 30 Apr 2015 16:39:22 +0000 (16:39 +0000)]
am
c871eec8: am
e47cc002: am
acb3ee85: Merge "Major refactoring of ElfBuilder."
* commit '
c871eec8acffacffd8254ba826a243581c4c79ce':
Major refactoring of ElfBuilder.
David Srbecky [Thu, 30 Apr 2015 16:39:20 +0000 (16:39 +0000)]
am
45d56ef7: am
9207699c: am
e6dbb737: Merge "Minor refactoring of ElfBuilder."
* commit '
45d56ef7773066af1fb107da3ffe20a591ec08f1':
Minor refactoring of ElfBuilder.
David Srbecky [Thu, 30 Apr 2015 16:30:18 +0000 (16:30 +0000)]
am
204a4a0e: am
01ce4984: Merge "Move .eh_frame to the end of ELF file."
* commit '
204a4a0e0b866cca956a61af113a13008214723f':
Move .eh_frame to the end of ELF file.
David Srbecky [Thu, 30 Apr 2015 16:30:17 +0000 (16:30 +0000)]
am
e47cc002: am
acb3ee85: Merge "Major refactoring of ElfBuilder."
* commit '
e47cc002e73e2c253e0f5eea74e7c80511a5c413':
Major refactoring of ElfBuilder.
David Srbecky [Thu, 30 Apr 2015 16:30:15 +0000 (16:30 +0000)]
am
9207699c: am
e6dbb737: Merge "Minor refactoring of ElfBuilder."
* commit '
9207699cdc91ca858354e5008d729c1bbd3127c9':
Minor refactoring of ElfBuilder.
David Srbecky [Thu, 30 Apr 2015 16:20:59 +0000 (16:20 +0000)]
am
01ce4984: Merge "Move .eh_frame to the end of ELF file."
* commit '
01ce498499eed47e87fceb8736d26fe49b2a4346':
Move .eh_frame to the end of ELF file.
David Srbecky [Thu, 30 Apr 2015 16:20:58 +0000 (16:20 +0000)]
am
acb3ee85: Merge "Major refactoring of ElfBuilder."
* commit '
acb3ee85438f3168a17786dda52cfcdcd47da87d':
Major refactoring of ElfBuilder.
David Srbecky [Thu, 30 Apr 2015 16:20:54 +0000 (16:20 +0000)]
am
e6dbb737: Merge "Minor refactoring of ElfBuilder."
* commit '
e6dbb737c1dc0157ff9b4020ac5ecce08a6c99a2':
Minor refactoring of ElfBuilder.
David Srbecky [Thu, 30 Apr 2015 16:08:32 +0000 (16:08 +0000)]
Merge "Move .eh_frame to the end of ELF file."
David Srbecky [Tue, 28 Apr 2015 18:43:56 +0000 (19:43 +0100)]
Move .eh_frame to the end of ELF file.
Move .eh_frame to the end together with other debug sections.
This should make it easier to remove it using standard strip tools.
Bug:
20556771
Change-Id: I8303ccb053aee50d53fb193819d345c91f1e5b75
David Srbecky [Thu, 30 Apr 2015 16:07:16 +0000 (16:07 +0000)]
Merge "Major refactoring of ElfBuilder."
David Srbecky [Thu, 30 Apr 2015 16:07:06 +0000 (16:07 +0000)]
Merge "Minor refactoring of ElfBuilder."
Andreas Gampe [Thu, 30 Apr 2015 15:34:24 +0000 (15:34 +0000)]
am
f0dd5b96: am
8b83b55d: ART: Allow oat files with duplicates classes in corner case
* commit '
f0dd5b96c73e1ed75c0c6d17592c77860ba010dd':
ART: Allow oat files with duplicates classes in corner case
Andreas Gampe [Thu, 30 Apr 2015 15:20:11 +0000 (15:20 +0000)]
am
8b83b55d: ART: Allow oat files with duplicates classes in corner case
* commit '
8b83b55de8abbc195c038789f1034107f4974597':
ART: Allow oat files with duplicates classes in corner case
Nicolas Geoffray [Thu, 30 Apr 2015 11:47:14 +0000 (11:47 +0000)]
am
53de3b19: am
caf07631: am
fd5f56d4: Merge "Revert "GVN final fields even with side effects.""
* commit '
53de3b19a3760bb5fcaa0d34f91a10cb122063ca':
Revert "GVN final fields even with side effects."
Nicolas Geoffray [Thu, 30 Apr 2015 11:35:24 +0000 (11:35 +0000)]
am
caf07631: am
fd5f56d4: Merge "Revert "GVN final fields even with side effects.""
* commit '
caf076311e6933a79da3b5714975486ffa1efa07':
Revert "GVN final fields even with side effects."
David Srbecky [Wed, 22 Apr 2015 18:40:27 +0000 (19:40 +0100)]
Major refactoring of ElfBuilder.
Simplify ElfBuilder by removing duplicated or redundant code.
Many of the repeated code patterns were replaced by just
looping over the list of all sections.
Methods Init() and Write() have been merged into one.
The split between those was rather arbitrary, but it was there
for a reason. It allowed creation of raw sections between
the calls which may have depended on layout decisions done in
Init(), but not in Write() (e.g. knowing of offset of .text).
This has been replaced by more generic solution.
All sections are asked about their size first and complete
file layout is calculated. Then the sections are asked to
write their content (potentially using the layout information).
This should be pure refactoring CL - the compiler should
produce bit for bit identical output as before.
Change-Id: I281d13d469801bd8288b36b360d200d98a3e92d7
Nicolas Geoffray [Thu, 30 Apr 2015 11:23:03 +0000 (11:23 +0000)]
am
fd5f56d4: Merge "Revert "GVN final fields even with side effects.""
* commit '
fd5f56d4604eeeacdf6be5189187b6ef49157280':
Revert "GVN final fields even with side effects."
Nicolas Geoffray [Thu, 30 Apr 2015 11:16:06 +0000 (11:16 +0000)]
Merge "Revert "GVN final fields even with side effects.""
Nicolas Geoffray [Thu, 30 Apr 2015 11:15:40 +0000 (11:15 +0000)]
Revert "GVN final fields even with side effects."
This reverts commit
781733632637db98d79dfffad72bf063be3259be.
Change-Id: Id7c4591f6b8190921852044b278d11627457c570
Nicolas Geoffray [Thu, 30 Apr 2015 10:56:49 +0000 (10:56 +0000)]
am
ddadbf8d: am
4ffbc975: am
56784f88: Merge "GVN final fields even with side effects."
* commit '
ddadbf8d3328f810c0b59ab1f8b2685108ad048c':
GVN final fields even with side effects.
Nicolas Geoffray [Thu, 30 Apr 2015 10:46:38 +0000 (10:46 +0000)]
am
4ffbc975: am
56784f88: Merge "GVN final fields even with side effects."
* commit '
4ffbc975a8614ed314114895df93c345e14c8163':
GVN final fields even with side effects.
Nicolas Geoffray [Thu, 30 Apr 2015 10:31:49 +0000 (10:31 +0000)]
am
56784f88: Merge "GVN final fields even with side effects."
* commit '
56784f887bad1219f326e9e6d110f785f31a5968':
GVN final fields even with side effects.
Nicolas Geoffray [Thu, 30 Apr 2015 10:21:19 +0000 (10:21 +0000)]
Merge "GVN final fields even with side effects."
Nicolas Geoffray [Wed, 29 Apr 2015 15:46:27 +0000 (16:46 +0100)]
GVN final fields even with side effects.
Two accesses of a final field can be GVN'ed even if there are
side effects between them.
Change-Id: I04495ae83c7858f4216b083ad1c29851954320ad
Sebastien Hertz [Thu, 30 Apr 2015 07:46:51 +0000 (07:46 +0000)]
am
af6535b3: am
f94b250f: am
0a50264b: Merge "ART: Allow oat files with duplicates classes in corner case"
* commit '
af6535b39fb8630e02cd38ca594dec1d65be90cd':
ART: Allow oat files with duplicates classes in corner case
Sebastien Hertz [Thu, 30 Apr 2015 07:34:27 +0000 (07:34 +0000)]
am
f94b250f: am
0a50264b: Merge "ART: Allow oat files with duplicates classes in corner case"
* commit '
f94b250f426c7f43f9ee78e39e07d6ee13842b20':
ART: Allow oat files with duplicates classes in corner case
Sebastien Hertz [Thu, 30 Apr 2015 07:25:56 +0000 (07:25 +0000)]
am
0a50264b: Merge "ART: Allow oat files with duplicates classes in corner case"
* commit '
0a50264b30a0c61099e8388015cccfa417a6bd18':
ART: Allow oat files with duplicates classes in corner case
Sebastien Hertz [Thu, 30 Apr 2015 07:22:55 +0000 (07:22 +0000)]
am
de8e618e: am
f533cd0d: am
dacee920: Merge "Fix missing transaction abort error message"
* commit '
de8e618e3c4b9ad5437772136ba30e49c3c95781':
Fix missing transaction abort error message
Sebastien Hertz [Thu, 30 Apr 2015 07:18:07 +0000 (07:18 +0000)]
Merge "ART: Allow oat files with duplicates classes in corner case"
Sebastien Hertz [Thu, 30 Apr 2015 07:12:06 +0000 (07:12 +0000)]
am
f533cd0d: am
dacee920: Merge "Fix missing transaction abort error message"
* commit '
f533cd0dd13f64c39658e944b41febbd34460fca':
Fix missing transaction abort error message
Sebastien Hertz [Thu, 30 Apr 2015 07:03:11 +0000 (07:03 +0000)]
am
dacee920: Merge "Fix missing transaction abort error message"
* commit '
dacee9200210fca06e01e5967f7265e11b2942d4':
Fix missing transaction abort error message
Sebastien Hertz [Thu, 30 Apr 2015 06:53:35 +0000 (06:53 +0000)]
Merge "Fix missing transaction abort error message"
Andreas Gampe [Thu, 30 Apr 2015 03:47:16 +0000 (20:47 -0700)]
ART: Allow oat files with duplicates classes in corner case
When the oat file is actually an odex file, that is, a preopted
/system app, then it is impossible to fall back to the original
APK, as that has been stripped.
When it looks like it will be impossible to successfully open the
original dex location, grudgingly allow to open the found oat file,
even if it has duplicate classes, but warn accordingly.
Bug:
20697582
(cherry picked from commit
0cba004b97245300d7f39318d5921ee8edbef1ac)
Change-Id: I1dd459563d977a2e77806eacd03e49334d5b1f14
Andreas Gampe [Thu, 30 Apr 2015 03:54:07 +0000 (03:54 +0000)]
am
f5b132e5: am
61d7ca87: ART: Whitelist DexPathList constructor
* commit '
f5b132e59c9ed11ac440e626322cec5bc1b13774':
ART: Whitelist DexPathList$Element constructor
Andreas Gampe [Thu, 30 Apr 2015 03:47:16 +0000 (20:47 -0700)]
ART: Allow oat files with duplicates classes in corner case
When the oat file is actually an odex file, that is, a preopted
/system app, then it is impossible to fall back to the original
APK, as that has been stripped.
When it looks like it will be impossible to successfully open the
original dex location, grudgingly allow to open the found oat file,
even if it has duplicate classes, but warn accordingly.
Bug:
20697582
Change-Id: I1dd459563d977a2e77806eacd03e49334d5b1f14
Andreas Gampe [Thu, 30 Apr 2015 03:35:47 +0000 (03:35 +0000)]
am
61d7ca87: ART: Whitelist DexPathList constructor
* commit '
61d7ca870b7afc5400e6f7dd2952ca06ce7f7bac':
ART: Whitelist DexPathList$Element constructor