OSDN Git Service

android-x86/art.git
9 years agoam 71359ff3: am 9a950dec: am a6591ef9: Merge "ART: Fix mips64 jni bugs."
Andreas Gampe [Thu, 7 May 2015 17:18:26 +0000 (17:18 +0000)]
am 71359ff3: am 9a950dec: am a6591ef9: Merge "ART: Fix mips64 jni bugs."

* commit '71359ff31b41fabaa492abcae4bf55b89341c3d0':
  ART: Fix mips64 jni bugs.

9 years agoam 8e8aee7a: am 75b27b57: am 225f679f: Merge "In quick compiler, force string init...
Jeff Hao [Thu, 7 May 2015 17:18:24 +0000 (17:18 +0000)]
am 8e8aee7a: am 75b27b57: am 225f679f: Merge "In quick compiler, force string init invoke to be fast path."

* commit '8e8aee7a64e9ad4fef3c0ca38dd2695daaaf089e':
  In quick compiler, force string init invoke to be fast path.

9 years agoam bbbc7702: am 86b09d0f: am 8771be9a: Merge "Fix mips64 bugs."
Andreas Gampe [Thu, 7 May 2015 17:18:23 +0000 (17:18 +0000)]
am bbbc7702: am 86b09d0f: am 8771be9a: Merge "Fix mips64 bugs."

* commit 'bbbc7702dd86a46a86a7c9ff8bdcd2d2f16e05c2':
  Fix mips64 bugs.

9 years agoam f689ca39: am 3ba8671d: Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
Narayan Kamath [Thu, 7 May 2015 17:17:10 +0000 (17:17 +0000)]
am f689ca39: am 3ba8671d: Fix broken checks in IsValidPartOfMemberNameUtf8Slow.

* commit 'f689ca3917d995880d8eab72f0d8760bdea9ac6c':
  Fix broken checks in IsValidPartOfMemberNameUtf8Slow.

9 years agoam 97ee6ec7: am 5c8fe302: In quick compiler, force string init invoke to be fast...
Jeff Hao [Thu, 7 May 2015 17:15:08 +0000 (17:15 +0000)]
am 97ee6ec7: am 5c8fe302: In quick compiler, force string init invoke to be fast path.

* commit '97ee6ec76d0824669fb7a37facc1b21a9a6b53aa':
  In quick compiler, force string init invoke to be fast path.

9 years agoam 9a950dec: am a6591ef9: Merge "ART: Fix mips64 jni bugs."
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.

9 years agoam 75b27b57: am 225f679f: Merge "In quick compiler, force string init invoke to be...
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.

9 years agoam 86b09d0f: am 8771be9a: Merge "Fix mips64 bugs."
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.

9 years agoam 3ba8671d: 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.

9 years agoFix broken checks in IsValidPartOfMemberNameUtf8Slow.
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

9 years agoam 5c8fe302: In quick compiler, force string init invoke to be fast path.
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.

9 years agoam a6591ef9: Merge "ART: Fix mips64 jni bugs."
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.

9 years agoMerge "ART: Fix mips64 jni bugs."
Andreas Gampe [Thu, 7 May 2015 03:50:01 +0000 (03:50 +0000)]
Merge "ART: Fix mips64 jni bugs."

9 years agoART: 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

9 years agoam 225f679f: Merge "In quick compiler, force string init invoke to be fast path."
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.

9 years agoMerge "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."

9 years agoIn 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

9 years agoIn 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
Change-Id: I47e1524d939eb7e9b1da8186092fafc6e925009e

9 years agoam 8771be9a: Merge "Fix mips64 bugs."
Andreas Gampe [Thu, 7 May 2015 00:08:29 +0000 (00:08 +0000)]
am 8771be9a: Merge "Fix mips64 bugs."

* commit '8771be9a5826ebe12cea0c2feb0fa085df5d60a2':
  Fix mips64 bugs.

9 years agoam b89ec0a2: am f986daa2: am 23d358b6: Merge "Quick: Inline synthetic accessors gener...
Vladimir Marko [Thu, 7 May 2015 00:03:50 +0000 (00:03 +0000)]
am b89ec0a2: am f986daa2: am 23d358b6: Merge "Quick: Inline synthetic accessors generated by jack."

* commit 'b89ec0a2316e79971baf3361371b4a5af3c71c88':
  Quick: Inline synthetic accessors generated by jack.

9 years agoam a5af760e: am 07a13059: am dceab011: Merge "Bump jdwp timeout to 12 minutes."
Nicolas Geoffray [Thu, 7 May 2015 00:03:49 +0000 (00:03 +0000)]
am a5af760e: am 07a13059: am dceab011: Merge "Bump jdwp timeout to 12 minutes."

* commit 'a5af760efe51c94fb86a3a08c11a97068c14f66c':
  Bump jdwp timeout to 12 minutes.

9 years agoam 12f250bb: am b1c02d37: am 9cce14f5: Merge "Re-enable JDWP tests on volantis."
Nicolas Geoffray [Thu, 7 May 2015 00:03:48 +0000 (00:03 +0000)]
am 12f250bb: am b1c02d37: am 9cce14f5: Merge "Re-enable JDWP tests on volantis."

* commit '12f250bb7ef3ffbc8d9fa26b0b9da03467967012':
  Re-enable JDWP tests on volantis.

9 years agoam 6735d405: am 1b1ca21f: am 644fa22a: Merge "Fix instrumentation exit stub for arm64"
Sebastien Hertz [Thu, 7 May 2015 00:03:47 +0000 (00:03 +0000)]
am 6735d405: am 1b1ca21f: am 644fa22a: Merge "Fix instrumentation exit stub for arm64"

* commit '6735d4057048954112ac66dafdf65b23d707d011':
  Fix instrumentation exit stub for arm64

9 years agoMerge "Fix mips64 bugs."
Andreas Gampe [Wed, 6 May 2015 23:53:00 +0000 (23:53 +0000)]
Merge "Fix mips64 bugs."

9 years agoam f986daa2: am 23d358b6: Merge "Quick: Inline synthetic accessors generated by jack."
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.

9 years agoam 07a13059: am dceab011: Merge "Bump jdwp timeout to 12 minutes."
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.

9 years agoam b1c02d37: am 9cce14f5: Merge "Re-enable JDWP tests on volantis."
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.

9 years agoam 1b1ca21f: am 644fa22a: Merge "Fix instrumentation exit stub for arm64"
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

9 years agoam 02b22d9d: am e92d0afc: am 3acc27f4: Merge "Fix Mips64 utils.h typo"
Andreas Gampe [Wed, 6 May 2015 23:03:11 +0000 (23:03 +0000)]
am 02b22d9d: am e92d0afc: am 3acc27f4: Merge "Fix Mips64 utils.h typo"

* commit '02b22d9d84f60f31f741cc834d28b38785c02aa1':
  Fix Mips64 utils.h typo

9 years agoam 0cfe5584: am 6b87b6bd: am 35b6625c: Merge "Temporarily suppress 098-ddmc for the...
Hiroshi Yamauchi [Wed, 6 May 2015 23:03:10 +0000 (23:03 +0000)]
am 0cfe5584: am 6b87b6bd: am 35b6625c: Merge "Temporarily suppress 098-ddmc for the read barrier config."

* commit '0cfe5584e19fdf5a8598441b0968b406f2a29796':
  Temporarily suppress 098-ddmc for the read barrier config.

9 years agoam 7a7dd4da: am 95072ae7: am 2b689e37: Merge "Revert "Revert "Revert "Revert "[optimi...
Roland Levillain [Wed, 6 May 2015 23:03:09 +0000 (23:03 +0000)]
am 7a7dd4da: am 95072ae7: am 2b689e37: Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts"""""

* commit '7a7dd4daecb62a15bfe02d1ba9e676b277fee594':
  Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""

9 years agoam b781855b: am 9b9cb18c: am 898fa9b9: Merge "Find better split positions in the...
Nicolas Geoffray [Wed, 6 May 2015 23:03:08 +0000 (23:03 +0000)]
am b781855b: am 9b9cb18c: am 898fa9b9: Merge "Find better split positions in the register allocator."

* commit 'b781855bccc7ac6162b8cb0301e546b933e44bf9':
  Find better split positions in the register allocator.

9 years agoam 99c5de7f: am 9820d3c1: am 008b17ae: Merge "ART: Fix double-free in oatdump"
Andreas Gampe [Wed, 6 May 2015 23:03:07 +0000 (23:03 +0000)]
am 99c5de7f: am 9820d3c1: am 008b17ae: Merge "ART: Fix double-free in oatdump"

* commit '99c5de7fe7470df855c8ca85a894e25b512dffbf':
  ART: Fix double-free in oatdump

9 years agoam e92d0afc: am 3acc27f4: Merge "Fix Mips64 utils.h typo"
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

9 years agoam 6b87b6bd: am 35b6625c: Merge "Temporarily suppress 098-ddmc for the read barrier...
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.

9 years agoam 95072ae7: am 2b689e37: Merge "Revert "Revert "Revert "Revert "[optimizing] Improve...
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""""

9 years agoam 9b9cb18c: am 898fa9b9: Merge "Find better split positions in the register allocator."
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.

9 years agoam 9820d3c1: am 008b17ae: Merge "ART: Fix double-free in oatdump"
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

9 years agoam 7ac12b6d: am f7083ed8: Quick: Inline synthetic accessors generated by jack.
Vladimir Marko [Wed, 6 May 2015 17:43:09 +0000 (17:43 +0000)]
am 7ac12b6d: am f7083ed8: Quick: Inline synthetic accessors generated by jack.

* commit '7ac12b6dc1384f10f9b1d2d74d96b94e3c9db6ca':
  Quick: Inline synthetic accessors generated by jack.

9 years agoam 9e9eca25: am 529c147b: Merge "Fix instrumentation exit stub for arm64" into mnc-dev
Sebastien Hertz [Wed, 6 May 2015 17:42:20 +0000 (17:42 +0000)]
am 9e9eca25: am 529c147b: Merge "Fix instrumentation exit stub for arm64" into mnc-dev

* commit '9e9eca25e406d997154f4efbbadaf5b361b0fa4c':
  Fix instrumentation exit stub for arm64

9 years agoam f7083ed8: Quick: Inline synthetic accessors generated by jack.
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.

9 years agoQuick: 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

9 years agoam 23d358b6: Merge "Quick: Inline synthetic accessors generated by jack."
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.

9 years agoMerge "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."

9 years agoQuick: 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

9 years agoam dceab011: Merge "Bump jdwp timeout to 12 minutes."
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.

9 years agoMerge "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."

9 years agoBump 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

9 years agoam 529c147b: Merge "Fix instrumentation exit stub for arm64" into mnc-dev
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

9 years agoam 9cce14f5: Merge "Re-enable JDWP tests on volantis."
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.

9 years agoam 644fa22a: Merge "Fix instrumentation exit stub for arm64"
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

9 years agoMerge "Re-enable JDWP tests on volantis."
Nicolas Geoffray [Wed, 6 May 2015 08:23:00 +0000 (08:23 +0000)]
Merge "Re-enable JDWP tests on volantis."

9 years agoRe-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

9 years agoMerge "Fix instrumentation exit stub for arm64"
Sebastien Hertz [Wed, 6 May 2015 08:07:06 +0000 (08:07 +0000)]
Merge "Fix instrumentation exit stub for arm64"

9 years agoFix 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

9 years agoMerge "Fix instrumentation exit stub for arm64" into mnc-dev
Sebastien Hertz [Wed, 6 May 2015 08:01:23 +0000 (08:01 +0000)]
Merge "Fix instrumentation exit stub for arm64" into mnc-dev

9 years agoam 3acc27f4: Merge "Fix Mips64 utils.h typo"
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

9 years agoMerge "Fix Mips64 utils.h typo"
Andreas Gampe [Wed, 6 May 2015 01:01:27 +0000 (01:01 +0000)]
Merge "Fix Mips64 utils.h typo"

9 years agoFix 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

9 years agoam 35b6625c: Merge "Temporarily suppress 098-ddmc for the read barrier config."
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.

9 years agoMerge "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."

9 years agoTemporarily 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

9 years agoam b4dc84e3: am d117954a: Merge "Request full/partial GC type from VMRuntime.requestC...
Hiroshi Yamauchi [Tue, 5 May 2015 19:24:39 +0000 (19:24 +0000)]
am b4dc84e3: am d117954a: Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC()." into mnc-dev

* commit 'b4dc84e32ca0e8fa08702b5f67b50499f6b836cf':
  Request full/partial GC type from VMRuntime.requestConcurrentGC().

9 years agoam b84629e8: (-s ours) am 6985da63: am 02d320c2: (-s ours) am 3c683c5d: Revert "HACK...
Mathieu Chartier [Tue, 5 May 2015 19:24:38 +0000 (19:24 +0000)]
am b84629e8: (-s ours) am 6985da63: am 02d320c2: (-s ours) am 3c683c5d: Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"

* commit 'b84629e8d9c424d5c10efca6c38b9aefa27f077c':
  Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"

9 years agoam d117954a: Merge "Request full/partial GC type from VMRuntime.requestConcurrentGC...
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().

9 years agoam 6985da63: am 02d320c2: (-s ours) am 3c683c5d: Revert "HACK: Disable native stack...
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"

9 years agoFix 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
Change-Id: I030d848ab0f46043e86f53abae204463f0aaccbe

9 years agoMerge "Request full/partial GC type from VMRuntime.requestConcurrentGC()." into mnc-dev
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

9 years agoam 2b689e37: Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts...
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""""

9 years agoMerge "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"""""

9 years agoam 898fa9b9: Merge "Find better split positions in the register allocator."
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.

9 years agoMerge "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."

9 years agoFind 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

9 years agoam 02d320c2: (-s ours) am 3c683c5d: Revert "HACK: Disable native stack trace dumping...
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"

9 years agoam 008b17ae: Merge "ART: Fix double-free in oatdump"
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

9 years agoMerge "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"

9 years agoART: 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

9 years agoam 15c80977: Merge "ART: Emit debug info when app is debuggable" into mnc-dev
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

9 years agoam ba52e130: Delete invalid DCHECK
Mathieu Chartier [Tue, 5 May 2015 01:24:09 +0000 (01:24 +0000)]
am ba52e130: Delete invalid DCHECK

* commit 'ba52e13068f4a04de13e7dd719a758c19b13fad5':
  Delete invalid DCHECK

9 years agoam 5e37e239: am c2baa5e3: Merge "ART: Emit debug info when app is debuggable"
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

9 years agoam 42b59f6a: am dd13f157: Merge "Fix mismatched new[]/delete."
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.

9 years agoam 9a3fe451: am d864f501: Merge "Delete invalid DCHECK"
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

9 years agoam c2baa5e3: Merge "ART: Emit debug info when app is debuggable"
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

9 years agoam dd13f157: Merge "Fix mismatched new[]/delete."
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.

9 years agoam d864f501: Merge "Delete invalid DCHECK"
Mathieu Chartier [Tue, 5 May 2015 01:02:42 +0000 (01:02 +0000)]
am d864f501: Merge "Delete invalid DCHECK"

* commit 'd864f5010de581b15cea1e8178871e658024a6d9':
  Delete invalid DCHECK

9 years agoam 3c683c5d: Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
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"

9 years agoMerge "ART: Emit debug info when app is debuggable"
Andreas Gampe [Mon, 4 May 2015 22:13:05 +0000 (22:13 +0000)]
Merge "ART: Emit debug info when app is debuggable"

9 years agoART: 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

9 years agoMerge "Fix mismatched new[]/delete."
Christopher Ferris [Mon, 4 May 2015 21:58:44 +0000 (21:58 +0000)]
Merge "Fix mismatched new[]/delete."

9 years agoMerge "ART: Emit debug info when app is debuggable" into mnc-dev
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

9 years agoDelete invalid DCHECK
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

9 years agoRevert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"
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

9 years agoMerge "Delete invalid DCHECK"
Mathieu Chartier [Mon, 4 May 2015 19:12:45 +0000 (19:12 +0000)]
Merge "Delete invalid DCHECK"

9 years agoFix mismatched new[]/delete.
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

9 years agoDelete invalid DCHECK
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

9 years agoam a6ce5b2d: Improve JNI registration failure logging
Mathieu Chartier [Mon, 4 May 2015 19:00:17 +0000 (19:00 +0000)]
am a6ce5b2d: Improve JNI registration failure logging

* commit 'a6ce5b2d5ade23087ab15f26d4c487570ad84b5e':
  Improve JNI registration failure logging

9 years agoam 1384f29a: am a93b104b: Merge "Improve JNI registration failure logging"
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

9 years agoam a93b104b: Merge "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

9 years agoImprove 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.

(cherry picked from commit 5c02d6cd0cc7e10d30d8c26166ebaaf6d313d771)

Bug: 13885477
Change-Id: I9f1a7ea45bd926f3984b8008d84c75e676a1ed10

9 years agoMerge "Improve JNI registration failure logging"
Mathieu Chartier [Mon, 4 May 2015 18:17:40 +0000 (18:17 +0000)]
Merge "Improve JNI registration failure logging"