OSDN Git Service

android-x86/art.git
8 years agoam 694f8161: am cd83bc5e: am a841bc3f: Merge "Optimizing: Tag even more arena allocat...
Vladimir Marko [Wed, 30 Sep 2015 20:15:07 +0000 (20:15 +0000)]
am 694f8161: am cd83bc5e: am a841bc3f: Merge "Optimizing: Tag even more arena allocations."

* commit '694f81617546d10622dc964e732ba9347f6c2c3d':
  Optimizing: Tag even more arena allocations.

8 years agoam 75283c3b: am b7da49e5: am 25255512: Merge "Implemented trip-count safety information."
Aart Bik [Wed, 30 Sep 2015 20:15:05 +0000 (20:15 +0000)]
am 75283c3b: am b7da49e5: am 25255512: Merge "Implemented trip-count safety information."

* commit '75283c3be30409d754bd9190037c964d58ae7fe1':
  Implemented trip-count safety information.

8 years agoam cd83bc5e: am a841bc3f: Merge "Optimizing: Tag even more arena allocations."
Vladimir Marko [Wed, 30 Sep 2015 20:11:31 +0000 (20:11 +0000)]
am cd83bc5e: am a841bc3f: Merge "Optimizing: Tag even more arena allocations."

* commit 'cd83bc5ef975fc66fbdd5ef9e316add88de42c77':
  Optimizing: Tag even more arena allocations.

8 years agoam b7da49e5: am 25255512: Merge "Implemented trip-count safety information."
Aart Bik [Wed, 30 Sep 2015 20:11:29 +0000 (20:11 +0000)]
am b7da49e5: am 25255512: Merge "Implemented trip-count safety information."

* commit 'b7da49e5f195121c1cb0fd60af1ddd69f721388e':
  Implemented trip-count safety information.

8 years agoam a841bc3f: Merge "Optimizing: Tag even more arena allocations."
Vladimir Marko [Wed, 30 Sep 2015 20:04:45 +0000 (20:04 +0000)]
am a841bc3f: Merge "Optimizing: Tag even more arena allocations."

* commit 'a841bc3fb000a9cdbbb7b3cedf2cb7a11e2c82ce':
  Optimizing: Tag even more arena allocations.

8 years agoam 25255512: Merge "Implemented trip-count safety information."
Aart Bik [Wed, 30 Sep 2015 20:04:44 +0000 (20:04 +0000)]
am 25255512: Merge "Implemented trip-count safety information."

* commit '25255512bae64fefc5cb76b1590e8e9c1dd42e82':
  Implemented trip-count safety information.

8 years agoMerge "Optimizing: Tag even more arena allocations."
Vladimir Marko [Wed, 30 Sep 2015 17:46:01 +0000 (17:46 +0000)]
Merge "Optimizing: Tag even more arena allocations."

8 years agoMerge "Implemented trip-count safety information."
Aart Bik [Wed, 30 Sep 2015 17:23:55 +0000 (17:23 +0000)]
Merge "Implemented trip-count safety information."

8 years agoImplemented trip-count safety information.
Aart Bik [Mon, 28 Sep 2015 23:25:56 +0000 (16:25 -0700)]
Implemented trip-count safety information.

As shown in the induction analysis presentation, trip-counts need to
deal with potential taken/not-taken situations (so that trip-count
is either valid in the full loop or just in the loop-body proper)
and potential finite/infinite situations (the latter can still be
analyzed but may need to run-time test later to guard against the
infinite conditions). This CL provides that information.

Change-Id: I0445d8e836b80a3614af217ce3e39d766e77b986

8 years agoam d814b08e: am 7374c096: am 63878212: Merge "Make libcore timeout the same for all...
Nicolas Geoffray [Wed, 30 Sep 2015 12:57:24 +0000 (12:57 +0000)]
am d814b08e: am 7374c096: am 63878212: Merge "Make libcore timeout the same for all runs."

* commit 'd814b08e4b226a8ee0a724d657d108830049d481':
  Make libcore timeout the same for all runs.

8 years agoam 7374c096: am 63878212: Merge "Make libcore timeout the same for all runs."
Nicolas Geoffray [Wed, 30 Sep 2015 12:51:48 +0000 (12:51 +0000)]
am 7374c096: am 63878212: Merge "Make libcore timeout the same for all runs."

* commit '7374c096878801f9c2c3a0d43443d33bf04225f3':
  Make libcore timeout the same for all runs.

8 years agoam 63878212: Merge "Make libcore timeout the same for all runs."
Nicolas Geoffray [Wed, 30 Sep 2015 12:46:17 +0000 (12:46 +0000)]
am 63878212: Merge "Make libcore timeout the same for all runs."

* commit '6387821209a03c5d873cf9dc6fd11434918bbdf4':
  Make libcore timeout the same for all runs.

8 years agoMerge "Make libcore timeout the same for all runs."
Nicolas Geoffray [Wed, 30 Sep 2015 12:41:47 +0000 (12:41 +0000)]
Merge "Make libcore timeout the same for all runs."

8 years agoam e9801a63: am 45396792: am 97c25031: Merge "ART: Mark Checker tests broken for...
David Brazdil [Wed, 30 Sep 2015 11:14:40 +0000 (11:14 +0000)]
am e9801a63: am 45396792: am 97c25031: Merge "ART: Mark Checker tests broken for mips32"

* commit 'e9801a63eb6e48200748abb99727f2b1dbfdd477':
  ART: Mark Checker tests broken for mips32

8 years agoam 45396792: am 97c25031: Merge "ART: Mark Checker tests broken for mips32"
David Brazdil [Wed, 30 Sep 2015 11:11:17 +0000 (11:11 +0000)]
am 45396792: am 97c25031: Merge "ART: Mark Checker tests broken for mips32"

* commit '453967929a8e3542570e139dabcff4b86fca2569':
  ART: Mark Checker tests broken for mips32

8 years agoam 97c25031: Merge "ART: Mark Checker tests broken for mips32"
David Brazdil [Wed, 30 Sep 2015 11:04:38 +0000 (11:04 +0000)]
am 97c25031: Merge "ART: Mark Checker tests broken for mips32"

* commit '97c25031426ce995058b359b1c544799d322b551':
  ART: Mark Checker tests broken for mips32

8 years agoMake libcore timeout the same for all runs.
Nicolas Geoffray [Wed, 30 Sep 2015 11:02:21 +0000 (12:02 +0100)]
Make libcore timeout the same for all runs.

Looks like our mips32 devices need it too. Simply make
the timeout big enough for all run kinds.

Change-Id: I48a87eaef36c05e09c7ad82aaa003c7eb0d1ad6d

8 years agoMerge "ART: Mark Checker tests broken for mips32"
David Brazdil [Wed, 30 Sep 2015 10:59:28 +0000 (10:59 +0000)]
Merge "ART: Mark Checker tests broken for mips32"

8 years agoART: Mark Checker tests broken for mips32
David Brazdil [Wed, 30 Sep 2015 10:47:35 +0000 (11:47 +0100)]
ART: Mark Checker tests broken for mips32

We don't have a mips32 backend at the moment, so there is no graph
dump to run Checker on.

Change-Id: I9c90b93811aa7bbc849575ac1836c2d85da7e9ac

8 years agoam f12b758f: am 629e255d: am a39ce124: Merge "Revert "Revert "Enable optimizations...
Nicolas Geoffray [Wed, 30 Sep 2015 09:37:47 +0000 (09:37 +0000)]
am f12b758f: am 629e255d: am a39ce124: Merge "Revert "Revert "Enable optimizations with --debuggable."""

* commit 'f12b758f525914787ceb77687bc7b510bdfa2fed':
  Revert "Revert "Enable optimizations with --debuggable.""

8 years agoam 629e255d: am a39ce124: Merge "Revert "Revert "Enable optimizations with --debuggab...
Nicolas Geoffray [Wed, 30 Sep 2015 09:31:26 +0000 (09:31 +0000)]
am 629e255d: am a39ce124: Merge "Revert "Revert "Enable optimizations with --debuggable."""

* commit '629e255df261818e9369fcd69bbde713dcb7560f':
  Revert "Revert "Enable optimizations with --debuggable.""

8 years agoam a39ce124: Merge "Revert "Revert "Enable optimizations with --debuggable."""
Nicolas Geoffray [Wed, 30 Sep 2015 09:23:49 +0000 (09:23 +0000)]
am a39ce124: Merge "Revert "Revert "Enable optimizations with --debuggable."""

* commit 'a39ce12465acae0e594b1fef10225057737aeba4':
  Revert "Revert "Enable optimizations with --debuggable.""

8 years agoMerge "Revert "Revert "Enable optimizations with --debuggable."""
Nicolas Geoffray [Wed, 30 Sep 2015 09:20:32 +0000 (09:20 +0000)]
Merge "Revert "Revert "Enable optimizations with --debuggable."""

8 years agoam ff2a1c8a: am 647268e2: am 84128f7e: Merge "Add deoptimization test."
Nicolas Geoffray [Wed, 30 Sep 2015 09:14:44 +0000 (09:14 +0000)]
am ff2a1c8a: am 647268e2: am 84128f7e: Merge "Add deoptimization test."

* commit 'ff2a1c8abe50057fec3bdabc3e88421421ea3df2':
  Add deoptimization test.

8 years agoam 647268e2: am 84128f7e: Merge "Add deoptimization test."
Nicolas Geoffray [Wed, 30 Sep 2015 09:10:11 +0000 (09:10 +0000)]
am 647268e2: am 84128f7e: Merge "Add deoptimization test."

* commit '647268e2d81c6773c4e8c28ee7bb96dba55b5b1a':
  Add deoptimization test.

8 years agoam 84128f7e: Merge "Add deoptimization test."
Nicolas Geoffray [Wed, 30 Sep 2015 09:04:28 +0000 (09:04 +0000)]
am 84128f7e: Merge "Add deoptimization test."

* commit '84128f7ed681b3c08a7cfba1031c13c17db462d0':
  Add deoptimization test.

8 years agoMerge "Add deoptimization test."
Nicolas Geoffray [Wed, 30 Sep 2015 08:15:15 +0000 (08:15 +0000)]
Merge "Add deoptimization test."

8 years agoRevert "Revert "Enable optimizations with --debuggable.""
Nicolas Geoffray [Tue, 29 Sep 2015 18:00:03 +0000 (18:00 +0000)]
Revert "Revert "Enable optimizations with --debuggable.""

This reverts commit b7d27a53cb280a943c0a63a9e0806cf8e3ae4cde.

Change-Id: I398c23863e4fd86a3112076417378d22efd08306

8 years agoam 2f3aa9ff: am 8faf921a: am d2aaf5c1: Merge "Revert "Keep internal stack trace metho...
Nicolas Geoffray [Wed, 30 Sep 2015 07:37:08 +0000 (07:37 +0000)]
am 2f3aa9ff: am 8faf921a: am d2aaf5c1: Merge "Revert "Keep internal stack trace methods declaring classes live""

* commit '2f3aa9ffae1ef5536d3c42dee0b42b5ab2491495':
  Revert "Keep internal stack trace methods declaring classes live"

8 years agoam 8faf921a: am d2aaf5c1: Merge "Revert "Keep internal stack trace methods declaring...
Nicolas Geoffray [Wed, 30 Sep 2015 07:31:08 +0000 (07:31 +0000)]
am 8faf921a: am d2aaf5c1: Merge "Revert "Keep internal stack trace methods declaring classes live""

* commit '8faf921aa6dcb4f0d7c73fefacb3e4f591da9b9f':
  Revert "Keep internal stack trace methods declaring classes live"

8 years agoam d2aaf5c1: Merge "Revert "Keep internal stack trace methods declaring classes live""
Nicolas Geoffray [Wed, 30 Sep 2015 07:27:15 +0000 (07:27 +0000)]
am d2aaf5c1: Merge "Revert "Keep internal stack trace methods declaring classes live""

* commit 'd2aaf5c103ea7792854b18150284762f98132287':
  Revert "Keep internal stack trace methods declaring classes live"

8 years agoMerge "Revert "Keep internal stack trace methods declaring classes live""
Nicolas Geoffray [Wed, 30 Sep 2015 07:20:50 +0000 (07:20 +0000)]
Merge "Revert "Keep internal stack trace methods declaring classes live""

8 years agoRevert "Keep internal stack trace methods declaring classes live"
Nicolas Geoffray [Wed, 30 Sep 2015 07:20:13 +0000 (07:20 +0000)]
Revert "Keep internal stack trace methods declaring classes live"

Breaks jdwp tests.

Bug: 22720414

This reverts commit 566fc926942ed57925627d1bd43e099938084f1e.

Change-Id: Ic3544e86af35bf748f9d47e0a4077dcdc206a821

8 years agoam 190397b6: (-s ours) am a21d821a: (-s ours) am 39becb96: Revert "Fix another source...
Brian Carlstrom [Wed, 30 Sep 2015 02:32:59 +0000 (02:32 +0000)]
am 190397b6: (-s ours) am a21d821a: (-s ours) am 39becb96: Revert "Fix another source of undeterministic inlining." DO NOT MERGE

* commit '190397b61ec058f69f0b63dfdcced83c380a99ba':
  Revert "Fix another source of undeterministic inlining." DO NOT MERGE

8 years agoam a21d821a: (-s ours) am 39becb96: Revert "Fix another source of undeterministic...
Brian Carlstrom [Wed, 30 Sep 2015 02:27:55 +0000 (02:27 +0000)]
am a21d821a: (-s ours) am 39becb96: Revert "Fix another source of undeterministic inlining." DO NOT MERGE

* commit 'a21d821a002dca4d28ef2d86760b9147b9f35de6':
  Revert "Fix another source of undeterministic inlining." DO NOT MERGE

8 years agoam 39becb96: Revert "Fix another source of undeterministic inlining." DO NOT MERGE
Brian Carlstrom [Wed, 30 Sep 2015 02:15:06 +0000 (02:15 +0000)]
am 39becb96: Revert "Fix another source of undeterministic inlining." DO NOT MERGE

* commit '39becb96f0c2ba1823ca0cf046e9f12344f9f3bd':
  Revert "Fix another source of undeterministic inlining." DO NOT MERGE

8 years agoam 0eeeac5d: am 3b58ce78: am 9c53671b: Merge "Keep internal stack trace methods decla...
Mathieu Chartier [Wed, 30 Sep 2015 01:34:35 +0000 (01:34 +0000)]
am 0eeeac5d: am 3b58ce78: am 9c53671b: Merge "Keep internal stack trace methods declaring classes live"

* commit '0eeeac5d05808124dcdcb76b9edc914dd8cbb6c3':
  Keep internal stack trace methods declaring classes live

8 years agoam 3b58ce78: am 9c53671b: Merge "Keep internal stack trace methods declaring classes...
Mathieu Chartier [Wed, 30 Sep 2015 01:29:45 +0000 (01:29 +0000)]
am 3b58ce78: am 9c53671b: Merge "Keep internal stack trace methods declaring classes live"

* commit '3b58ce7868b7476bcbd81fca5f362c244284adf4':
  Keep internal stack trace methods declaring classes live

8 years agoam 9c53671b: Merge "Keep internal stack trace methods declaring classes live"
Mathieu Chartier [Wed, 30 Sep 2015 01:23:32 +0000 (01:23 +0000)]
am 9c53671b: Merge "Keep internal stack trace methods declaring classes live"

* commit '9c53671bb659cb47bea82f6cbdd46c0843753e82':
  Keep internal stack trace methods declaring classes live

8 years agoMerge "Keep internal stack trace methods declaring classes live"
Mathieu Chartier [Wed, 30 Sep 2015 01:17:00 +0000 (01:17 +0000)]
Merge "Keep internal stack trace methods declaring classes live"

8 years agoKeep internal stack trace methods declaring classes live
Mathieu Chartier [Tue, 29 Sep 2015 17:21:55 +0000 (10:21 -0700)]
Keep internal stack trace methods declaring classes live

We now store the declaring classes in the internal stack trace to
make sure class unloading doesn't unload any classes owning methods
in the stack trace.

This fixes DexClassLoaderTest in libcore. Added regression test.

Bug: 22720414

Change-Id: I185f87c8ec0807e83f4661bd5bb5652dba6fc281

8 years agoam 731f2bec: am 7939c00b: am 3a447ded: Merge "Revert "ART: Remove unnecessary SHARED_...
Andreas Gampe [Tue, 29 Sep 2015 22:39:55 +0000 (22:39 +0000)]
am 731f2bec: am 7939c00b: am 3a447ded: Merge "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod""

* commit '731f2becc240cbed7ab606c2f6eb257012967196':
  Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"

8 years agoam 7939c00b: am 3a447ded: Merge "Revert "ART: Remove unnecessary SHARED_REQUIRES...
Andreas Gampe [Tue, 29 Sep 2015 22:33:01 +0000 (22:33 +0000)]
am 7939c00b: am 3a447ded: Merge "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod""

* commit '7939c00be5c7d0daf45fa9f7c09d550efd609bdc':
  Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"

8 years agoam 3a447ded: Merge "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod""
Andreas Gampe [Tue, 29 Sep 2015 22:25:57 +0000 (22:25 +0000)]
am 3a447ded: Merge "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod""

* commit '3a447ded48925f3ec65553fcf56c55da23777003':
  Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"

8 years agoMerge "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod""
Andreas Gampe [Tue, 29 Sep 2015 22:22:40 +0000 (22:22 +0000)]
Merge "Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod""

8 years agoRevert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"
Andreas Gampe [Tue, 29 Sep 2015 22:22:28 +0000 (22:22 +0000)]
Revert "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"

This reverts commit 6dd332933a570f5e413dd0d784481607798fbcf5.

Interestingly fails for sdk build.

Change-Id: I28d8fc05575ff1d744b4a831c32ef4414775561a

8 years agoam 69a90be9: am 678bd1d8: am c0761cb9: Merge "ART: Remove unnecessary SHARED_REQUIRES...
Andreas Gampe [Tue, 29 Sep 2015 21:33:38 +0000 (21:33 +0000)]
am 69a90be9: am 678bd1d8: am c0761cb9: Merge "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"

* commit '69a90be9ca47818d339e97b5a8b5a51ff892bd2c':
  ART: Remove unnecessary SHARED_REQUIRES in ArtMethod

8 years agoam 678bd1d8: am c0761cb9: Merge "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"
Andreas Gampe [Tue, 29 Sep 2015 21:29:50 +0000 (21:29 +0000)]
am 678bd1d8: am c0761cb9: Merge "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"

* commit '678bd1d84a9f5171e1410bb41e2ce08d868e314b':
  ART: Remove unnecessary SHARED_REQUIRES in ArtMethod

8 years agoam c0761cb9: Merge "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"
Andreas Gampe [Tue, 29 Sep 2015 21:24:37 +0000 (21:24 +0000)]
am c0761cb9: Merge "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"

* commit 'c0761cb9b11e38a8ae615c0c419519840abbfece':
  ART: Remove unnecessary SHARED_REQUIRES in ArtMethod

8 years agoMerge "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"
Andreas Gampe [Tue, 29 Sep 2015 21:18:07 +0000 (21:18 +0000)]
Merge "ART: Remove unnecessary SHARED_REQUIRES in ArtMethod"

8 years agoam d4192607: am 50129e43: am e0241620: Merge "Fix a mutator lock violation in the...
Hiroshi Yamauchi [Tue, 29 Sep 2015 19:23:21 +0000 (19:23 +0000)]
am d4192607: am 50129e43: am e0241620: Merge "Fix a mutator lock violation in the generic JNI end sequence."

* commit 'd41926078b6989aaff165bc615c628c675684d74':
  Fix a mutator lock violation in the generic JNI end sequence.

8 years agoam 50129e43: am e0241620: Merge "Fix a mutator lock violation in the generic JNI...
Hiroshi Yamauchi [Tue, 29 Sep 2015 19:19:33 +0000 (19:19 +0000)]
am 50129e43: am e0241620: Merge "Fix a mutator lock violation in the generic JNI end sequence."

* commit '50129e43f4577bf23ea5665c0814d671645314ab':
  Fix a mutator lock violation in the generic JNI end sequence.

8 years agoam e0241620: Merge "Fix a mutator lock violation in the generic JNI end sequence."
Hiroshi Yamauchi [Tue, 29 Sep 2015 19:12:19 +0000 (19:12 +0000)]
am e0241620: Merge "Fix a mutator lock violation in the generic JNI end sequence."

* commit 'e024162070e3ce7e92a65e3b0f62dce7b8a8505a':
  Fix a mutator lock violation in the generic JNI end sequence.

8 years agoMerge "Fix a mutator lock violation in the generic JNI end sequence."
Hiroshi Yamauchi [Tue, 29 Sep 2015 19:07:50 +0000 (19:07 +0000)]
Merge "Fix a mutator lock violation in the generic JNI end sequence."

8 years agoOptimizing: Tag even more arena allocations.
Vladimir Marko [Tue, 29 Sep 2015 18:01:15 +0000 (19:01 +0100)]
Optimizing: Tag even more arena allocations.

Tag previously "Misc" arena allocations with more specific
allocation types. Move some native heap allocations to the
arena in BCE.

Bug: 23736311
Change-Id: If8ef15a8b614dc3314bdfb35caa23862c9d4d25c

8 years agoFix a mutator lock violation in the generic JNI end sequence.
Hiroshi Yamauchi [Tue, 29 Sep 2015 00:47:32 +0000 (17:47 -0700)]
Fix a mutator lock violation in the generic JNI end sequence.

artQuickGenericJniEndTrampoline() was accessing objects without a shared
mutator lock right after returning from a JNI call but before switching
to the runnable state.

This fixes crashes with table lookup read barriers enabled.

Bug: 12687968
Change-Id: I94ad9ca276750f58cb68b2fa9eb8cdeb371f021b

8 years agoART: Remove unnecessary SHARED_REQUIRES in ArtMethod
Andreas Gampe [Tue, 29 Sep 2015 18:21:43 +0000 (11:21 -0700)]
ART: Remove unnecessary SHARED_REQUIRES in ArtMethod

Move DCHECKs in GetAccessFlags into their own block and let them
acquire the mutator lock, if necessary. Then remove the old
annotations.

Change-Id: I29e24f17b001d0e16dc66c01a0f6450efb64ebc6

8 years agoam 0ac213e7: am 8996a766: am 0766e3ff: Merge "Revert "Enable optimizations with ...
Nicolas Geoffray [Tue, 29 Sep 2015 17:44:49 +0000 (17:44 +0000)]
am 0ac213e7: am 8996a766: am 0766e3ff: Merge "Revert "Enable optimizations with --debuggable.""

* commit '0ac213e7b295cac027b3824f978a2b624a7ffa98':
  Revert "Enable optimizations with --debuggable."

8 years agoam 8996a766: am 0766e3ff: Merge "Revert "Enable optimizations with --debuggable.""
Nicolas Geoffray [Tue, 29 Sep 2015 17:41:12 +0000 (17:41 +0000)]
am 8996a766: am 0766e3ff: Merge "Revert "Enable optimizations with --debuggable.""

* commit '8996a7669a0f879a02b078aa9a5e37755302d4db':
  Revert "Enable optimizations with --debuggable."

8 years agoam 0766e3ff: Merge "Revert "Enable optimizations with --debuggable.""
Nicolas Geoffray [Tue, 29 Sep 2015 17:34:39 +0000 (17:34 +0000)]
am 0766e3ff: Merge "Revert "Enable optimizations with --debuggable.""

* commit '0766e3ff5638b14d6b3ea6157c800eed11be5b98':
  Revert "Enable optimizations with --debuggable."

8 years agoMerge "Revert "Enable optimizations with --debuggable.""
Nicolas Geoffray [Tue, 29 Sep 2015 17:30:24 +0000 (17:30 +0000)]
Merge "Revert "Enable optimizations with --debuggable.""

8 years agoRevert "Enable optimizations with --debuggable."
Nicolas Geoffray [Tue, 29 Sep 2015 17:30:10 +0000 (17:30 +0000)]
Revert "Enable optimizations with --debuggable."

Build error with gcc.

This reverts commit 43855ccb01703b188777fe59e1110e6a23803171.

Change-Id: I45abc7ee0943b2ad7bd644c88858891fc7a38ead

8 years agoam 750a4a54: am 3c24d6e1: am de8a3f4d: Merge "Enable optimizations with --debuggable."
Nicolas Geoffray [Tue, 29 Sep 2015 17:18:51 +0000 (17:18 +0000)]
am 750a4a54: am 3c24d6e1: am de8a3f4d: Merge "Enable optimizations with --debuggable."

* commit '750a4a543eaac6bd4a9ec338412dc2c28dd02e36':
  Enable optimizations with --debuggable.

8 years agoam 1ffd9cbe: am 07b75192: am 9baa4df6: Merge "Address some code comments"
Mathieu Chartier [Tue, 29 Sep 2015 17:18:50 +0000 (17:18 +0000)]
am 1ffd9cbe: am 07b75192: am 9baa4df6: Merge "Address some code comments"

* commit '1ffd9cbe64623e2ef4d8326744236f3a9a37a7f2':
  Address some code comments

8 years agoam 3c24d6e1: am de8a3f4d: Merge "Enable optimizations with --debuggable."
Nicolas Geoffray [Tue, 29 Sep 2015 17:14:59 +0000 (17:14 +0000)]
am 3c24d6e1: am de8a3f4d: Merge "Enable optimizations with --debuggable."

* commit '3c24d6e1a3b3090c75abbfc115255f31d992be51':
  Enable optimizations with --debuggable.

8 years agoam 07b75192: am 9baa4df6: Merge "Address some code comments"
Mathieu Chartier [Tue, 29 Sep 2015 17:14:58 +0000 (17:14 +0000)]
am 07b75192: am 9baa4df6: Merge "Address some code comments"

* commit '07b751921db10408931360af0b6e5c28c44a639e':
  Address some code comments

8 years agoam de8a3f4d: Merge "Enable optimizations with --debuggable."
Nicolas Geoffray [Tue, 29 Sep 2015 17:08:35 +0000 (17:08 +0000)]
am de8a3f4d: Merge "Enable optimizations with --debuggable."

* commit 'de8a3f4dce1e9ff0e3be16956b06bafc8cd4f397':
  Enable optimizations with --debuggable.

8 years agoam 9baa4df6: Merge "Address some code comments"
Mathieu Chartier [Tue, 29 Sep 2015 17:08:32 +0000 (17:08 +0000)]
am 9baa4df6: Merge "Address some code comments"

* commit '9baa4df684bdf0150bd8632f991708627772ea85':
  Address some code comments

8 years agoMerge "Enable optimizations with --debuggable."
Nicolas Geoffray [Tue, 29 Sep 2015 17:05:26 +0000 (17:05 +0000)]
Merge "Enable optimizations with --debuggable."

8 years agoMerge "Address some code comments"
Mathieu Chartier [Tue, 29 Sep 2015 17:04:17 +0000 (17:04 +0000)]
Merge "Address some code comments"

8 years agoam 3669eab6: am 4bc49a7d: am f6860a5f: Merge "Optimizing: Simplify UShr+And, Shr...
Vladimir Marko [Tue, 29 Sep 2015 16:51:21 +0000 (16:51 +0000)]
am 3669eab6: am 4bc49a7d: am f6860a5f: Merge "Optimizing: Simplify UShr+And, Shr+And."

* commit '3669eab6533ceb356bd1c2b848873bc3ba733b99':
  Optimizing: Simplify UShr+And, Shr+And.

8 years agoam 4bc49a7d: am f6860a5f: Merge "Optimizing: Simplify UShr+And, Shr+And."
Vladimir Marko [Tue, 29 Sep 2015 16:45:56 +0000 (16:45 +0000)]
am 4bc49a7d: am f6860a5f: Merge "Optimizing: Simplify UShr+And, Shr+And."

* commit '4bc49a7ddb8f30167fff35e4afcb5617c5b9fd84':
  Optimizing: Simplify UShr+And, Shr+And.

8 years agoam f6860a5f: Merge "Optimizing: Simplify UShr+And, Shr+And."
Vladimir Marko [Tue, 29 Sep 2015 16:39:14 +0000 (16:39 +0000)]
am f6860a5f: Merge "Optimizing: Simplify UShr+And, Shr+And."

* commit 'f6860a5f12a8fe974b8f25e67a19a71bf0378d62':
  Optimizing: Simplify UShr+And, Shr+And.

8 years agoMerge "Optimizing: Simplify UShr+And, Shr+And."
Vladimir Marko [Tue, 29 Sep 2015 16:33:44 +0000 (16:33 +0000)]
Merge "Optimizing: Simplify UShr+And, Shr+And."

8 years agoAdd deoptimization test.
Jongwon Lee [Thu, 3 Sep 2015 17:33:07 +0000 (02:33 +0900)]
Add deoptimization test.

Test passes with single frame deopt. If we were to deopt the whole
stack, we would need to record (interpreter-)live dex registers at
call sites.

Change-Id: Iebdce60be3fa1b0255fe2fa5ef0cf0b442e061f9
Signed-off-by: Jongwon Lee <jong.won.lee@samsung.com>
8 years agoEnable optimizations with --debuggable.
Nicolas Geoffray [Tue, 29 Sep 2015 14:43:06 +0000 (15:43 +0100)]
Enable optimizations with --debuggable.

Change-Id: I8979e59ee081222687fda1c93ac0bf3acbbad936

8 years agoam 988a39bd: am 79533498: am a2d8b187: Merge "Fix a bug in DeadPhiHandling around...
Nicolas Geoffray [Tue, 29 Sep 2015 15:36:50 +0000 (15:36 +0000)]
am 988a39bd: am 79533498: am a2d8b187: Merge "Fix a bug in DeadPhiHandling around conflicting phis."

* commit '988a39bd5103a3df83dd55d820a4c44dfe73f1d9':
  Fix a bug in DeadPhiHandling around conflicting phis.

8 years agoam 79533498: am a2d8b187: Merge "Fix a bug in DeadPhiHandling around conflicting...
Nicolas Geoffray [Tue, 29 Sep 2015 15:30:29 +0000 (15:30 +0000)]
am 79533498: am a2d8b187: Merge "Fix a bug in DeadPhiHandling around conflicting phis."

* commit '795334988712efb8b39c10a459159c9e10f65575':
  Fix a bug in DeadPhiHandling around conflicting phis.

8 years agoam a2d8b187: Merge "Fix a bug in DeadPhiHandling around conflicting phis."
Nicolas Geoffray [Tue, 29 Sep 2015 15:24:34 +0000 (15:24 +0000)]
am a2d8b187: Merge "Fix a bug in DeadPhiHandling around conflicting phis."

* commit 'a2d8b187e7b6631692fa1243e86ef16c428fa9da':
  Fix a bug in DeadPhiHandling around conflicting phis.

8 years agoRevert "Fix another source of undeterministic inlining." DO NOT MERGE
Brian Carlstrom [Tue, 29 Sep 2015 00:47:53 +0000 (17:47 -0700)]
Revert "Fix another source of undeterministic inlining." DO NOT MERGE

This reverts commit bd7eef17de5f3d25f411702f9f260a96455b4cf7.

Bug: 24467386
Bug: 20037935
Change-Id: I04d1d0ffc67661370e4c17911d3b2b105d053bc1

8 years agoMerge "Fix a bug in DeadPhiHandling around conflicting phis."
Nicolas Geoffray [Tue, 29 Sep 2015 15:18:29 +0000 (15:18 +0000)]
Merge "Fix a bug in DeadPhiHandling around conflicting phis."

8 years agoFix a bug in DeadPhiHandling around conflicting phis.
Nicolas Geoffray [Tue, 29 Sep 2015 12:42:22 +0000 (13:42 +0100)]
Fix a bug in DeadPhiHandling around conflicting phis.

Change-Id: I44ec40f71a7e05eb4295bea55f6045cb86017329

8 years agoam f5544d5a: am dc04ce63: am a68ceb1f: Merge "Optimizing: Tag arena allocations in...
Vladimir Marko [Tue, 29 Sep 2015 15:15:21 +0000 (15:15 +0000)]
am f5544d5a: am dc04ce63: am a68ceb1f: Merge "Optimizing: Tag arena allocations in code generators."

* commit 'f5544d5a6c58a748b2b44e73ba2cfb041f252c66':
  Optimizing: Tag arena allocations in code generators.

8 years agoam dc04ce63: am a68ceb1f: Merge "Optimizing: Tag arena allocations in code generators."
Vladimir Marko [Tue, 29 Sep 2015 15:08:10 +0000 (15:08 +0000)]
am dc04ce63: am a68ceb1f: Merge "Optimizing: Tag arena allocations in code generators."

* commit 'dc04ce6318ddaeb1f71851adc3a01878933412dc':
  Optimizing: Tag arena allocations in code generators.

8 years agoam a68ceb1f: Merge "Optimizing: Tag arena allocations in code generators."
Vladimir Marko [Tue, 29 Sep 2015 15:02:40 +0000 (15:02 +0000)]
am a68ceb1f: Merge "Optimizing: Tag arena allocations in code generators."

* commit 'a68ceb1fd5c4f8fe18aacdb33d605919f7d61ddf':
  Optimizing: Tag arena allocations in code generators.

8 years agoMerge "Optimizing: Tag arena allocations in code generators."
Vladimir Marko [Tue, 29 Sep 2015 14:56:04 +0000 (14:56 +0000)]
Merge "Optimizing: Tag arena allocations in code generators."

8 years agoOptimizing: Simplify UShr+And, Shr+And.
Vladimir Marko [Fri, 25 Sep 2015 13:44:17 +0000 (14:44 +0100)]
Optimizing: Simplify UShr+And, Shr+And.

Eliminate And from UShr+And if the And-mask contains all the
bits that can be non-zero after UShr. Transform Shr+And to
UShr if the And-mask precisely clears the shifted-in sign
bits.

This prepares for detecting the Rotate pattern, i.e.
  (x << N) | (x >>> (SIZE - N))
in code that unnecessarily masks the UShr, for example
  (x << 1) | ((x >>> 31) & 1) ,
or uses Shr, for example
  (x << 8) | ((x >> 24) & 0xff) .

Change-Id: I684c4b752547d9b1057d0d4c4d44550bb1a3ffb4

8 years agoam e9d03930: am deb0ed6f: am 9139578a: Merge "Quick: Avoid shifting -1 left (undefine...
Vladimir Marko [Tue, 29 Sep 2015 10:55:25 +0000 (10:55 +0000)]
am e9d03930: am deb0ed6f: am 9139578a: Merge "Quick: Avoid shifting -1 left (undefined behavior)."

* commit 'e9d03930c0e7e08eb272e769697e3bac6854f9be':
  Quick: Avoid shifting -1 left (undefined behavior).

8 years agoam deb0ed6f: am 9139578a: Merge "Quick: Avoid shifting -1 left (undefined behavior)."
Vladimir Marko [Tue, 29 Sep 2015 10:50:09 +0000 (10:50 +0000)]
am deb0ed6f: am 9139578a: Merge "Quick: Avoid shifting -1 left (undefined behavior)."

* commit 'deb0ed6f78b546e6da111a4caf26abbcfed50a46':
  Quick: Avoid shifting -1 left (undefined behavior).

8 years agoam 9139578a: Merge "Quick: Avoid shifting -1 left (undefined behavior)."
Vladimir Marko [Tue, 29 Sep 2015 10:42:40 +0000 (10:42 +0000)]
am 9139578a: Merge "Quick: Avoid shifting -1 left (undefined behavior)."

* commit '9139578addd6d0e51088fc45bfc0972fc97939b7':
  Quick: Avoid shifting -1 left (undefined behavior).

8 years agoMerge "Quick: Avoid shifting -1 left (undefined behavior)."
Vladimir Marko [Tue, 29 Sep 2015 10:37:49 +0000 (10:37 +0000)]
Merge "Quick: Avoid shifting -1 left (undefined behavior)."

8 years agoQuick: Avoid shifting -1 left (undefined behavior).
Vladimir Marko [Tue, 29 Sep 2015 10:25:48 +0000 (11:25 +0100)]
Quick: Avoid shifting -1 left (undefined behavior).

C++11 clarifies that shifting left a negative value is
undefined behavior. Fix legacy code that shifted -1 left.

Bug: 24489455
Change-Id: Iaf4f26c7cde175f039b6a2cad12af6f0b1624fba

8 years agoOptimizing: Tag arena allocations in code generators.
Vladimir Marko [Mon, 28 Sep 2015 11:17:40 +0000 (12:17 +0100)]
Optimizing: Tag arena allocations in code generators.

And completely remove the deprecated GrowableArray.

Replace GrowableArray with ArenaVector in code generators
and related classes and tag arena allocations.

Label arrays use direct allocations from ArenaAllocator
because Label is non-copyable and non-movable and as such
cannot be really held in a container. The GrowableArray
never actually constructed them, instead relying on the
zero-initialized storage from the arena allocator to be
correct. We now actually construct the labels.

Also avoid StackMapStream::ComputeDexRegisterMapSize() being
passed null references, even though unused.

Change-Id: I26a46fdd406b23a3969300a67739d55528df8bf4

8 years agoam c8e77eab: am cda4f377: am d8750f3c: Merge "Use dominance information for null...
Nicolas Geoffray [Tue, 29 Sep 2015 09:36:39 +0000 (09:36 +0000)]
am c8e77eab: am cda4f377: am d8750f3c: Merge "Use dominance information for null optimization in write barrier."

* commit 'c8e77eab14a461a28c26d8408940ffd23ce99f2d':
  Use dominance information for null optimization in write barrier.

8 years agoam cda4f377: am d8750f3c: Merge "Use dominance information for null optimization...
Nicolas Geoffray [Tue, 29 Sep 2015 09:30:04 +0000 (09:30 +0000)]
am cda4f377: am d8750f3c: Merge "Use dominance information for null optimization in write barrier."

* commit 'cda4f37722a26e118a7ed2728fec84deea56f7f1':
  Use dominance information for null optimization in write barrier.

8 years agoam d8750f3c: Merge "Use dominance information for null optimization in write barrier."
Nicolas Geoffray [Tue, 29 Sep 2015 09:22:34 +0000 (09:22 +0000)]
am d8750f3c: Merge "Use dominance information for null optimization in write barrier."

* commit 'd8750f3ce82225013f078c98caec0c8922a3689a':
  Use dominance information for null optimization in write barrier.

8 years agoMerge "Use dominance information for null optimization in write barrier."
Nicolas Geoffray [Tue, 29 Sep 2015 09:18:46 +0000 (09:18 +0000)]
Merge "Use dominance information for null optimization in write barrier."

8 years agoUse dominance information for null optimization in write barrier.
Nicolas Geoffray [Mon, 28 Sep 2015 15:25:37 +0000 (16:25 +0100)]
Use dominance information for null optimization in write barrier.

Change-Id: I8b57dafcd321c9afa1bbfc6a0674cbea15cbf10c

8 years agoAddress some code comments
Mathieu Chartier [Fri, 25 Sep 2015 23:54:59 +0000 (16:54 -0700)]
Address some code comments

Change-Id: I0a38a387c4328d45bbc04d095bf3388c27495c12

8 years agoam 7459d1b8: am cb9d211d: am 931e2684: Merge "ART: Single-frame deopt"
Andreas Gampe [Mon, 28 Sep 2015 22:57:56 +0000 (22:57 +0000)]
am 7459d1b8: am cb9d211d: am 931e2684: Merge "ART: Single-frame deopt"

* commit '7459d1b8b1c23638ae39ea18e6d5b8144ca50463':
  ART: Single-frame deopt