OSDN Git Service
Sebastien Hertz [Thu, 7 May 2015 16:16:14 +0000 (16:16 +0000)]
am
a8b4dfcc: am
b882da74: Merge "Remove unused InvokeWithShadowFrame"
* commit '
a8b4dfcc22b0fdbdeeb87ce91368e88d46ab43e6':
Remove unused InvokeWithShadowFrame
Narayan Kamath [Thu, 7 May 2015 16:16:12 +0000 (16:16 +0000)]
am
f3a8c70a: am
6d2d4806: Merge "Fix broken checks in IsValidPartOfMemberNameUtf8Slow."
* commit '
f3a8c70aeb1ca2f4c1eb7a65a8f6df97698dc03a':
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
Sebastien Hertz [Thu, 7 May 2015 16:16:09 +0000 (16:16 +0000)]
am
c42bd509: am
eb7c5b19: Merge "JDWP: properly combine location events"
* commit '
c42bd509e5a0e5a7634b7c8ebb18196523af08a9':
JDWP: properly combine location events
Nicolas Geoffray [Thu, 7 May 2015 16:16:07 +0000 (16:16 +0000)]
am
205db690: am
f07f71f9: Merge "Use a growable array instead of an environment during SSA."
* commit '
205db6908eeca3f38c2da79cd25878d74537bf46':
Use a growable array instead of an environment during SSA.
Nicolas Geoffray [Thu, 7 May 2015 16:16:05 +0000 (16:16 +0000)]
am
905a88d3: am
46a4b268: Merge "Relax the only one back-edge restriction."
* commit '
905a88d309be4c41af4addd1ec2a821ecdcc9725':
Relax the only one back-edge restriction.
Nicolas Geoffray [Thu, 7 May 2015 16:16:03 +0000 (16:16 +0000)]
am
5199f914: am
bc3b93ea: Merge "No need to relocate the core image for the art script."
* commit '
5199f91486c1dac9037456c3f940dfd9faf673aa':
No need to relocate the core image for the art script.
Andreas Gampe [Thu, 7 May 2015 16:15:58 +0000 (16:15 +0000)]
am
9a950dec: am
a6591ef9: Merge "ART: Fix mips64 jni bugs."
* commit '
9a950decdf11303d47a450ff0d71ea64ae3d75ea':
ART: Fix mips64 jni bugs.
Jeff Hao [Thu, 7 May 2015 16:15:56 +0000 (16:15 +0000)]
am
75b27b57: am
225f679f: Merge "In quick compiler, force string init invoke to be fast path."
* commit '
75b27b57ad23da4c85fc13c644a763d541b8f0dd':
In quick compiler, force string init invoke to be fast path.
Andreas Gampe [Thu, 7 May 2015 16:15:43 +0000 (16:15 +0000)]
am
86b09d0f: am
8771be9a: Merge "Fix mips64 bugs."
* commit '
86b09d0fecd1d01819a8680ae7be087be90489aa':
Fix mips64 bugs.
Sebastien Hertz [Thu, 7 May 2015 15:57:34 +0000 (15:57 +0000)]
am
b882da74: Merge "Remove unused InvokeWithShadowFrame"
* commit '
b882da74db950246b5731aecad9737b63bdefef7':
Remove unused InvokeWithShadowFrame
Sebastien Hertz [Thu, 7 May 2015 15:45:17 +0000 (15:45 +0000)]
Merge "Remove unused InvokeWithShadowFrame"
Sebastien Hertz [Thu, 7 May 2015 15:23:16 +0000 (17:23 +0200)]
Remove unused InvokeWithShadowFrame
This is an artifact of the Portable compiler, probably left after its
removal https://android-review.googlesource.com/119049.
Change-Id: I7f6caa008e37e7a93792840c79713e90d0c7e1e1
Narayan Kamath [Thu, 7 May 2015 15:02:42 +0000 (15:02 +0000)]
am
6d2d4806: Merge "Fix broken checks in IsValidPartOfMemberNameUtf8Slow."
* commit '
6d2d48066f503c16aaf15661a22c75fde7ab76c2':
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
Narayan Kamath [Thu, 7 May 2015 14:54:47 +0000 (14:54 +0000)]
am
3ba8671d: Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
* commit '
3ba8671d60061359fd833f60f7a9dca14878cc0b':
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
Narayan Kamath [Thu, 7 May 2015 14:54:45 +0000 (14:54 +0000)]
Merge "Fix broken checks in IsValidPartOfMemberNameUtf8Slow."
Sebastien Hertz [Thu, 7 May 2015 14:32:57 +0000 (14:32 +0000)]
am
eb7c5b19: Merge "JDWP: properly combine location events"
* commit '
eb7c5b192257c92fc38a163c57e0a8bb771e476e':
JDWP: properly combine location events
Sebastien Hertz [Thu, 7 May 2015 14:22:34 +0000 (14:22 +0000)]
Merge "JDWP: properly combine location events"
Narayan Kamath [Wed, 6 May 2015 13:55:43 +0000 (14:55 +0100)]
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
GetUtf16FromUtf8 returns a surrogate pair only if it encounters
a 4-byte UTF sequence. Three byte UTF sequences will only return the
first or second half of a pair so we need to check for that
explicitly.
bug:
20844537
(cherry picked from commit
3ba8671d60061359fd833f60f7a9dca14878cc0b)
Change-Id: I2e2a4f9f736cd11050a2b634b3bb27b75a0ee0ba
Nicolas Geoffray [Thu, 7 May 2015 11:07:53 +0000 (11:07 +0000)]
am
f07f71f9: Merge "Use a growable array instead of an environment during SSA."
* commit '
f07f71f9af8f56e738ef0451c60734ec6022d08e':
Use a growable array instead of an environment during SSA.
Nicolas Geoffray [Thu, 7 May 2015 10:57:03 +0000 (10:57 +0000)]
Merge "Use a growable array instead of an environment during SSA."
Nicolas Geoffray [Thu, 7 May 2015 10:46:05 +0000 (11:46 +0100)]
Use a growable array instead of an environment during SSA.
Using an environment was convenient because it contains
a growable array. But there's no need for the environment
abstraction when being used as a temporary holder for values
of locals.
Change-Id: Idf2883fe4b8f97a31ee70b3627c1bdd23ebfff0e
Narayan Kamath [Wed, 6 May 2015 13:55:43 +0000 (14:55 +0100)]
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
GetUtf16FromUtf8 returns a surrogate pair only if it encounters
a 4-byte UTF sequence. Three byte UTF sequences will only return the
first or second half of a pair so we need to check for that
explicitly.
bug:
20844537
Change-Id: Icb660fae77ac8a852fc768e6c1cd5766117e68e4
Nicolas Geoffray [Thu, 7 May 2015 09:27:26 +0000 (09:27 +0000)]
am
46a4b268: Merge "Relax the only one back-edge restriction."
* commit '
46a4b26855ae9fcd14c6e4435f37f09ceb134f61':
Relax the only one back-edge restriction.
Nicolas Geoffray [Thu, 7 May 2015 09:27:24 +0000 (09:27 +0000)]
am
bc3b93ea: Merge "No need to relocate the core image for the art script."
* commit '
bc3b93eadd155342b6124d2d5ef3806ecec5dfd6':
No need to relocate the core image for the art script.
Nicolas Geoffray [Thu, 7 May 2015 08:57:23 +0000 (08:57 +0000)]
Merge "Relax the only one back-edge restriction."
Nicolas Geoffray [Tue, 5 May 2015 16:02:20 +0000 (17:02 +0100)]
Relax the only one back-edge restriction.
The rule is in the way for better register allocation, as
it creates an artificial join point between multiple paths.
Change-Id: Ia4392890f95bcea56d143138f28ddce6c572ad58
Nicolas Geoffray [Thu, 7 May 2015 08:15:41 +0000 (08:15 +0000)]
Merge "No need to relocate the core image for the art script."
Jeff Hao [Thu, 7 May 2015 05:28:54 +0000 (05:28 +0000)]
am
5c8fe302: In quick compiler, force string init invoke to be fast path.
* commit '
5c8fe3028655b2f1fcab77080272f071cc0d8bc4':
In quick compiler, force string init invoke to be fast path.
Andreas Gampe [Thu, 7 May 2015 03:59:37 +0000 (03:59 +0000)]
am
a6591ef9: Merge "ART: Fix mips64 jni bugs."
* commit '
a6591ef95afa6bc9d89c0c6044635ec7a13d4c55':
ART: Fix mips64 jni bugs.
Andreas Gampe [Thu, 7 May 2015 03:50:01 +0000 (03:50 +0000)]
Merge "ART: Fix mips64 jni bugs."
Douglas Leung [Fri, 1 May 2015 02:22:49 +0000 (19:22 -0700)]
ART: Fix mips64 jni bugs.
For mips64, 32-bits loads can be zero extended or sign extended to
64-bits. The extension type must match the data type to be loaded.
Also re-enable mips64 generic jni testing.
Change-Id: I9cabaf80b4fde63d9868fccd74593b36d1c324e8
Jeff Hao [Thu, 7 May 2015 01:36:39 +0000 (01:36 +0000)]
am
225f679f: Merge "In quick compiler, force string init invoke to be fast path."
* commit '
225f679f1d276e16e95960fcbe9743f95012adfa':
In quick compiler, force string init invoke to be fast path.
Jeff Hao [Thu, 7 May 2015 01:29:19 +0000 (01:29 +0000)]
Merge "In quick compiler, force string init invoke to be fast path."
Jeff Hao [Thu, 7 May 2015 00:41:32 +0000 (17:41 -0700)]
In quick compiler, force string init invoke to be fast path.
Was running into an issue where a secondary dex file was falling back on
the quick compiler, and IsFastInvoke returned 0 because the
referrer_class was nullptr, causing the string init to be slow path. The
string init technically does not have to be fast path, but there's no
reason to duplicate the logic to call off a thread pointer on the slow
path.
Bug:
20870917
(cherry picked from commit I47e1524d939eb7e9b1da8186092fafc6e925009e)
Change-Id: Ieacd965943759de2b075c30e03cf0a71863f499e
Jeff Hao [Thu, 7 May 2015 00:41:32 +0000 (17:41 -0700)]
In quick compiler, force string init invoke to be fast path.
Was running into an issue where a secondary dex file was falling back on
the quick compiler, and IsFastInvoke returned 0 because the
referrer_class was nullptr, causing the string init to be slow path. The
string init technically does not have to be fast path, but there's no
reason to duplicate the logic to call off a thread pointer on the slow
path.
Bug:
20870917
Change-Id: I47e1524d939eb7e9b1da8186092fafc6e925009e
Andreas Gampe [Thu, 7 May 2015 00:08:29 +0000 (00:08 +0000)]
am
8771be9a: Merge "Fix mips64 bugs."
* commit '
8771be9a5826ebe12cea0c2feb0fa085df5d60a2':
Fix mips64 bugs.
Andreas Gampe [Wed, 6 May 2015 23:53:00 +0000 (23:53 +0000)]
Merge "Fix mips64 bugs."
Vladimir Marko [Wed, 6 May 2015 23:47:56 +0000 (23:47 +0000)]
am
f986daa2: am
23d358b6: Merge "Quick: Inline synthetic accessors generated by jack."
* commit '
f986daa21a790af412482195137dcc7f50d9d0f3':
Quick: Inline synthetic accessors generated by jack.
Nicolas Geoffray [Wed, 6 May 2015 23:47:53 +0000 (23:47 +0000)]
am
07a13059: am
dceab011: Merge "Bump jdwp timeout to 12 minutes."
* commit '
07a1305927997fa944d4a3f65e45bdbeb16ac916':
Bump jdwp timeout to 12 minutes.
Nicolas Geoffray [Wed, 6 May 2015 23:47:40 +0000 (23:47 +0000)]
am
b1c02d37: am
9cce14f5: Merge "Re-enable JDWP tests on volantis."
* commit '
b1c02d374ba8acab72a35c43b1e2e700ce0de8a3':
Re-enable JDWP tests on volantis.
Sebastien Hertz [Wed, 6 May 2015 23:47:39 +0000 (23:47 +0000)]
am
1b1ca21f: am
644fa22a: Merge "Fix instrumentation exit stub for arm64"
* commit '
1b1ca21fcaff3cd124e3f7a134be5fee57217ba9':
Fix instrumentation exit stub for arm64
Andreas Gampe [Wed, 6 May 2015 22:56:11 +0000 (22:56 +0000)]
am
e92d0afc: am
3acc27f4: Merge "Fix Mips64 utils.h typo"
* commit '
e92d0afc3b1b2bb7f33a94bd491451ba99746c34':
Fix Mips64 utils.h typo
Hiroshi Yamauchi [Wed, 6 May 2015 22:55:40 +0000 (22:55 +0000)]
am
6b87b6bd: am
35b6625c: Merge "Temporarily suppress 098-ddmc for the read barrier config."
* commit '
6b87b6bdff5d04a24a2531ab942b578925078747':
Temporarily suppress 098-ddmc for the read barrier config.
Roland Levillain [Wed, 6 May 2015 22:44:58 +0000 (22:44 +0000)]
am
95072ae7: am
2b689e37: Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts"""""
* commit '
95072ae7446ceaa080c71a7296d98a17325539d8':
Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""
Nicolas Geoffray [Wed, 6 May 2015 22:44:51 +0000 (22:44 +0000)]
am
9b9cb18c: am
898fa9b9: Merge "Find better split positions in the register allocator."
* commit '
9b9cb18cfad2b94aa8d353569ccefae139562f5f':
Find better split positions in the register allocator.
Andreas Gampe [Wed, 6 May 2015 22:44:33 +0000 (22:44 +0000)]
am
9820d3c1: am
008b17ae: Merge "ART: Fix double-free in oatdump"
* commit '
9820d3c198abed51b781c25fd4139902fc391e0a':
ART: Fix double-free in oatdump
Nicolas Geoffray [Wed, 6 May 2015 17:38:19 +0000 (18:38 +0100)]
No need to relocate the core image for the art script.
Change-Id: Idd540175e197602e318eeb3764f552372aadce1f
Vladimir Marko [Wed, 6 May 2015 17:11:39 +0000 (17:11 +0000)]
am
f7083ed8: Quick: Inline synthetic accessors generated by jack.
* commit '
f7083ed806da454ba6a50ddef34799559f863fd4':
Quick: Inline synthetic accessors generated by jack.
Vladimir Marko [Wed, 6 May 2015 13:09:04 +0000 (14:09 +0100)]
Quick: Inline synthetic accessors generated by jack.
While javac names synthetic accessors "access$nnn", jack
names them "-getN", "-putN" and "-wrapN". For simplicity,
treat all methods starting with "-" as synthetic accessors.
Bug:
20873367
(cherry picked from commit
d5f1005da7599f149b1332402c9791ef2acb8c42)
Change-Id: Ifcc77fc3c5dd44797a48632c8e16416fbc273a93
Vladimir Marko [Wed, 6 May 2015 15:27:41 +0000 (15:27 +0000)]
am
23d358b6: Merge "Quick: Inline synthetic accessors generated by jack."
* commit '
23d358b621dbe11d6da918ab310ed3f1a5fc0558':
Quick: Inline synthetic accessors generated by jack.
Vladimir Marko [Wed, 6 May 2015 15:19:23 +0000 (15:19 +0000)]
Merge "Quick: Inline synthetic accessors generated by jack."
Vladimir Marko [Wed, 6 May 2015 13:09:04 +0000 (14:09 +0100)]
Quick: Inline synthetic accessors generated by jack.
While javac names synthetic accessors "access$nnn", jack
names them "-getN", "-putN" and "-wrapN". For simplicity,
treat all methods starting with "-" as synthetic accessors.
Bug:
20873367
Change-Id: I67990a6c2ef1d25dafe460ef70143a113bb5b7da
Nicolas Geoffray [Wed, 6 May 2015 14:08:42 +0000 (14:08 +0000)]
am
dceab011: Merge "Bump jdwp timeout to 12 minutes."
* commit '
dceab011395333520959cf743d680bcf5dc78797':
Bump jdwp timeout to 12 minutes.
Nicolas Geoffray [Wed, 6 May 2015 14:02:23 +0000 (14:02 +0000)]
Merge "Bump jdwp timeout to 12 minutes."
Nicolas Geoffray [Wed, 6 May 2015 13:57:09 +0000 (14:57 +0100)]
Bump jdwp timeout to 12 minutes.
A run on volantis now is around 10 minutes.
Change-Id: I6e1f436d71da6eec55e984f7af99ba34438e49fb
Sebastien Hertz [Wed, 6 May 2015 09:35:06 +0000 (09:35 +0000)]
am
529c147b: Merge "Fix instrumentation exit stub for arm64" into mnc-dev
* commit '
529c147b6ce15fd4ac8b2500c7e7a5749e98396b':
Fix instrumentation exit stub for arm64
Nicolas Geoffray [Wed, 6 May 2015 08:47:43 +0000 (08:47 +0000)]
am
9cce14f5: Merge "Re-enable JDWP tests on volantis."
* commit '
9cce14f56a59bbce52254ffc50ea6817fd94d8dd':
Re-enable JDWP tests on volantis.
Sebastien Hertz [Wed, 6 May 2015 08:47:42 +0000 (08:47 +0000)]
am
644fa22a: Merge "Fix instrumentation exit stub for arm64"
* commit '
644fa22a432ad0f717878331e745d6c25cc57d5d':
Fix instrumentation exit stub for arm64
Nicolas Geoffray [Wed, 6 May 2015 08:23:00 +0000 (08:23 +0000)]
Merge "Re-enable JDWP tests on volantis."
Nicolas Geoffray [Wed, 6 May 2015 08:19:32 +0000 (09:19 +0100)]
Re-enable JDWP tests on volantis.
Change-Id: Ibf1d16c9830155526cee38e242a4de9a3d5ed943
Sebastien Hertz [Wed, 6 May 2015 08:07:06 +0000 (08:07 +0000)]
Merge "Fix instrumentation exit stub for arm64"
Sebastien Hertz [Tue, 5 May 2015 18:03:50 +0000 (20:03 +0200)]
Fix instrumentation exit stub for arm64
Fixes bad offset to restore register x21.
Bug:
20798393
(cherry picked from commit
a538effb3f848bfec232c55f167b9f35b416948f)
Change-Id: I030d848ab0f46043e86f53abae204463f0aaccbe
Sebastien Hertz [Wed, 6 May 2015 08:01:23 +0000 (08:01 +0000)]
Merge "Fix instrumentation exit stub for arm64" into mnc-dev
Andreas Gampe [Wed, 6 May 2015 01:13:15 +0000 (01:13 +0000)]
am
3acc27f4: Merge "Fix Mips64 utils.h typo"
* commit '
3acc27f454e33f4650867a3ba0ecb8d3011e1048':
Fix Mips64 utils.h typo
Andreas Gampe [Wed, 6 May 2015 01:01:27 +0000 (01:01 +0000)]
Merge "Fix Mips64 utils.h typo"
Duane Sand [Tue, 5 May 2015 21:48:43 +0000 (14:48 -0700)]
Fix Mips64 utils.h typo
Include of art's utils.h was mistyped as util.h, and instead
brought in external/icu/icu4c/source/common/util.h,
which caused art build failures from -Wdeprecated warnings
when Mips64 libart is compiled with clang.
Change-Id: I9370c4dc041eaecc5d5a1490ec23034ece4322a9
Hiroshi Yamauchi [Tue, 5 May 2015 22:23:46 +0000 (22:23 +0000)]
am
35b6625c: Merge "Temporarily suppress 098-ddmc for the read barrier config."
* commit '
35b6625c21e9304dd79700f4ff1c26a7e30d2b2d':
Temporarily suppress 098-ddmc for the read barrier config.
Hiroshi Yamauchi [Tue, 5 May 2015 22:13:32 +0000 (22:13 +0000)]
Merge "Temporarily suppress 098-ddmc for the read barrier config."
Hiroshi Yamauchi [Tue, 5 May 2015 20:36:39 +0000 (13:36 -0700)]
Temporarily suppress 098-ddmc for the read barrier config.
Bug:
20720510
Change-Id: Ie8c159767654837c02f0484f4dda569bb0118a03
Hiroshi Yamauchi [Tue, 5 May 2015 19:07:34 +0000 (19:07 +0000)]
am
d117954a: Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()." into mnc-dev
* commit '
d117954a3b10aaf2141beabb12762d68d4b945ba':
Request full/partial GC type from VMRuntime.requestConcurrentGC().
Mathieu Chartier [Tue, 5 May 2015 19:07:33 +0000 (19:07 +0000)]
am
6985da63: am
02d320c2: (-s ours) am
3c683c5d: Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
* commit '
6985da634653fd825974bdd89cf488c6dd386fd0':
Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
Sebastien Hertz [Tue, 5 May 2015 18:03:50 +0000 (20:03 +0200)]
Fix instrumentation exit stub for arm64
Fixes bad offset to restore register x21.
Bug:
20798393
Change-Id: I030d848ab0f46043e86f53abae204463f0aaccbe
Hiroshi Yamauchi [Tue, 5 May 2015 17:01:33 +0000 (17:01 +0000)]
Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()." into mnc-dev
Roland Levillain [Tue, 5 May 2015 13:56:39 +0000 (13:56 +0000)]
am
2b689e37: Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts"""""
* commit '
2b689e370be9f32a88b419edf2d78eb6befade9c':
Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""
Roland Levillain [Tue, 5 May 2015 13:45:56 +0000 (13:45 +0000)]
Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts"""""
Nicolas Geoffray [Tue, 5 May 2015 09:39:11 +0000 (09:39 +0000)]
am
898fa9b9: Merge "Find better split positions in the register allocator."
* commit '
898fa9b96a579715d124671102886242bd62f393':
Find better split positions in the register allocator.
Nicolas Geoffray [Tue, 5 May 2015 09:26:29 +0000 (09:26 +0000)]
Merge "Find better split positions in the register allocator."
Nicolas Geoffray [Wed, 29 Apr 2015 13:16:00 +0000 (14:16 +0100)]
Find better split positions in the register allocator.
In a standard if/else control flow graph, this avoids
doing a move in one branch if the other branch decided
to move an interval.
This also needs a new register hint kind, which is what
was the location of the interval at the predecessor block.
Change-Id: I18b78264587b4d693540fbb5e014d12df2add3e2
Mathieu Chartier [Tue, 5 May 2015 01:48:09 +0000 (01:48 +0000)]
am
02d320c2: (-s ours) am
3c683c5d: Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
* commit '
02d320c218be4b8877d2d6947b1c85120736558c':
Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
Andreas Gampe [Tue, 5 May 2015 01:38:30 +0000 (01:38 +0000)]
am
008b17ae: Merge "ART: Fix double-free in oatdump"
* commit '
008b17ae313d033537a3792faf937134315f03bc':
ART: Fix double-free in oatdump
Andreas Gampe [Tue, 5 May 2015 01:31:33 +0000 (01:31 +0000)]
Merge "ART: Fix double-free in oatdump"
Andreas Gampe [Tue, 5 May 2015 01:25:23 +0000 (18:25 -0700)]
ART: Fix double-free in oatdump
The ImageDumper doesn't own the OatDumperOptions.
Bug:
20818721
Change-Id: Iea11ada8fb6418b226d39b33c252a834c42e655e
Andreas Gampe [Tue, 5 May 2015 01:24:10 +0000 (01:24 +0000)]
am
15c80977: Merge "ART: Emit debug info when app is debuggable" into mnc-dev
* commit '
15c80977a56a788078056f30d456ba75db5b2353':
ART: Emit debug info when app is debuggable
Mathieu Chartier [Tue, 5 May 2015 01:24:09 +0000 (01:24 +0000)]
am
ba52e130: Delete invalid DCHECK
* commit '
ba52e13068f4a04de13e7dd719a758c19b13fad5':
Delete invalid DCHECK
Andreas Gampe [Tue, 5 May 2015 01:22:15 +0000 (01:22 +0000)]
am
5e37e239: am
c2baa5e3: Merge "ART: Emit debug info when app is debuggable"
* commit '
5e37e239a403bba0887cbd9781d215c21b29e56e':
ART: Emit debug info when app is debuggable
Christopher Ferris [Tue, 5 May 2015 01:22:12 +0000 (01:22 +0000)]
am
42b59f6a: am
dd13f157: Merge "Fix mismatched new[]/delete."
* commit '
42b59f6ada0fac613776b4d1f9d3b350c214b572':
Fix mismatched new[]/delete.
Mathieu Chartier [Tue, 5 May 2015 01:22:01 +0000 (01:22 +0000)]
am
9a3fe451: am
d864f501: Merge "Delete invalid DCHECK"
* commit '
9a3fe451d1af1df6a1da18a956fc77d4bc9480e0':
Delete invalid DCHECK
Andreas Gampe [Tue, 5 May 2015 01:02:46 +0000 (01:02 +0000)]
am
c2baa5e3: Merge "ART: Emit debug info when app is debuggable"
* commit '
c2baa5e36f615947affc899b063ceadbd2879d17':
ART: Emit debug info when app is debuggable
Christopher Ferris [Tue, 5 May 2015 01:02:45 +0000 (01:02 +0000)]
am
dd13f157: Merge "Fix mismatched new[]/delete."
* commit '
dd13f1579006f0562a1b3548dc0a6d80cf62a002':
Fix mismatched new[]/delete.
Mathieu Chartier [Tue, 5 May 2015 01:02:42 +0000 (01:02 +0000)]
am
d864f501: Merge "Delete invalid DCHECK"
* commit '
d864f5010de581b15cea1e8178871e658024a6d9':
Delete invalid DCHECK
Mathieu Chartier [Tue, 5 May 2015 01:00:30 +0000 (01:00 +0000)]
am
3c683c5d: Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
* commit '
3c683c5d107cb43e8027d740ed579ef92a88af2e':
Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
Andreas Gampe [Mon, 4 May 2015 22:13:05 +0000 (22:13 +0000)]
Merge "ART: Emit debug info when app is debuggable"
Andreas Gampe [Mon, 4 May 2015 15:33:31 +0000 (08:33 -0700)]
ART: Emit debug info when app is debuggable
Emit debug symbols and CFI when dex2oat is compiling with the
--debuggable flag.
Bug:
17011129
(cherry picked from commit
8484d23186c229e2927441f85ae819abb4996072)
Change-Id: I0afab1e46abd819eded2b823580e766619497393
Christopher Ferris [Mon, 4 May 2015 21:58:44 +0000 (21:58 +0000)]
Merge "Fix mismatched new[]/delete."
Andreas Gampe [Mon, 4 May 2015 21:51:31 +0000 (21:51 +0000)]
Merge "ART: Emit debug info when app is debuggable" into mnc-dev
Mathieu Chartier [Mon, 4 May 2015 18:46:25 +0000 (11:46 -0700)]
Delete invalid DCHECK
We can have large objects mapped at address 0xebad____.
(cherry picked from commit
e1a0153eeecbacaa4dbdbd4650f7ba40b9c47814)
Change-Id: I9e27d4948e7e853b4af6eb1b36dbfec6d4d7a99a
Mathieu Chartier [Mon, 4 May 2015 19:59:55 +0000 (19:59 +0000)]
Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
This reverts commit
471b7cb6c1b8128bb343b49198f2654f9f5b8f86.
Change-Id: Ia22615b401fd28ea94e6269f9eac5653e103a6fd
Mathieu Chartier [Mon, 4 May 2015 19:12:45 +0000 (19:12 +0000)]
Merge "Delete invalid DCHECK"
Christopher Ferris [Mon, 27 Apr 2015 22:19:41 +0000 (15:19 -0700)]
Fix mismatched new[]/delete.
Another two cases where a new[] is used but only a delete occurs.
Bug:
18202869
Change-Id: If68264807150f3a9783e44ef8823cc366bff8df2
Mathieu Chartier [Mon, 4 May 2015 18:46:25 +0000 (11:46 -0700)]
Delete invalid DCHECK
We can have large objects mapped at address 0xebad____.
Change-Id: I9e27d4948e7e853b4af6eb1b36dbfec6d4d7a99a