OSDN Git Service
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
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: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."
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 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 [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
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."
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: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: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:18:07 +0000 (07:18 +0000)]
Merge "ART: Allow oat files with duplicates classes in corner case"
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
Change-Id: I1dd459563d977a2e77806eacd03e49334d5b1f14
Jeff Hao [Wed, 29 Apr 2015 23:15:14 +0000 (23:15 +0000)]
am
eff3229f: Merge "Restore interpreter check during DoCall removed by string init."
* commit '
eff3229ff3c8faead4b6d400e273ee27b7004dab':
Restore interpreter check during DoCall removed by string init.
Jeff Hao [Wed, 29 Apr 2015 23:03:46 +0000 (23:03 +0000)]
Merge "Restore interpreter check during DoCall removed by string init."
Jeff Hao [Wed, 29 Apr 2015 22:58:17 +0000 (15:58 -0700)]
Restore interpreter check during DoCall removed by string init.
Also reorder test in verifier to check for string_init first.
Change-Id: I585ef3f5890819a3e233236ea85b51a03918f5dc
Mathieu Chartier [Wed, 29 Apr 2015 17:48:03 +0000 (17:48 +0000)]
am
8c9c1ae5: Merge "Only print IRT remove local warning if CheckJNI is enabled"
* commit '
8c9c1ae515f32142ab85103c5d45bd7ce4e6eb3c':
Only print IRT remove local warning if CheckJNI is enabled
Mathieu Chartier [Wed, 29 Apr 2015 17:37:47 +0000 (17:37 +0000)]
Merge "Only print IRT remove local warning if CheckJNI is enabled"
Mathieu Chartier [Wed, 29 Apr 2015 16:57:48 +0000 (09:57 -0700)]
Only print IRT remove local warning if CheckJNI is enabled
Less spammy.
Bug:
17405090
Change-Id: Ib78d0d7bc31a88182cb9d85ddba9b469bd50324b
Nicolas Geoffray [Wed, 29 Apr 2015 17:23:33 +0000 (17:23 +0000)]
am
ed51747a: Merge "Add synthesize uses at back edge."
* commit '
ed51747ae96a0c7fac452e95a1607200a5494b28':
Add synthesize uses at back edge.
Nicolas Geoffray [Wed, 29 Apr 2015 17:10:08 +0000 (17:10 +0000)]
Merge "Add synthesize uses at back edge."
Nicolas Geoffray [Tue, 21 Apr 2015 13:28:41 +0000 (14:28 +0100)]
Add synthesize uses at back edge.
This reduces the cost of linearizing the graph (hence removing
the notion of back edge). Since linear scan allocates/spills registers
based on next use, adding a use at a back edge ensures we do count
for loop uses.
Change-Id: Idaa882cb120edbdd08ca6bff142d326a8245bd14
David Brazdil [Wed, 29 Apr 2015 16:51:50 +0000 (16:51 +0000)]
am
0430fc92: Merge "ART: Fix loop information after dead code elimination"
* commit '
0430fc9216dddf6a6967cfffd37dfa99d73c2c68':
ART: Fix loop information after dead code elimination
David Brazdil [Wed, 29 Apr 2015 16:42:48 +0000 (16:42 +0000)]
Merge "ART: Fix loop information after dead code elimination"
David Brazdil [Wed, 29 Apr 2015 16:16:07 +0000 (17:16 +0100)]
ART: Fix loop information after dead code elimination
Compilation failed when only some blocks of a loop were removed during
dead code elimination.
Bug:
20680703
Change-Id: If31025169ca493f0d7f7f2788576e98d05f03394
Roland Levillain [Wed, 29 Apr 2015 15:38:43 +0000 (15:38 +0000)]
am
0829d9de: Merge "Factor MoveArguments methods in Optimizing\'s intrinsics handlers."
* commit '
0829d9de97b92bcd575f4d5c1f717abf7405d8e2':
Factor MoveArguments methods in Optimizing's intrinsics handlers.
Roland Levillain [Wed, 29 Apr 2015 15:30:17 +0000 (15:30 +0000)]
Merge "Factor MoveArguments methods in Optimizing's intrinsics handlers."
Narayan Kamath [Wed, 29 Apr 2015 14:44:43 +0000 (14:44 +0000)]
am
36ad3f1c: Merge "Add dependency on libbase."
* commit '
36ad3f1c3c08a49680a8f5d34bba43199ab9dd5b':
Add dependency on libbase.
Narayan Kamath [Wed, 29 Apr 2015 14:31:27 +0000 (14:31 +0000)]
Merge "Add dependency on libbase."
Narayan Kamath [Tue, 28 Apr 2015 08:56:28 +0000 (09:56 +0100)]
Add dependency on libbase.
Used by the static libziparchive dependency on target.
Change-Id: Ib88dd67941f0679682bcae01346277ffe8d6df9b
Roland Levillain [Tue, 28 Apr 2015 14:50:20 +0000 (15:50 +0100)]
Factor MoveArguments methods in Optimizing's intrinsics handlers.
Also add a precondition similar to the one present in code
generators, regarding static invoke related explicit clinit
check elimination in non-baseline compilations.
Change-Id: I26f4dcb5d02824d7556f90b4b0c85b08b737fa53
Sebastien Hertz [Tue, 28 Apr 2015 10:31:41 +0000 (12:31 +0200)]
Fix missing transaction abort error message
Change-Id: I5157def06d385c082f9fdd4714e20bead9e707e8
Roland Levillain [Wed, 29 Apr 2015 13:48:42 +0000 (13:48 +0000)]
am
b6829c2e: Merge "Refactor InvokeDexCallingConventionVisitor in Optimizing."
* commit '
b6829c2ee05124d64a19c7a52ada4a23f624fb91':
Refactor InvokeDexCallingConventionVisitor in Optimizing.
Roland Levillain [Wed, 29 Apr 2015 13:37:57 +0000 (13:37 +0000)]
Merge "Refactor InvokeDexCallingConventionVisitor in Optimizing."
Roland Levillain [Tue, 28 Apr 2015 14:48:45 +0000 (15:48 +0100)]
Refactor InvokeDexCallingConventionVisitor in Optimizing.
Change-Id: I7ede0f59d5109644887bf5d39201d4e1bf043f34
Vladimir Marko [Wed, 29 Apr 2015 12:07:57 +0000 (12:07 +0000)]
am
f073a36d: Merge "Fix for incorrect encode and parse of PEXTRW instruction"
* commit '
f073a36d1ed866e786f7d7784c709c86b00bc58e':
Fix for incorrect encode and parse of PEXTRW instruction
Vladimir Marko [Wed, 29 Apr 2015 11:56:55 +0000 (11:56 +0000)]
Merge "Fix for incorrect encode and parse of PEXTRW instruction"
Roland Levillain [Wed, 29 Apr 2015 11:25:06 +0000 (11:25 +0000)]
am
e761b911: Merge "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""
* commit '
e761b911b24e9001ac50667462b4f936ebee7369':
Revert "Revert "Revert "[optimizing] Improve x86 shifts"""
Roland Levillain [Wed, 29 Apr 2015 11:12:59 +0000 (11:12 +0000)]
Merge "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""
Roland Levillain [Wed, 29 Apr 2015 11:12:33 +0000 (11:12 +0000)]
Revert "Revert "Revert "[optimizing] Improve x86 shifts"""
This reverts commit
9b95a057ee20e4b1ca2e9c663726482172dc9ba3.
Reverting this CL as it breaks libcore tests:
org.apache.harmony.tests.java.lang.DoubleTest#test_compare
junit.framework.AssertionFailedError: compare() -0.0 should be less 0.0
at junit.framework.Assert.assertTrue(Assert.java:140)
at org.apache.harmony.tests.java.lang.DoubleTest.test_compare(DoubleTest.java:258)
org.apache.harmony.tests.java.lang.DoubleTest#test_compare FAIL (EXEC_FAILED)
org.apache.harmony.tests.java.lang.DoubleTest#test_compareToLjava_lang_Double
junit.framework.AssertionFailedError: Assert 2: compare() -0.0 should be less 0.0
at junit.framework.Assert.assertTrue(Assert.java:140)
at org.apache.harmony.tests.java.lang.DoubleTest.test_compareToLjava_lang_Double(DoubleTest.java:1320)
org.apache.harmony.tests.java.lang.DoubleTest#test_compareToLjava_lang_Double FAIL (EXEC_FAILED)
Change-Id: I10f0ec8cc9495cc225fef1940b3f1a9fe87d996f
Nicolas Geoffray [Wed, 29 Apr 2015 10:45:14 +0000 (10:45 +0000)]
am
7386f983: Merge "Bugs have been fixed, so run the tests."
* commit '
7386f983a67cf73c91cfb9a69a3919f95b25f276':
Bugs have been fixed, so run the tests.
Nicolas Geoffray [Wed, 29 Apr 2015 10:34:20 +0000 (10:34 +0000)]
Merge "Bugs have been fixed, so run the tests."
Roland Levillain [Wed, 29 Apr 2015 10:29:08 +0000 (10:29 +0000)]
am
fadf977d: Merge "Add InsertInstructionAfter in HBasicBlock."
* commit '
fadf977d85bfbf3f9d5d4730afb660cbed34f989':
Add InsertInstructionAfter in HBasicBlock.
Roland Levillain [Wed, 29 Apr 2015 10:29:05 +0000 (10:29 +0000)]
am
d474b1d0: Merge "Revert "Revert "[optimizing] Improve x86 shifts"""
* commit '
d474b1d0fd69fdeb481adda8c0814512956f2d51':
Revert "Revert "[optimizing] Improve x86 shifts""
Roland Levillain [Wed, 29 Apr 2015 10:23:07 +0000 (10:23 +0000)]
Merge "Add InsertInstructionAfter in HBasicBlock."
Roland Levillain [Wed, 29 Apr 2015 10:18:40 +0000 (10:18 +0000)]
Merge "Revert "Revert "[optimizing] Improve x86 shifts"""
Nicolas Geoffray [Wed, 29 Apr 2015 09:57:50 +0000 (10:57 +0100)]
Bugs have been fixed, so run the tests.
Change-Id: I6769cf244d246160b65d6dd4e4df0efb0aa8a7e5
Roland Levillain [Wed, 29 Apr 2015 09:22:37 +0000 (10:22 +0100)]
Revert "Revert "[optimizing] Improve x86 shifts""
This reverts commit
f9aac1e9f442c2486cd54f045d43e15791601205.
Don't use Location::Any() for the first input if the output is
Location::SameAsFirstInput().
Change-Id: I400834052b114abf0d616da1b4b6506f7bba10ab
Andreas Gampe [Wed, 29 Apr 2015 06:40:14 +0000 (06:40 +0000)]
am
57f6bee4: Merge "ART: Move dex2oat watchdog output to LogLine"
* commit '
57f6bee40489842c0461140935f900ed88281592':
ART: Move dex2oat watchdog output to LogLine
Andreas Gampe [Wed, 29 Apr 2015 06:30:40 +0000 (06:30 +0000)]
Merge "ART: Move dex2oat watchdog output to LogLine"
Andreas Gampe [Wed, 29 Apr 2015 06:16:03 +0000 (23:16 -0700)]
ART: Move dex2oat watchdog output to LogLine
The fprintf isn't visible on device, as it doesn't end up in the
logcat.
Also increase the watchdog timeout to 10 minutes.
Bug:
20658562
Change-Id: I1fec8dae25f9282f72e762bda934fceb948bbd5f
nikolay serdjuk [Mon, 27 Apr 2015 11:52:57 +0000 (17:52 +0600)]
Fix for incorrect encode and parse of PEXTRW instruction
The instruction PEXTRW encoded by sequence 66 0F 3A 15
was incorrectly encoded in compiler table and incorrectly
parsed by disassembler.
Change-Id: Ib4d4db923cb15a76e74f13f6b5514cb0d1cbe164
Signed-off-by: nikolay serdjuk <nikolay.y.serdjuk@intel.com>
Andreas Gampe [Wed, 29 Apr 2015 05:19:44 +0000 (05:19 +0000)]
am
b0300bad: Merge "ART: Remove multidex limit"
* commit '
b0300bad88e6295217a53ff96db6170a727997a9':
ART: Remove multidex limit
Andreas Gampe [Wed, 29 Apr 2015 05:10:04 +0000 (05:10 +0000)]
Merge "ART: Remove multidex limit"
Andreas Gampe [Tue, 28 Apr 2015 03:01:52 +0000 (20:01 -0700)]
ART: Remove multidex limit
Remove the arbitrary multidex limit. If users want to use many
files, allow them, but print a warning after a considerable amount.
Bug:
20071800
(cherry picked from commit
32c26b8f9b995250479c185172f4ffd881a59996)
Change-Id: Ic51c96b84042f769a7d33ec53fe587b68cd69df4
Mathieu Chartier [Tue, 28 Apr 2015 21:17:15 +0000 (21:17 +0000)]
am
13d38aab: Merge "Fix possible null deference in Throwable::Dump"
* commit '
13d38aabf01f8391946730b7c2e8d077b1ec7d13':
Fix possible null deference in Throwable::Dump
Mathieu Chartier [Tue, 28 Apr 2015 21:06:33 +0000 (21:06 +0000)]
Merge "Fix possible null deference in Throwable::Dump"
Mathieu Chartier [Tue, 28 Apr 2015 20:53:02 +0000 (13:53 -0700)]
Fix possible null deference in Throwable::Dump
Bug:
20640601
Change-Id: Ibd6081ed9ea16f320e505e06e690b8eddb1228ef
Jeff Hao [Tue, 28 Apr 2015 19:25:26 +0000 (19:25 +0000)]
am
b8df6601: Merge "Change ddmc run-test to make new objects instead of strings."
* commit '
b8df6601f2119fd90150761388057dbe893bb6ae':
Change ddmc run-test to make new objects instead of strings.
Jeff Hao [Tue, 28 Apr 2015 19:15:05 +0000 (19:15 +0000)]
Merge "Change ddmc run-test to make new objects instead of strings."
Jeff Hao [Tue, 28 Apr 2015 19:11:22 +0000 (12:11 -0700)]
Change ddmc run-test to make new objects instead of strings.
Before, the test was creating new strings until overflowing allocations,
which was half string objects and half character arrays. Now, it
allocates all strings with the character data, which is larger than
before, causing the test to run out of memory. Allocating only objects
prevents the test from running out of memory.
Change-Id: Icf3f0fd2ae847e76a9b8d5dfb762be92de16aaa3
Vladimir Marko [Tue, 28 Apr 2015 18:50:39 +0000 (18:50 +0000)]
am
edede5c6: Merge "Quick: Fix crash on fall-through out of method code."
* commit '
edede5c67daa2a6890067da0934e0ba6e14661b9':
Quick: Fix crash on fall-through out of method code.
Vladimir Marko [Tue, 28 Apr 2015 18:35:17 +0000 (18:35 +0000)]
Merge "Quick: Fix crash on fall-through out of method code."
Calin Juravle [Tue, 7 Apr 2015 18:43:36 +0000 (19:43 +0100)]
Quick: Fix crash on fall-through out of method code.
Fix Quick crash when the last insn has a fall-through out of
the method's code. Allow creation of an out-of-method block
and at the end of MIRGraph::InlineMethod() check if that
block is reachable. If it is, punt to interpreter. Add tests
for unreachable if-lt and packed-switch as the last insn.
Also fix MIRGraph::ProcessCanSwitch() to treat the offset to
the data as signed. Jumping over the data with a goto and
using it from a switch further down is valid. This was also
crashing (presumably only on 64-bit dex2oat).
Thanks to Stephen Kyle (stephenckyle@googlemail.com) for the
bug report.
Bug:
19988134
Change-Id: I627f4137f61901897bfb9a5252741c6ded3a1adb
Dan Albert [Tue, 28 Apr 2015 18:23:35 +0000 (18:23 +0000)]
am
458d91b0: Merge "Prevent undefined behavior in RosAlloc."
* commit '
458d91b0f72293c9dd347feecf535db0682ccd71':
Prevent undefined behavior in RosAlloc.
Dan Albert [Tue, 28 Apr 2015 18:11:38 +0000 (18:11 +0000)]
Merge "Prevent undefined behavior in RosAlloc."
Dan Albert [Thu, 16 Apr 2015 18:50:30 +0000 (11:50 -0700)]
Prevent undefined behavior in RosAlloc.
In cases where remain == 0, the 32-bit value would be left shifted
32-bits, which is undefined behavior.
Change-Id: I6277279341b168536f928ce87375c395a1aa865c
Mathieu Chartier [Tue, 28 Apr 2015 18:03:18 +0000 (18:03 +0000)]
am
2b9b0de4: Merge "Fix some compaction bugs in string allocation"
* commit '
2b9b0de424146c8b654b3fa05b14c48d3b2b0b13':
Fix some compaction bugs in string allocation
Mathieu Chartier [Tue, 28 Apr 2015 17:47:45 +0000 (17:47 +0000)]
Merge "Fix some compaction bugs in string allocation"
Mathieu Chartier [Tue, 28 Apr 2015 17:01:28 +0000 (10:01 -0700)]
Fix some compaction bugs in string allocation
Change-Id: I2b8499c60de7690e1012d71bccba4ecd589da9af
David Srbecky [Tue, 28 Apr 2015 16:54:52 +0000 (17:54 +0100)]
Minor refactoring of ElfBuilder.
* Nest section builder classes within the main builder
class to reduce verbosity caused by templates.
* Move .eh_frame and .eh_frame_hdr section headers earlier
so that the section headers are sorted by file offset.
* Do not emit PT_NULL header if .eh_frame_hdr is missing.
None of these changes should have any material impact.
This CL just prepares ground for the following CL.
Change-Id: I56f9825892adb01d413a18ca10cb5c805cb8cd78
Sebastien Hertz [Tue, 28 Apr 2015 14:42:23 +0000 (14:42 +0000)]
am
1c5808c0: Merge "Fix constructor access check through reflection"
* commit '
1c5808c0fa83155565f5319808a2949e0a3f5789':
Fix constructor access check through reflection
Sebastien Hertz [Tue, 28 Apr 2015 14:33:00 +0000 (14:33 +0000)]
Merge "Fix constructor access check through reflection"
Vladimir Marko [Tue, 28 Apr 2015 13:51:27 +0000 (13:51 +0000)]
am
d4667dea: Merge "ART: Add FOUR_ARG_DOWNCALL macro for MIPS64 entry points."
* commit '
d4667dea87e68ee3ee64581af138f59300a5c510':
ART: Add FOUR_ARG_DOWNCALL macro for MIPS64 entry points.
Vladimir Marko [Tue, 28 Apr 2015 13:31:38 +0000 (13:31 +0000)]
Merge "ART: Add FOUR_ARG_DOWNCALL macro for MIPS64 entry points."
Sebastien Hertz [Tue, 28 Apr 2015 13:00:41 +0000 (15:00 +0200)]
Fix constructor access check through reflection
We must not throw IllegalAccessException if the constructor has been
made accessible by a previous call to Constructor.setAccessible, even
if the caller cannot access the constructor.
Bug:
20639158
Change-Id: I9a34f05cdbb8825ad88b42223743690228e3f03e
Vladimir Marko [Tue, 28 Apr 2015 13:14:58 +0000 (14:14 +0100)]
ART: Add FOUR_ARG_DOWNCALL macro for MIPS64 entry points.
Missing from
https://android-review.googlesource.com/79174
Change-Id: If182b73824edfd4639f645612b2f7b67c1f31bef
Vladimir Marko [Tue, 28 Apr 2015 12:19:38 +0000 (12:19 +0000)]
am
95935f28: Merge "ART: Fix MIPS entrypoint downcall macros."
* commit '
95935f28a7206c32592f6744cfc4c63e4d87ecdf':
ART: Fix MIPS entrypoint downcall macros.
Vladimir Marko [Tue, 28 Apr 2015 12:10:30 +0000 (12:10 +0000)]
Merge "ART: Fix MIPS entrypoint downcall macros."
Vladimir Marko [Tue, 28 Apr 2015 11:37:09 +0000 (12:37 +0100)]
ART: Fix MIPS entrypoint downcall macros.
Broken by not updating the MIPS assembly after rebase of
https://android-review.googlesource.com/79174
Change-Id: I6258c254c0652e92357d306640c461d9523da227
Vladimir Marko [Tue, 28 Apr 2015 10:44:37 +0000 (10:44 +0000)]
am
3adfc4bb: Merge "Quick: Avoid unnecessary GVN work in release builds."
* commit '
3adfc4bbe6c42d574bd2069d8e38a13d5ad98ccf':
Quick: Avoid unnecessary GVN work in release builds.
Roland Levillain [Tue, 28 Apr 2015 10:39:17 +0000 (10:39 +0000)]
am
80613ffd: Merge "Have HInvoke instructions know their number of actual arguments."
* commit '
80613ffd5699e6207d6b1264d600a0fc168074ce':
Have HInvoke instructions know their number of actual arguments.