OSDN Git Service
Mathieu Chartier [Wed, 29 Apr 2015 18:25:23 +0000 (18:25 +0000)]
am
5c4dd151: am
9b169f39: Merge "Only print IRT remove local warning if CheckJNI is enabled" into mnc-dev
* commit '
5c4dd151f0f8f4edfd42b256da0af97f3eea28c1':
Only print IRT remove local warning if CheckJNI is enabled
Mathieu Chartier [Wed, 29 Apr 2015 18:13:32 +0000 (18:13 +0000)]
am
9b169f39: Merge "Only print IRT remove local warning if CheckJNI is enabled" into mnc-dev
* commit '
9b169f39f7d3ac31571fdccea51c4e271668cced':
Only print IRT remove local warning if CheckJNI is enabled
Mathieu Chartier [Wed, 29 Apr 2015 18:10:11 +0000 (18:10 +0000)]
am
4590ab92: am
8df0e08f: am
8c9c1ae5: Merge "Only print IRT remove local warning if CheckJNI is enabled"
* commit '
4590ab928e48f60a70d6d76a329ec25419ce82ad':
Only print IRT remove local warning if CheckJNI is enabled
David Brazdil [Wed, 29 Apr 2015 18:10:10 +0000 (18:10 +0000)]
am
81ae83ed: am
395086f0: ART: Fix loop information after dead code elimination
* commit '
81ae83ed2e50cecd740e3f0cf8bbf816f081bd5c':
ART: Fix loop information after dead code elimination
Mathieu Chartier [Wed, 29 Apr 2015 18:00:08 +0000 (18:00 +0000)]
am
8df0e08f: am
8c9c1ae5: Merge "Only print IRT remove local warning if CheckJNI is enabled"
* commit '
8df0e08ff050bbcb84d711d155d8e3503ae23658':
Only print IRT remove local warning if CheckJNI is enabled
David Brazdil [Wed, 29 Apr 2015 17:55:36 +0000 (17:55 +0000)]
am
395086f0: ART: Fix loop information after dead code elimination
* commit '
395086f0a9e0658a2d33eeade7121db55c1f5dc8':
ART: Fix loop information after dead code elimination
Mathieu Chartier [Wed, 29 Apr 2015 17:49:33 +0000 (17:49 +0000)]
Merge "Only print IRT remove local warning if CheckJNI is enabled" into mnc-dev
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.
(cherry picked from commit
c5adebc9327bd5ca223a5faf99d904cc202a1627)
Bug:
17405090
Change-Id: Ib78d0d7bc31a88182cb9d85ddba9b469bd50324b
Nicolas Geoffray [Wed, 29 Apr 2015 17:49:00 +0000 (17:49 +0000)]
am
70eb7d5b: am
401b8ea4: am
ed51747a: Merge "Add synthesize uses at back edge."
* commit '
70eb7d5be34cc7282e03c8b7f844c749b1deac35':
Add synthesize uses at back edge.
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
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
(cherry picked from commit
69a2804c3bb48cf4fd00a66080f613a4fd96c422)
Change-Id: If9988381236e4d8d8c3b508dfce1376b27c20d75
Mathieu Chartier [Wed, 29 Apr 2015 17:37:47 +0000 (17:37 +0000)]
Merge "Only print IRT remove local warning if CheckJNI is enabled"
Nicolas Geoffray [Wed, 29 Apr 2015 17:36:13 +0000 (17:36 +0000)]
am
401b8ea4: am
ed51747a: Merge "Add synthesize uses at back edge."
* commit '
401b8ea4c56678cfa0b2d3bdae5cb9e208711f88':
Add synthesize uses at back edge.
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.
David Brazdil [Wed, 29 Apr 2015 17:17:10 +0000 (17:17 +0000)]
am
c816a9bc: am
c1849c58: am
0430fc92: Merge "ART: Fix loop information after dead code elimination"
* commit '
c816a9bc86696b863bac7571214b8b0554d27ec6':
ART: Fix loop information after dead code elimination
Nicolas Geoffray [Wed, 29 Apr 2015 17:10:08 +0000 (17:10 +0000)]
Merge "Add synthesize uses at back edge."
David Brazdil [Wed, 29 Apr 2015 17:06:11 +0000 (17:06 +0000)]
am
c1849c58: am
0430fc92: Merge "ART: Fix loop information after dead code elimination"
* commit '
c1849c58ce2a35c37f19e75038e034df47815ecd':
ART: Fix loop information after dead code elimination
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 16:04:39 +0000 (16:04 +0000)]
am
27a3baf5: am
4c176ef5: am
0829d9de: Merge "Factor MoveArguments methods in Optimizing\'s intrinsics handlers."
* commit '
27a3baf5cd1652dbb889780893569620db04db0e':
Factor MoveArguments methods in Optimizing's intrinsics handlers.
Roland Levillain [Wed, 29 Apr 2015 15:51:07 +0000 (15:51 +0000)]
am
4c176ef5: am
0829d9de: Merge "Factor MoveArguments methods in Optimizing\'s intrinsics handlers."
* commit '
4c176ef5ecd5a28354b9f98e5bafb848b0399a63':
Factor MoveArguments methods in Optimizing's intrinsics handlers.
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 15:05:43 +0000 (15:05 +0000)]
am
eefd248c: am
40e18300: am
36ad3f1c: Merge "Add dependency on libbase."
* commit '
eefd248c90882966e54706cd85c3fc0c4d5d43e7':
Add dependency on libbase.
Narayan Kamath [Wed, 29 Apr 2015 14:57:53 +0000 (14:57 +0000)]
am
40e18300: am
36ad3f1c: Merge "Add dependency on libbase."
* commit '
40e183005ecf05938f27a9722f419e71bb0e4257':
Add dependency on libbase.
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
Roland Levillain [Wed, 29 Apr 2015 14:11:54 +0000 (14:11 +0000)]
am
cad997f4: am
abc574c1: am
b6829c2e: Merge "Refactor InvokeDexCallingConventionVisitor in Optimizing."
* commit '
cad997f4b7df2bfa63e23ce77f9ec245e4af9d9c':
Refactor InvokeDexCallingConventionVisitor in Optimizing.
Roland Levillain [Wed, 29 Apr 2015 14:01:00 +0000 (14:01 +0000)]
am
abc574c1: am
b6829c2e: Merge "Refactor InvokeDexCallingConventionVisitor in Optimizing."
* commit '
abc574c14d86ab629d507da42155fa6ec125d7eb':
Refactor InvokeDexCallingConventionVisitor in Optimizing.
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
nikolay serdjuk [Wed, 29 Apr 2015 12:43:25 +0000 (12:43 +0000)]
am
3449b1fc: am
dd17bc38: Fix for incorrect encode and parse of PEXTRW instruction
* commit '
3449b1fcc2f3e86f916d8e735a19f7af2ca88809':
Fix for incorrect encode and parse of PEXTRW instruction
nikolay serdjuk [Wed, 29 Apr 2015 12:31:35 +0000 (12:31 +0000)]
am
dd17bc38: Fix for incorrect encode and parse of PEXTRW instruction
* commit '
dd17bc3806e800d3b82d5cb27e85ccc1c4e2ee1d':
Fix for incorrect encode and parse of PEXTRW instruction
Vladimir Marko [Wed, 29 Apr 2015 12:31:07 +0000 (12:31 +0000)]
am
a5df8b10: am
588f1f3c: am
f073a36d: Merge "Fix for incorrect encode and parse of PEXTRW instruction"
* commit '
a5df8b100b0af08a3b80da03df83455a566efe75':
Fix for incorrect encode and parse of PEXTRW instruction
Vladimir Marko [Wed, 29 Apr 2015 12:18:33 +0000 (12:18 +0000)]
am
588f1f3c: am
f073a36d: Merge "Fix for incorrect encode and parse of PEXTRW instruction"
* commit '
588f1f3ca8026485cff4e9d5b37d6eca913bf8b7':
Fix for incorrect encode and parse of PEXTRW instruction
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.
Signed-off-by: nikolay serdjuk <nikolay.y.serdjuk@intel.com>
(cherry picked from commit
e0705f51fdc71e9670a29f8c3a47168f50724b35)
Change-Id: I7f051e23789aa3745d6eb854c97f80c475748b74
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:47:54 +0000 (11:47 +0000)]
am
1dd648ab: am
48372b54: am
e761b911: Merge "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""
* commit '
1dd648ab9c81b93472bd200167e3063c43793e8d':
Revert "Revert "Revert "[optimizing] Improve x86 shifts"""
Roland Levillain [Wed, 29 Apr 2015 11:36:42 +0000 (11:36 +0000)]
am
48372b54: am
e761b911: Merge "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""
* commit '
48372b543cbf77835b2df66b1a8a0d88fe1d16f6':
Revert "Revert "Revert "[optimizing] Improve x86 shifts"""
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 11:08:53 +0000 (11:08 +0000)]
am
0f2f0f33: am
a3bfc429: am
7386f983: Merge "Bugs have been fixed, so run the tests."
* commit '
0f2f0f333ce2a7aefb78e7f783d451a37ba637b9':
Bugs have been fixed, so run the tests.
Nicolas Geoffray [Wed, 29 Apr 2015 10:57:20 +0000 (10:57 +0000)]
am
a3bfc429: am
7386f983: Merge "Bugs have been fixed, so run the tests."
* commit '
a3bfc429e59927ef12c0901539010ad8fd174a66':
Bugs have been fixed, so run the tests.
Roland Levillain [Wed, 29 Apr 2015 10:52:49 +0000 (10:52 +0000)]
am
750ea667: am
0a3e6543: am
fadf977d: Merge "Add InsertInstructionAfter in HBasicBlock."
* commit '
750ea667211065ca09ca4904d8ad82e455e0a173':
Add InsertInstructionAfter in HBasicBlock.
Roland Levillain [Wed, 29 Apr 2015 10:52:47 +0000 (10:52 +0000)]
am
8421f114: am
519873f3: am
d474b1d0: Merge "Revert "Revert "[optimizing] Improve x86 shifts"""
* commit '
8421f11449c4194c0058f932bd9359b86c0b3ceb':
Revert "Revert "[optimizing] Improve x86 shifts""
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.
Roland Levillain [Wed, 29 Apr 2015 10:42:02 +0000 (10:42 +0000)]
am
0a3e6543: am
fadf977d: Merge "Add InsertInstructionAfter in HBasicBlock."
* commit '
0a3e65439311f24c534a7b5640cc4918a5293c45':
Add InsertInstructionAfter in HBasicBlock.
Roland Levillain [Wed, 29 Apr 2015 10:42:00 +0000 (10:42 +0000)]
am
519873f3: am
d474b1d0: Merge "Revert "Revert "[optimizing] Improve x86 shifts"""
* commit '
519873f3306fbf0c4a33f0b666e4fefcd66f6aa1':
Revert "Revert "[optimizing] Improve x86 shifts""
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
Vladimir Marko [Wed, 29 Apr 2015 09:39:39 +0000 (09:39 +0000)]
am
93cdf011: am
a81a746c: Merge "Quick: Fix crash on fall-through out of method code." into mnc-dev
* commit '
93cdf011b2f09575981944c45dd4a7f9b88de233':
Quick: Fix crash on fall-through out of method code.
Vladimir Marko [Wed, 29 Apr 2015 09:31:27 +0000 (09:31 +0000)]
am
a81a746c: Merge "Quick: Fix crash on fall-through out of method code." into mnc-dev
* commit '
a81a746cad998e4cbfb7b18193879d8d1e1f8772':
Quick: Fix crash on fall-through out of method code.
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
Vladimir Marko [Wed, 29 Apr 2015 08:27:39 +0000 (08:27 +0000)]
Merge "Quick: Fix crash on fall-through out of method code." into mnc-dev
Andreas Gampe [Wed, 29 Apr 2015 07:02:41 +0000 (07:02 +0000)]
am
382f4ae7: am
19ad5824: ART: Move dex2oat watchdog output to LogLine
* commit '
382f4ae7db6ab29123a4af9982d0b17c774261cf':
ART: Move dex2oat watchdog output to LogLine
Andreas Gampe [Wed, 29 Apr 2015 07:02:39 +0000 (07:02 +0000)]
am
3a2395da: am
c878efbc: am
57f6bee4: Merge "ART: Move dex2oat watchdog output to LogLine"
* commit '
3a2395da7251ba7fcac26f7608bbeb735313dd63':
ART: Move dex2oat watchdog output to LogLine
Andreas Gampe [Wed, 29 Apr 2015 06:53:38 +0000 (06:53 +0000)]
am
19ad5824: ART: Move dex2oat watchdog output to LogLine
* commit '
19ad58245b5fac4bdf02045ac47472935b0717cd':
ART: Move dex2oat watchdog output to LogLine
Andreas Gampe [Wed, 29 Apr 2015 06:51:59 +0000 (06:51 +0000)]
am
c878efbc: am
57f6bee4: Merge "ART: Move dex2oat watchdog output to LogLine"
* commit '
c878efbc3ed1e602d41737f7a3208f995d288a93':
ART: Move dex2oat watchdog output to LogLine
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: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
(cherry picked from commit
d687e375cf7507b5c36df63cf03c991038b1c218)
Change-Id: I1fec8dae25f9282f72e762bda934fceb948bbd5f
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:45:58 +0000 (05:45 +0000)]
am
8735fa4f: am
c7bc9ad6: am
b0300bad: Merge "ART: Remove multidex limit"
* commit '
8735fa4f99ca55aae6c06d393979cde134e99731':
ART: Remove multidex limit
Andreas Gampe [Wed, 29 Apr 2015 05:34:40 +0000 (05:34 +0000)]
am
1c616900: am
b349274a: Merge "ART: Remove multidex limit" into mnc-dev
* commit '
1c6169001f797a298b961e7cadbd4618c58c5ea8':
ART: Remove multidex limit
Andreas Gampe [Wed, 29 Apr 2015 05:33:59 +0000 (05:33 +0000)]
am
c7bc9ad6: am
b0300bad: Merge "ART: Remove multidex limit"
* commit '
c7bc9ad6a932fc912c71102e2bb0190efdd92733':
ART: Remove multidex limit
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
Andreas Gampe [Wed, 29 Apr 2015 04:50:46 +0000 (04:50 +0000)]
am
b349274a: Merge "ART: Remove multidex limit" into mnc-dev
* commit '
b349274af4e568d8f6932d92fcc1768eaaa99c56':
ART: Remove multidex limit
Andreas Gampe [Wed, 29 Apr 2015 04:28:36 +0000 (04:28 +0000)]
Merge "ART: Remove multidex limit" into mnc-dev
Mathieu Chartier [Wed, 29 Apr 2015 04:24:54 +0000 (04:24 +0000)]
am
c14041a9: (-s ours) am
3d5e5f90: am
4a3fff8f: (-s ours) am
471b7cb6: HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
* commit '
c14041a9192c264c048eb3bb1153006abc498bb6':
HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
Mathieu Chartier [Wed, 29 Apr 2015 04:12:57 +0000 (04:12 +0000)]
am
3d5e5f90: am
4a3fff8f: (-s ours) am
471b7cb6: HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
* commit '
3d5e5f903f6068a889fe6532f9b51fcf28185c72':
HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
Mathieu Chartier [Wed, 29 Apr 2015 03:51:31 +0000 (03:51 +0000)]
am
4a3fff8f: (-s ours) am
471b7cb6: HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
* commit '
4a3fff8fc5021da3ef0b10850ac4ffbdef11c27c':
HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
Mathieu Chartier [Wed, 29 Apr 2015 02:11:03 +0000 (02:11 +0000)]
am
626ecd09: Fix possible null deference in Throwable::Dump
* commit '
626ecd092f22c9ecab3c86f9235e74e975862609':
Fix possible null deference in Throwable::Dump
Mathieu Chartier [Tue, 28 Apr 2015 23:27:58 +0000 (23:27 +0000)]
am
471b7cb6: HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
* commit '
471b7cb6c1b8128bb343b49198f2654f9f5b8f86':
HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
Mathieu Chartier [Tue, 28 Apr 2015 22:07:07 +0000 (15:07 -0700)]
HACK: Disable native stack trace dumping for tetra. DO NOT MERGE
Hopefully stops deadlocks.
Bug:
20640601
Change-Id: I3e19217b6da002d328ffa7d941e14bfe734442c3
Mathieu Chartier [Tue, 28 Apr 2015 21:33:54 +0000 (21:33 +0000)]
am
bc8ec546: am
13d38aab: Merge "Fix possible null deference in Throwable::Dump"
* commit '
bc8ec5462f9fb14b4e9c78b4d3c1590f41b32a54':
Fix possible null deference in Throwable::Dump
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
Jeff Hao [Tue, 28 Apr 2015 21:10:39 +0000 (21:10 +0000)]
am
889c0983: am
b8df6601: Merge "Change ddmc run-test to make new objects instead of strings."
* commit '
889c0983fe4c9d95b3ee41757a5bffbbd3b0586a':
Change ddmc run-test to make new objects instead of strings.
Vladimir Marko [Tue, 28 Apr 2015 21:10:29 +0000 (21:10 +0000)]
am
511eb743: am
edede5c6: Merge "Quick: Fix crash on fall-through out of method code."
* commit '
511eb743e362ca0cb97221074109dbc93d76f27d':
Quick: Fix crash on fall-through out of method code.
Mathieu Chartier [Tue, 28 Apr 2015 20:53:02 +0000 (13:53 -0700)]
Fix possible null deference in Throwable::Dump
Bug:
20640601
(cherry picked from commit
4a24858d432331049c416ae6a5993762bfe5e438)
Change-Id: I42a34510798aeb492f375dbb8edb7efeae0ae339
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
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
Change-Id: Ic51c96b84042f769a7d33ec53fe587b68cd69df4
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