OSDN Git Service

android-x86/art.git
8 years agoMerge "Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""" am: d585b2c891
David Brazdil [Wed, 2 Dec 2015 12:11:11 +0000 (12:11 +0000)]
Merge "Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""" am: d585b2c891
am: 642b96c61f

* commit '642b96c61ff9cc59259b609650f6e0a8d1bb48b5':
  Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""

8 years agoMerge "Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]"""
David Brazdil [Wed, 2 Dec 2015 12:07:51 +0000 (12:07 +0000)]
Merge "Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]"""
am: d585b2c891

* commit 'd585b2c891fbf559cef4b4a7076183f5c7dc6a18':
  Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""

8 years agoMerge "Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]"""
David Brazdil [Wed, 2 Dec 2015 12:04:18 +0000 (12:04 +0000)]
Merge "Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]"""

8 years agoRevert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""
David Brazdil [Wed, 2 Dec 2015 09:06:57 +0000 (09:06 +0000)]
Revert "Revert "ART: Do not eagerly type LoopPhi [null, ...]""

Fixes one more place where RTP expected the parent to have valid RTI.

This reverts commit 5f3fb18e9705f7d0d594f665858bff2020409c6a.

Bug: 25899441
Change-Id: I65c55a81617ffb82c2de2470eda562600b10d479

8 years agoMerge "Optimizing: Add checker tests for sharpening." am: 874121e358
Vladimir Marko [Wed, 2 Dec 2015 11:43:54 +0000 (11:43 +0000)]
Merge "Optimizing: Add checker tests for sharpening." am: 874121e358
am: 072dd4ddc7

* commit '072dd4ddc73e93b8e835607ae0aa71a6f682d168':
  Optimizing: Add checker tests for sharpening.

8 years agoMerge "Optimizing: Add checker tests for sharpening."
Vladimir Marko [Wed, 2 Dec 2015 11:40:59 +0000 (11:40 +0000)]
Merge "Optimizing: Add checker tests for sharpening."
am: 874121e358

* commit '874121e35863c1b166e3bb95009f392a569521f0':
  Optimizing: Add checker tests for sharpening.

8 years agoMerge "Optimizing: Add checker tests for sharpening."
Vladimir Marko [Wed, 2 Dec 2015 11:37:04 +0000 (11:37 +0000)]
Merge "Optimizing: Add checker tests for sharpening."

8 years agoOptimizing: Add checker tests for sharpening.
Vladimir Marko [Tue, 1 Dec 2015 14:58:23 +0000 (14:58 +0000)]
Optimizing: Add checker tests for sharpening.

This is a follow-up to
    https://android-review.googlesource.com/184116 .

Change-Id: Ib03c424fb673afc5ccce15d7d072b7572b47799a

8 years agoMerge "Revert "ART: Do not eagerly type LoopPhi [null, ...]"" am: 08a84acc7a
David Brazdil [Wed, 2 Dec 2015 09:11:16 +0000 (09:11 +0000)]
Merge "Revert "ART: Do not eagerly type LoopPhi [null, ...]"" am: 08a84acc7a
am: 7b6d7cad9e

* commit '7b6d7cad9e90b27014c565ed19730d0aba600175':
  Revert "ART: Do not eagerly type LoopPhi [null, ...]"

8 years agoMerge "Revert "ART: Do not eagerly type LoopPhi [null, ...]""
David Brazdil [Wed, 2 Dec 2015 09:08:22 +0000 (09:08 +0000)]
Merge "Revert "ART: Do not eagerly type LoopPhi [null, ...]""
am: 08a84acc7a

* commit '08a84acc7adb1bb076595eb961bd4667896e5075':
  Revert "ART: Do not eagerly type LoopPhi [null, ...]"

8 years agoMerge "Revert "ART: Do not eagerly type LoopPhi [null, ...]""
David Brazdil [Wed, 2 Dec 2015 09:04:08 +0000 (09:04 +0000)]
Merge "Revert "ART: Do not eagerly type LoopPhi [null, ...]""

8 years agoRevert "ART: Do not eagerly type LoopPhi [null, ...]"
David Brazdil [Wed, 2 Dec 2015 09:03:44 +0000 (09:03 +0000)]
Revert "ART: Do not eagerly type LoopPhi [null, ...]"

Breaks some libcore tests. Revert to unblock others while investigating.

This reverts commit 3a738bfe9784b9ea0f2fccbe75f0c72ede536641.

Change-Id: I9f103c692199b8f9b6e7af469fc424512b57544a

8 years agoMerge "ART: set growth limit to heap size when it is larger." am: 84e174e2de
Mathieu Chartier [Tue, 1 Dec 2015 23:42:24 +0000 (23:42 +0000)]
Merge "ART: set growth limit to heap size when it is larger." am: 84e174e2de
am: 2489c7100c

* commit '2489c7100c3ea4c560b2a92ce2ea622718a7de0a':
  ART: set growth limit to heap size when it is larger.

8 years agoMerge "ART: set growth limit to heap size when it is larger."
Mathieu Chartier [Tue, 1 Dec 2015 23:36:38 +0000 (23:36 +0000)]
Merge "ART: set growth limit to heap size when it is larger."
am: 84e174e2de

* commit '84e174e2de721b69ff6774e8e5c0b2e859e39953':
  ART: set growth limit to heap size when it is larger.

8 years agoMerge "ART: set growth limit to heap size when it is larger."
Mathieu Chartier [Tue, 1 Dec 2015 23:20:39 +0000 (23:20 +0000)]
Merge "ART: set growth limit to heap size when it is larger."

8 years agoMerge "Dynamic BCE (based on induction range analysis)" am: 80bbbbf9bb
Aart Bik [Tue, 1 Dec 2015 22:49:43 +0000 (22:49 +0000)]
Merge "Dynamic BCE (based on induction range analysis)" am: 80bbbbf9bb
am: 72c046b752

* commit '72c046b752348a744c6a96eea688ea21c1b97e6c':
  Dynamic BCE (based on induction range analysis)

8 years agoMerge "Dynamic BCE (based on induction range analysis)"
Aart Bik [Tue, 1 Dec 2015 22:47:23 +0000 (22:47 +0000)]
Merge "Dynamic BCE (based on induction range analysis)"
am: 80bbbbf9bb

* commit '80bbbbf9bbc4e725516a43c31d65c522ce15310b':
  Dynamic BCE (based on induction range analysis)

8 years agoMerge "Dynamic BCE (based on induction range analysis)"
Aart Bik [Tue, 1 Dec 2015 22:44:35 +0000 (22:44 +0000)]
Merge "Dynamic BCE (based on induction range analysis)"

8 years agoDynamic BCE (based on induction range analysis)
Aart Bik [Mon, 30 Nov 2015 18:17:46 +0000 (10:17 -0800)]
Dynamic BCE (based on induction range analysis)

Rationale:
A rewritten dynamic BCE that uses induction variable analysis
to generate the run-time tests before a loop in order to
eliminate bounds-checks from its body. This CL removes now
obsoleted induction related code inside the BCE module.
Also, the dynamic test generation is placed more strategically,
since we missed a few cases where static analysis does better.

Most significant performance improvements (filtering noise) is about:

Linpack +20%
LU    > +10%

Change-Id: I03d7631857154b6a131b132f26a2dc568af1b3a1

8 years agoMerge "Support null error_msg for select MemMap functions" am: f4c5393952
Mathieu Chartier [Tue, 1 Dec 2015 18:24:22 +0000 (18:24 +0000)]
Merge "Support null error_msg for select MemMap functions" am: f4c5393952
am: c6606a4136

* commit 'c6606a413667cd83f2de9d3401f6149eacad6e1e':
  Support null error_msg for select MemMap functions

8 years agoMerge "Support null error_msg for select MemMap functions"
Mathieu Chartier [Tue, 1 Dec 2015 18:20:20 +0000 (18:20 +0000)]
Merge "Support null error_msg for select MemMap functions"
am: f4c5393952

* commit 'f4c539395244ccfc14aebaf53fdc1122287f65a6':
  Support null error_msg for select MemMap functions

8 years agoMerge "Support null error_msg for select MemMap functions"
Mathieu Chartier [Tue, 1 Dec 2015 18:14:53 +0000 (18:14 +0000)]
Merge "Support null error_msg for select MemMap functions"

8 years agoMerge "Revert "Don\'t use the compiler driver for method resolution."" am: 1cfe7fd885
Nicolas Geoffray [Tue, 1 Dec 2015 16:36:21 +0000 (16:36 +0000)]
Merge "Revert "Don\'t use the compiler driver for method resolution."" am: 1cfe7fd885
am: 226e3a3561

* commit '226e3a35611c033b9703802adcf54d04fdb96946':
  Revert "Don't use the compiler driver for method resolution."

8 years agoMerge "Revert "Don\'t use the compiler driver for method resolution.""
Nicolas Geoffray [Tue, 1 Dec 2015 16:33:08 +0000 (16:33 +0000)]
Merge "Revert "Don\'t use the compiler driver for method resolution.""
am: 1cfe7fd885

* commit '1cfe7fd885fc21292dfe74b554c38b07304cb10e':
  Revert "Don't use the compiler driver for method resolution."

8 years agoMerge "Revert "Don't use the compiler driver for method resolution.""
Nicolas Geoffray [Tue, 1 Dec 2015 16:28:28 +0000 (16:28 +0000)]
Merge "Revert "Don't use the compiler driver for method resolution.""

8 years agoRevert "Don't use the compiler driver for method resolution."
Nicolas Geoffray [Tue, 1 Dec 2015 16:28:10 +0000 (16:28 +0000)]
Revert "Don't use the compiler driver for method resolution."

Fails 425 in debuggable mode.

This reverts commit 4db0bf9c4db6a09716c3388b7d2f88d534470339.

Change-Id: I346df8f75674564fc4fb241c60f23e250fc7f0a7

8 years agoMerge "ART: Do not eagerly type LoopPhi [null, ...]" am: 8b3609b4da
David Brazdil [Tue, 1 Dec 2015 15:26:45 +0000 (15:26 +0000)]
Merge "ART: Do not eagerly type LoopPhi [null, ...]" am: 8b3609b4da
am: 47a2e7339a

* commit '47a2e7339a41634275b66aa389ad494279c29c50':
  ART: Do not eagerly type LoopPhi [null, ...]

8 years agoMerge "ART: Do not eagerly type LoopPhi [null, ...]"
David Brazdil [Tue, 1 Dec 2015 15:21:27 +0000 (15:21 +0000)]
Merge "ART: Do not eagerly type LoopPhi [null, ...]"
am: 8b3609b4da

* commit '8b3609b4daacfd6d823fe9d9052955db2202aa0f':
  ART: Do not eagerly type LoopPhi [null, ...]

8 years agoMerge "ART: Do not eagerly type LoopPhi [null, ...]"
David Brazdil [Tue, 1 Dec 2015 15:17:21 +0000 (15:17 +0000)]
Merge "ART: Do not eagerly type LoopPhi [null, ...]"

8 years agoART: Do not eagerly type LoopPhi [null, ...]
David Brazdil [Mon, 30 Nov 2015 10:38:12 +0000 (10:38 +0000)]
ART: Do not eagerly type LoopPhi [null, ...]

ReferenceTypePropagation would eagerly set the type of each loop phi
to the type of the first input prior to beginning the fix-point
iteration. While this does make the algorithm converge faster, it
should not be applied when the first input is a NullConstant becuase
that sets the type of the phi and all dependent instructions to Object.

Bug: 25899441
Change-Id: Iff1ed26a63fe4332eaf88d9ca171e287f10ba1a6

8 years agoMerge "Remove unnecessary workaround to vogar escaping issue" am: dd5d8bd15d
Paul Duffin [Tue, 1 Dec 2015 14:51:28 +0000 (14:51 +0000)]
Merge "Remove unnecessary workaround to vogar escaping issue" am: dd5d8bd15d
am: 945ced863d

* commit '945ced863df16b3cfa0ca380c9820e76167261b4':
  Remove unnecessary workaround to vogar escaping issue

8 years agoMerge "Remove unnecessary workaround to vogar escaping issue"
Paul Duffin [Tue, 1 Dec 2015 14:48:32 +0000 (14:48 +0000)]
Merge "Remove unnecessary workaround to vogar escaping issue"
am: dd5d8bd15d

* commit 'dd5d8bd15d9486c2d596e768436895ce884576a0':
  Remove unnecessary workaround to vogar escaping issue

8 years agoMerge "Remove unnecessary workaround to vogar escaping issue"
Paul Duffin [Tue, 1 Dec 2015 14:43:54 +0000 (14:43 +0000)]
Merge "Remove unnecessary workaround to vogar escaping issue"

8 years agoMerge "Don\'t use the compiler driver for method resolution." am: 753e8c43e1
Nicolas Geoffray [Tue, 1 Dec 2015 14:32:03 +0000 (14:32 +0000)]
Merge "Don\'t use the compiler driver for method resolution." am: 753e8c43e1
am: f685299b83

* commit 'f685299b83449beda35291b2e3ae4855c97f8354':
  Don't use the compiler driver for method resolution.

8 years agoMerge "Don\'t use the compiler driver for method resolution."
Nicolas Geoffray [Tue, 1 Dec 2015 14:28:57 +0000 (14:28 +0000)]
Merge "Don\'t use the compiler driver for method resolution."
am: 753e8c43e1

* commit '753e8c43e1e68cade83e42f8111745d5c6f14f90':
  Don't use the compiler driver for method resolution.

8 years agoMerge "Don't use the compiler driver for method resolution."
Nicolas Geoffray [Tue, 1 Dec 2015 14:24:03 +0000 (14:24 +0000)]
Merge "Don't use the compiler driver for method resolution."

8 years agoDon't use the compiler driver for method resolution.
Nicolas Geoffray [Mon, 23 Nov 2015 09:35:04 +0000 (09:35 +0000)]
Don't use the compiler driver for method resolution.

The compiler driver makes assumptions that don't hold for
the optimizing compiler, and will for example always go to
slow path for an invoke-super when there's no verified method.

Also fix GenerateInvokeVirtual in the presence of intrinsics.

Next change will address some of the TODOs in sharpening.cc.

Change-Id: I2b0e543ee9b9bebcadb2d26de29e850c59ad58b9

8 years agoMerge "Move PC-relative addressing bases to a better position." am: b1aa617639
Vladimir Marko [Tue, 1 Dec 2015 14:22:27 +0000 (14:22 +0000)]
Merge "Move PC-relative addressing bases to a better position." am: b1aa617639
am: ba03f5e98d

* commit 'ba03f5e98d6affe2ae4b89abdb161cbf7ea42429':
  Move PC-relative addressing bases to a better position.

8 years agoMerge "Move PC-relative addressing bases to a better position."
Vladimir Marko [Tue, 1 Dec 2015 14:18:42 +0000 (14:18 +0000)]
Merge "Move PC-relative addressing bases to a better position."
am: b1aa617639

* commit 'b1aa617639c01c0dffaafd1641e0304ad179b6a2':
  Move PC-relative addressing bases to a better position.

8 years agoMerge "Move PC-relative addressing bases to a better position."
Vladimir Marko [Tue, 1 Dec 2015 14:15:52 +0000 (14:15 +0000)]
Merge "Move PC-relative addressing bases to a better position."

8 years agoRemove unnecessary workaround to vogar escaping issue
Paul Duffin [Tue, 1 Dec 2015 13:56:52 +0000 (13:56 +0000)]
Remove unnecessary workaround to vogar escaping issue

Vogar didn't handle arguments for the target (i.e. after --)
properly if they had characters that affect shell parsing, e.g.
spaces. In order to work around it the tools/run-jdwp-tests.sh
script added some extra quotes that now cause it to break. This
simply removes those quotes.

Change-Id: If0349f87cacf93ff8e454780e187fe7ff1623c99

8 years agoMerge "Optimizing/ARM: Implement kDexCachePcRelative dispatch." am: 1965328f59
Vladimir Marko [Tue, 1 Dec 2015 13:02:32 +0000 (13:02 +0000)]
Merge "Optimizing/ARM: Implement kDexCachePcRelative dispatch." am: 1965328f59
am: bf94674d14

* commit 'bf94674d143d96a1457ce0a61dae1aa782ae8423':
  Optimizing/ARM: Implement kDexCachePcRelative dispatch.

8 years agoMerge "Optimizing/ARM: Implement kDexCachePcRelative dispatch."
Vladimir Marko [Tue, 1 Dec 2015 12:59:39 +0000 (12:59 +0000)]
Merge "Optimizing/ARM: Implement kDexCachePcRelative dispatch."
am: 1965328f59

* commit '1965328f598854bfdf2d41cea582460d11aeba48':
  Optimizing/ARM: Implement kDexCachePcRelative dispatch.

8 years agoMerge "Optimizing/ARM: Implement kDexCachePcRelative dispatch."
Vladimir Marko [Tue, 1 Dec 2015 12:57:09 +0000 (12:57 +0000)]
Merge "Optimizing/ARM: Implement kDexCachePcRelative dispatch."

8 years agoMove PC-relative addressing bases to a better position.
Vladimir Marko [Wed, 25 Nov 2015 15:25:10 +0000 (15:25 +0000)]
Move PC-relative addressing bases to a better position.

Move the platform-specific HX86ComputeBaseMethodAddress and
HArmDexCacheArraysBase to the latest dominator of their uses
outside any loop. This brings the base closer to the first
use (previously, it was in the entry block) and relieves
some pressure on the register allocator while avoiding
recalculation of the base in a loop.

Change-Id: I231aa81eb5b4de9af2d0167054d06b65eb18a636

8 years agoOptimizing/ARM: Implement kDexCachePcRelative dispatch.
Vladimir Marko [Tue, 24 Nov 2015 13:45:23 +0000 (13:45 +0000)]
Optimizing/ARM: Implement kDexCachePcRelative dispatch.

Change-Id: I0fe2da50a30a3f62bec8ea01688dd1fec84b1831

8 years agoMerge "Refactor oat file writing to give Dex2Oat more control." am: d1744d449c
Vladimir Marko [Tue, 1 Dec 2015 10:24:31 +0000 (10:24 +0000)]
Merge "Refactor oat file writing to give Dex2Oat more control." am: d1744d449c
am: 110d07e2c0

* commit '110d07e2c0bc54733246374f335123c44fb6e702':
  Refactor oat file writing to give Dex2Oat more control.

8 years agoMerge "Refactor oat file writing to give Dex2Oat more control."
Vladimir Marko [Tue, 1 Dec 2015 10:21:17 +0000 (10:21 +0000)]
Merge "Refactor oat file writing to give Dex2Oat more control."
am: d1744d449c

* commit 'd1744d449cf2b56af7e0896b3729fac2a414e3af':
  Refactor oat file writing to give Dex2Oat more control.

8 years agoMerge "Refactor oat file writing to give Dex2Oat more control."
Vladimir Marko [Tue, 1 Dec 2015 10:16:19 +0000 (10:16 +0000)]
Merge "Refactor oat file writing to give Dex2Oat more control."

8 years agoMerge "Revert "Change LoadNativeLibrary to use GetOrCreateAllocator"" am: e51e3f988b
Mathieu Chartier [Tue, 1 Dec 2015 01:29:11 +0000 (01:29 +0000)]
Merge "Revert "Change LoadNativeLibrary to use GetOrCreateAllocator"" am: e51e3f988b
am: de75505933

* commit 'de75505933a7c8e3a8076d445e1510f321cc4296':
  Revert "Change LoadNativeLibrary to use GetOrCreateAllocator"

8 years agoMerge "Revert "Change LoadNativeLibrary to use GetOrCreateAllocator""
Mathieu Chartier [Tue, 1 Dec 2015 01:26:23 +0000 (01:26 +0000)]
Merge "Revert "Change LoadNativeLibrary to use GetOrCreateAllocator""
am: e51e3f988b

* commit 'e51e3f988ba91f0469757738fa55f835e16e37d9':
  Revert "Change LoadNativeLibrary to use GetOrCreateAllocator"

8 years agoMerge "Revert "Change LoadNativeLibrary to use GetOrCreateAllocator""
Mathieu Chartier [Tue, 1 Dec 2015 01:20:12 +0000 (01:20 +0000)]
Merge "Revert "Change LoadNativeLibrary to use GetOrCreateAllocator""

8 years agoRevert "Change LoadNativeLibrary to use GetOrCreateAllocator"
Mathieu Chartier [Tue, 1 Dec 2015 01:20:00 +0000 (01:20 +0000)]
Revert "Change LoadNativeLibrary to use GetOrCreateAllocator"

This reverts commit 2d902b99bba7ae1ad77ebeb038a4ef63c3ed6399.

Change-Id: I4a674844f2f6d76d1c33741b46f12417ec7eab35

8 years agoMerge "Make debugger support default methods." am: 996935e961
Alex Light [Mon, 30 Nov 2015 23:43:22 +0000 (23:43 +0000)]
Merge "Make debugger support default methods." am: 996935e961
am: 679841d2be

* commit '679841d2be9bd513c8b6655bb06685ed3ecff469':
  Make debugger support default methods.

8 years agoMerge "Make debugger support default methods."
Alex Light [Mon, 30 Nov 2015 23:41:23 +0000 (23:41 +0000)]
Merge "Make debugger support default methods."
am: 996935e961

* commit '996935e96137546cb3df5a63bc5aca477d58111f':
  Make debugger support default methods.

8 years agoMerge "Make debugger support default methods."
Alex Light [Mon, 30 Nov 2015 23:37:10 +0000 (23:37 +0000)]
Merge "Make debugger support default methods."

8 years agoMerge "Change LoadNativeLibrary to use GetOrCreateAllocator" am: 2e57aca33b
Mathieu Chartier [Mon, 30 Nov 2015 23:07:07 +0000 (23:07 +0000)]
Merge "Change LoadNativeLibrary to use GetOrCreateAllocator" am: 2e57aca33b
am: f213a7b7cb

* commit 'f213a7b7cb7c1adc4ce6be36973f0b9e01316abb':
  Change LoadNativeLibrary to use GetOrCreateAllocator

8 years agoMerge "Change LoadNativeLibrary to use GetOrCreateAllocator"
Mathieu Chartier [Mon, 30 Nov 2015 23:04:01 +0000 (23:04 +0000)]
Merge "Change LoadNativeLibrary to use GetOrCreateAllocator"
am: 2e57aca33b

* commit '2e57aca33bd22cac7c0e66bdc11a90163b1718e9':
  Change LoadNativeLibrary to use GetOrCreateAllocator

8 years agoMerge "Change LoadNativeLibrary to use GetOrCreateAllocator"
Mathieu Chartier [Mon, 30 Nov 2015 23:00:33 +0000 (23:00 +0000)]
Merge "Change LoadNativeLibrary to use GetOrCreateAllocator"

8 years agoSupport null error_msg for select MemMap functions
Mathieu Chartier [Tue, 24 Nov 2015 21:47:52 +0000 (13:47 -0800)]
Support null error_msg for select MemMap functions

In the failure case, reading proc maps takes 30ms. This is too slow
for app images.

Bug: 22858531
Change-Id: Ib6998cf82116720b23faec89d011fb7197c3d1cb

8 years agoMake debugger support default methods.
Alex Light [Fri, 20 Nov 2015 23:03:26 +0000 (15:03 -0800)]
Make debugger support default methods.

Supports breaking on, stepping into and through default methods.

Bug: 25549445
Bug: 24618811

Change-Id: I1a47e3263a0624adbd9e83b99d0acd7bef7757a4

8 years agoChange LoadNativeLibrary to use GetOrCreateAllocator
Mathieu Chartier [Wed, 25 Nov 2015 00:22:54 +0000 (16:22 -0800)]
Change LoadNativeLibrary to use GetOrCreateAllocator

Previously we used GetAllocatorForClassLoader. This did not
handle the case where someone called LoadLibrary without having
already loaded a class.

Added regression test.

Bug: 25866849

Change-Id: Id720505eaded3b0f9c2eab59a40611b328837c4a

8 years agoMerge "Do not build art with clang for mips64" am: 1850cb43db
Chih-hung Hsieh [Mon, 30 Nov 2015 19:55:25 +0000 (19:55 +0000)]
Merge "Do not build art with clang for mips64" am: 1850cb43db
am: a656433d3b

* commit 'a656433d3b93a3dc1428d008114490e62b70b41b':
  Do not build art with clang for mips64

8 years agoMerge "Do not build art with clang for mips64"
Chih-hung Hsieh [Mon, 30 Nov 2015 19:50:45 +0000 (19:50 +0000)]
Merge "Do not build art with clang for mips64"
am: 1850cb43db

* commit '1850cb43dbddbc655a6f990a7d475587fa9d6659':
  Do not build art with clang for mips64

8 years agoMerge "Do not build art with clang for mips64"
Chih-hung Hsieh [Mon, 30 Nov 2015 19:46:10 +0000 (19:46 +0000)]
Merge "Do not build art with clang for mips64"

8 years agoDo not build art with clang for mips64
Lazar Trsic [Fri, 27 Nov 2015 13:33:06 +0000 (14:33 +0100)]
Do not build art with clang for mips64

Clang generates illegal instruction on mips64r6 with -O0.
https://dmz-portal.mips.com/bugz/show_bug.cgi?id=2218

BUG: 25928358

Change-Id: I8ccd644f1509b4b341384fa67facc07cb966dfa8

8 years agoMerge "Test case for getting annotations of renamed enums." am: be950a36bf
Jeff Hao [Mon, 30 Nov 2015 18:55:46 +0000 (18:55 +0000)]
Merge "Test case for getting annotations of renamed enums." am: be950a36bf
am: cb5777a8ee

* commit 'cb5777a8ee9f44e26b8af1d2649b2405172fe544':
  Test case for getting annotations of renamed enums.

8 years agoMerge "Test case for getting annotations of renamed enums."
Jeff Hao [Mon, 30 Nov 2015 18:51:43 +0000 (18:51 +0000)]
Merge "Test case for getting annotations of renamed enums."
am: be950a36bf

* commit 'be950a36bf23e61a71a09d71c1274dabcdbd9db6':
  Test case for getting annotations of renamed enums.

8 years agoMerge "Test case for getting annotations of renamed enums."
Jeff Hao [Mon, 30 Nov 2015 18:48:59 +0000 (18:48 +0000)]
Merge "Test case for getting annotations of renamed enums."

8 years agoTest case for getting annotations of renamed enums.
Jeff Hao [Wed, 25 Nov 2015 03:12:57 +0000 (19:12 -0800)]
Test case for getting annotations of renamed enums.

The crashing app was trying to get enums explicitly by name, but could
not find them since they had been renamed by Proguard.

Regression test for bug 25802263.

Change-Id: Iff78a82d81ca108f1289051916f4272cd0f1e6fe

8 years agoRefactor oat file writing to give Dex2Oat more control.
Vladimir Marko [Wed, 25 Nov 2015 14:33:36 +0000 (14:33 +0000)]
Refactor oat file writing to give Dex2Oat more control.

This is the first step towards writing dex files to oat file
and mapping them from there for the actual AOT compilation.

Change-Id: Icb0d27487eaf6ba3a66c157e695f9bdc5bb9cf9a

8 years agoMerge "Accept synthetic phi nodes and general names for blocks." am: 584bc17049
Aart Bik [Mon, 30 Nov 2015 17:34:44 +0000 (17:34 +0000)]
Merge "Accept synthetic phi nodes and general names for blocks." am: 584bc17049
am: 00aad4b563

* commit '00aad4b5636d2e3f6028a476517da8a1282f12bc':
  Accept synthetic phi nodes and general names for blocks.

8 years agoMerge "Accept synthetic phi nodes and general names for blocks."
Aart Bik [Mon, 30 Nov 2015 17:31:29 +0000 (17:31 +0000)]
Merge "Accept synthetic phi nodes and general names for blocks."
am: 584bc17049

* commit '584bc170492216c6e3117eb895a6a12bcc9dcf42':
  Accept synthetic phi nodes and general names for blocks.

8 years agoMerge "Accept synthetic phi nodes and general names for blocks."
Aart Bik [Mon, 30 Nov 2015 17:28:16 +0000 (17:28 +0000)]
Merge "Accept synthetic phi nodes and general names for blocks."

8 years agoMerge "Temporarily omit MIPS floating point registers in DWARF." am: d42dd1abbe
David Srbecky [Fri, 27 Nov 2015 14:12:05 +0000 (14:12 +0000)]
Merge "Temporarily omit MIPS floating point registers in DWARF." am: d42dd1abbe
am: 6eb2e960d4

* commit '6eb2e960d47cd4ba7d93544fbbd043f95236e70c':
  Temporarily omit MIPS floating point registers in DWARF.

8 years agoMerge "Temporarily omit MIPS floating point registers in DWARF."
David Srbecky [Fri, 27 Nov 2015 14:10:00 +0000 (14:10 +0000)]
Merge "Temporarily omit MIPS floating point registers in DWARF."
am: d42dd1abbe

* commit 'd42dd1abbeba1bc93499026484f5f44f9dde1858':
  Temporarily omit MIPS floating point registers in DWARF.

8 years agoMerge "Temporarily omit MIPS floating point registers in DWARF."
David Srbecky [Fri, 27 Nov 2015 14:08:26 +0000 (14:08 +0000)]
Merge "Temporarily omit MIPS floating point registers in DWARF."

8 years agoTemporarily omit MIPS floating point registers in DWARF.
David Srbecky [Fri, 27 Nov 2015 13:31:16 +0000 (13:31 +0000)]
Temporarily omit MIPS floating point registers in DWARF.

I am struggling to find authoritative source for the mapping,
so disable them in the meantime so they do not break tests.

Change-Id: I37340179f5d2fe91f318b64ddf64a725ce96ab76

8 years agoMerge "MIPS64: Fix stub_test implementation" am: e928dc5877
Vladimir Marko [Fri, 27 Nov 2015 11:28:09 +0000 (11:28 +0000)]
Merge "MIPS64: Fix stub_test implementation" am: e928dc5877
am: 6aa05139ae

* commit '6aa05139aebf5e7f409c429ed8bea0836b09db04':
  MIPS64: Fix stub_test implementation

8 years agoMerge "MIPS64: Fix stub_test implementation"
Vladimir Marko [Fri, 27 Nov 2015 11:25:11 +0000 (11:25 +0000)]
Merge "MIPS64: Fix stub_test implementation"
am: e928dc5877

* commit 'e928dc587718d00d234768f76d1efb2ffe74e885':
  MIPS64: Fix stub_test implementation

8 years agoMerge "MIPS64: Fix stub_test implementation"
Vladimir Marko [Fri, 27 Nov 2015 11:23:00 +0000 (11:23 +0000)]
Merge "MIPS64: Fix stub_test implementation"

8 years agoMIPS64: Fix stub_test implementation
Goran Jakovljevic [Fri, 27 Nov 2015 10:20:20 +0000 (11:20 +0100)]
MIPS64: Fix stub_test implementation

Clang doesn't recognize f0-f31 registers without '$' symbol in
inline assembly. So now they are $f0-$f31.

This change allows building ART tests.

Change-Id: Ie08e1a5aceee266f7b674c9883bed53473696178

8 years agoMerge "Add stack locations to DWARF parameters." am: 23e8733fc5
David Srbecky [Fri, 27 Nov 2015 02:04:30 +0000 (02:04 +0000)]
Merge "Add stack locations to DWARF parameters." am: 23e8733fc5
am: 12a928486f

* commit '12a928486f1766686303f2dc2ce6838453409fd1':
  Add stack locations to DWARF parameters.

8 years agoMerge "Add stack locations to DWARF parameters."
David Srbecky [Fri, 27 Nov 2015 02:01:40 +0000 (02:01 +0000)]
Merge "Add stack locations to DWARF parameters."
am: 23e8733fc5

* commit '23e8733fc5ec7280a05ec5261cae9fd984dc25c6':
  Add stack locations to DWARF parameters.

8 years agoMerge "Add stack locations to DWARF parameters."
David Srbecky [Fri, 27 Nov 2015 01:59:40 +0000 (01:59 +0000)]
Merge "Add stack locations to DWARF parameters."

8 years agoMerge "ARM64: Use the shifter operands." am: 3a581b4560
Vladimir Marko [Thu, 26 Nov 2015 10:00:39 +0000 (10:00 +0000)]
Merge "ARM64: Use the shifter operands." am: 3a581b4560
am: 5a424d27ef

* commit '5a424d27ef385d55c692d5568834681fcee57677':
  ARM64: Use the shifter operands.

8 years agoMerge "ARM64: Use the shifter operands."
Vladimir Marko [Thu, 26 Nov 2015 09:57:26 +0000 (09:57 +0000)]
Merge "ARM64: Use the shifter operands."
am: 3a581b4560

* commit '3a581b45605b77fb40654d5d331d54df429cd2bd':
  ARM64: Use the shifter operands.

8 years agoMerge "ARM64: Use the shifter operands."
Vladimir Marko [Thu, 26 Nov 2015 09:55:07 +0000 (09:55 +0000)]
Merge "ARM64: Use the shifter operands."

8 years agoMerge "Fix circular dependencies for ContainsBootClassLoaderNonImageClass" am: 319362870b
Mathieu Chartier [Wed, 25 Nov 2015 20:19:48 +0000 (20:19 +0000)]
Merge "Fix circular dependencies for ContainsBootClassLoaderNonImageClass" am: 319362870b
am: bfaf8d2640

* commit 'bfaf8d2640896348f94570e74d1b1f2f60f7a36b':
  Fix circular dependencies for ContainsBootClassLoaderNonImageClass

8 years agoMerge "Fix circular dependencies for ContainsBootClassLoaderNonImageClass"
Mathieu Chartier [Wed, 25 Nov 2015 20:16:58 +0000 (20:16 +0000)]
Merge "Fix circular dependencies for ContainsBootClassLoaderNonImageClass"
am: 319362870b

* commit '319362870b67f1bf19c432ff24d5bcc328e65994':
  Fix circular dependencies for ContainsBootClassLoaderNonImageClass

8 years agoMerge "Fix circular dependencies for ContainsBootClassLoaderNonImageClass"
Mathieu Chartier [Wed, 25 Nov 2015 20:14:18 +0000 (20:14 +0000)]
Merge "Fix circular dependencies for ContainsBootClassLoaderNonImageClass"

8 years agoFix circular dependencies for ContainsBootClassLoaderNonImageClass
Mathieu Chartier [Tue, 24 Nov 2015 23:37:12 +0000 (15:37 -0800)]
Fix circular dependencies for ContainsBootClassLoaderNonImageClass

Old behavior incorrectly updated the memoization array when there was
a circular dependency. The new behavior is to not update the array
in this case.

Bug: 25839261
Change-Id: I081c97c4f7a62a783fdaf2afbe23ea380ef6946d

8 years agoMerge "Fix jit profile saving flags." am: 790d7eb698
Calin Juravle [Wed, 25 Nov 2015 19:24:43 +0000 (19:24 +0000)]
Merge "Fix jit profile saving flags." am: 790d7eb698
am: 219f97bc1e

* commit '219f97bc1e9a38beaf5e18d33da0ac8b92f72277':
  Fix jit profile saving flags.

8 years agoMerge "Fix jit profile saving flags."
Calin Juravle [Wed, 25 Nov 2015 19:20:39 +0000 (19:20 +0000)]
Merge "Fix jit profile saving flags."
am: 790d7eb698

* commit '790d7eb698c42fdd882768ae333a59c01af61d51':
  Fix jit profile saving flags.

8 years agoMerge "Fix jit profile saving flags."
Calin Juravle [Wed, 25 Nov 2015 19:15:23 +0000 (19:15 +0000)]
Merge "Fix jit profile saving flags."

8 years agoFix jit profile saving flags.
Calin Juravle [Wed, 25 Nov 2015 19:05:42 +0000 (19:05 +0000)]
Fix jit profile saving flags.

Bug: 25886401

Change-Id: Ie7b9ead708736298f1d4a53b640434c988a5a0a8

8 years agoMerge "ART: Clean up ordering of dex cache arrays in image files." am: 685af12dab
Vladimir Marko [Wed, 25 Nov 2015 18:36:33 +0000 (18:36 +0000)]
Merge "ART: Clean up ordering of dex cache arrays in image files." am: 685af12dab
am: 3cab2247e8

* commit '3cab2247e87788a4d80dca4c607c517f0501fcf2':
  ART: Clean up ordering of dex cache arrays in image files.

8 years agoMerge "ART: Clean up ordering of dex cache arrays in image files."
Vladimir Marko [Wed, 25 Nov 2015 18:33:10 +0000 (18:33 +0000)]
Merge "ART: Clean up ordering of dex cache arrays in image files."
am: 685af12dab

* commit '685af12dab9c6927d94310376ebac79f1afa2095':
  ART: Clean up ordering of dex cache arrays in image files.

8 years agoMerge "ART: Clean up ordering of dex cache arrays in image files."
Vladimir Marko [Wed, 25 Nov 2015 18:27:37 +0000 (18:27 +0000)]
Merge "ART: Clean up ordering of dex cache arrays in image files."

8 years agoMerge "ARM64 read barrier support for concurrent GC in Optimizing." am: 92e997d1e6
Roland Levillain [Wed, 25 Nov 2015 17:26:22 +0000 (17:26 +0000)]
Merge "ARM64 read barrier support for concurrent GC in Optimizing." am: 92e997d1e6
am: 5da5d045fa

* commit '5da5d045fae407c2420aa174510de15dc731ee52':
  ARM64 read barrier support for concurrent GC in Optimizing.