OSDN Git Service

android-x86/art.git
8 years agoam 526ec078: Merge "ART: Do not include endian.h on Mac."
Vladimir Marko [Thu, 8 Oct 2015 22:08:15 +0000 (22:08 +0000)]
am 526ec078: Merge "ART: Do not include endian.h on Mac."

* commit '526ec078c7e4ace31193d7f49ded661ea0929292':
  ART: Do not include endian.h on Mac.

8 years agoMerge "ART: Do not include endian.h on Mac."
Vladimir Marko [Thu, 8 Oct 2015 18:09:39 +0000 (18:09 +0000)]
Merge "ART: Do not include endian.h on Mac."

8 years agoART: Do not include endian.h on Mac.
Vladimir Marko [Thu, 8 Oct 2015 18:07:04 +0000 (19:07 +0100)]
ART: Do not include endian.h on Mac.

Change-Id: I1bb28bd49bd1847c45e93bf2b06c643be6e09926

8 years agoMerge commit '12de240152b8b0147b83d800bf69f4fb635dc2d3' into HEAD
Bill Yi [Thu, 8 Oct 2015 17:34:17 +0000 (10:34 -0700)]
Merge commit '12de240152b8b0147b83d800bf69f4fb635dc2d3' into HEAD

8 years agoam 359f77c4: Merge "Add DCHECKs to ArenaVector and ScopedArenaVector."
Vladimir Marko [Thu, 8 Oct 2015 15:52:30 +0000 (15:52 +0000)]
am 359f77c4: Merge "Add DCHECKs to ArenaVector and ScopedArenaVector."

* commit '359f77c44dafef7ebed027180422ee75eef1467c':
  Add DCHECKs to ArenaVector and ScopedArenaVector.

8 years agoMerge "Add DCHECKs to ArenaVector and ScopedArenaVector."
Vladimir Marko [Thu, 8 Oct 2015 15:47:08 +0000 (15:47 +0000)]
Merge "Add DCHECKs to ArenaVector and ScopedArenaVector."

8 years agoam 64d8d93a: Merge "Make sure classes with different access checks are not GVN-ed"
Calin Juravle [Thu, 8 Oct 2015 14:05:12 +0000 (14:05 +0000)]
am 64d8d93a: Merge "Make sure classes with different access checks are not GVN-ed"

* commit '64d8d93aa9359b1126513dba92e27dbe184bfe3a':
  Make sure classes with different access checks are not GVN-ed

8 years agoMerge "Make sure classes with different access checks are not GVN-ed"
Calin Juravle [Thu, 8 Oct 2015 13:59:41 +0000 (13:59 +0000)]
Merge "Make sure classes with different access checks are not GVN-ed"

8 years agoam d40ef4b1: Merge "Optimizing: Clean up after tagging arena allocations."
Vladimir Marko [Thu, 8 Oct 2015 13:29:55 +0000 (13:29 +0000)]
am d40ef4b1: Merge "Optimizing: Clean up after tagging arena allocations."

* commit 'd40ef4b12b581c29753735ebd9815b19c16e3901':
  Optimizing: Clean up after tagging arena allocations.

8 years agoMerge "Optimizing: Clean up after tagging arena allocations."
Vladimir Marko [Thu, 8 Oct 2015 13:23:57 +0000 (13:23 +0000)]
Merge "Optimizing: Clean up after tagging arena allocations."

8 years agoMake sure classes with different access checks are not GVN-ed
Calin Juravle [Wed, 7 Oct 2015 17:55:43 +0000 (18:55 +0100)]
Make sure classes with different access checks are not GVN-ed

Change-Id: I89f72fef3be35a4dd9585d97d03a3150386e0891

8 years agoam 5248d2b5: Merge "Mark a new Checker test broken for MIPS32"
David Brazdil [Thu, 8 Oct 2015 11:43:27 +0000 (11:43 +0000)]
am 5248d2b5: Merge "Mark a new Checker test broken for MIPS32"

* commit '5248d2b53c9444f72e5e5f562ce7edcdb7a57256':
  Mark a new Checker test broken for MIPS32

8 years agoMerge "Mark a new Checker test broken for MIPS32"
David Brazdil [Thu, 8 Oct 2015 11:38:25 +0000 (11:38 +0000)]
Merge "Mark a new Checker test broken for MIPS32"

8 years agoMark a new Checker test broken for MIPS32
David Brazdil [Thu, 8 Oct 2015 11:37:25 +0000 (12:37 +0100)]
Mark a new Checker test broken for MIPS32

Change-Id: I6ecf41774326ad42d0b7c91f7bfad8047ce41260

8 years agoam 018545ff: Merge "ART: Checker tests for --debuggable"
David Brazdil [Thu, 8 Oct 2015 11:26:06 +0000 (11:26 +0000)]
am 018545ff: Merge "ART: Checker tests for --debuggable"

* commit '018545ff018f849f22aed381b19107b0ef970cc9':
  ART: Checker tests for --debuggable

8 years agoMerge "ART: Checker tests for --debuggable"
David Brazdil [Thu, 8 Oct 2015 11:21:26 +0000 (11:21 +0000)]
Merge "ART: Checker tests for --debuggable"

8 years agoART: Checker tests for --debuggable
David Brazdil [Thu, 8 Oct 2015 10:35:32 +0000 (11:35 +0100)]
ART: Checker tests for --debuggable

Checker was disabled for --debuggable because the code was not compiled
with Optimizing. Now that it is, we might want to write Checker tests
only for this mode. With this patch, CHECK-START(-ARCH)-DEBUGGABLE
tests will only be invoked on output of debuggable compilation.
Existing CHECK-START(-ARCH) tests will not be invoked.

Change-Id: I00c864f77b038af913d0d22ba7cf5655687f7c7c

8 years agoOptimizing: Clean up after tagging arena allocations.
Vladimir Marko [Wed, 30 Sep 2015 12:32:31 +0000 (13:32 +0100)]
Optimizing: Clean up after tagging arena allocations.

Change-Id: Id6ee1fe44c4c57d373db7a39530f29a5ca9aee18

8 years agoAdd DCHECKs to ArenaVector and ScopedArenaVector.
Vladimir Marko [Thu, 1 Oct 2015 19:57:57 +0000 (20:57 +0100)]
Add DCHECKs to ArenaVector and ScopedArenaVector.

Implement dchecked_vector<> template that DCHECK()s element
access and insert()/emplace()/erase() positions. Change the
ArenaVector<> and ScopedArenaVector<> aliases to use the new
template instead of std::vector<>. Remove DCHECK()s that
have now become unnecessary from the Optimizing compiler.

Change-Id: Ib8506bd30d223f68f52bd4476c76d9991acacadc

8 years agoam b2e436ff: Merge "Don\'t remove type checks if we need to perform an access check."
Calin Juravle [Thu, 8 Oct 2015 09:46:41 +0000 (09:46 +0000)]
am b2e436ff: Merge "Don\'t remove type checks if we need to perform an access check."

* commit 'b2e436ffcda1d7a87e7bf9133d8ed878388c73c2':
  Don't remove type checks if we need to perform an access check.

8 years agoam 89b8691f: Merge "Enforce optimizing test marker for verification errors."
Calin Juravle [Thu, 8 Oct 2015 09:46:40 +0000 (09:46 +0000)]
am 89b8691f: Merge "Enforce optimizing test marker for verification errors."

* commit '89b8691ff08bbe951782745c6eeeb070ee269a67':
  Enforce optimizing test marker for verification errors.

8 years agoMerge "Don't remove type checks if we need to perform an access check."
Calin Juravle [Thu, 8 Oct 2015 09:41:32 +0000 (09:41 +0000)]
Merge "Don't remove type checks if we need to perform an access check."

8 years agoMerge "Enforce optimizing test marker for verification errors."
Calin Juravle [Thu, 8 Oct 2015 09:41:22 +0000 (09:41 +0000)]
Merge "Enforce optimizing test marker for verification errors."

8 years agoam 19631f32: Merge "Fix x86_64 round intrinsic duplicate load"
Nicolas Geoffray [Thu, 8 Oct 2015 07:50:27 +0000 (07:50 +0000)]
am 19631f32: Merge "Fix x86_64 round intrinsic duplicate load"

* commit '19631f327a77873db897156ffad1574811f1d94e':
  Fix x86_64 round intrinsic duplicate load

8 years agoMerge "Fix x86_64 round intrinsic duplicate load"
Nicolas Geoffray [Thu, 8 Oct 2015 07:45:06 +0000 (07:45 +0000)]
Merge "Fix x86_64 round intrinsic duplicate load"

8 years agoam 56e4db28: am 09d00566: Merge "Move dmtracedump from dalvik to art."
Jeff Hao [Wed, 7 Oct 2015 23:39:20 +0000 (23:39 +0000)]
am 56e4db28: am 09d00566: Merge "Move dmtracedump from dalvik to art."

* commit '56e4db287477545d9df517a9270c6477263442a6':
  Move dmtracedump from dalvik to art.

8 years agoam 09d00566: Merge "Move dmtracedump from dalvik to art."
Jeff Hao [Wed, 7 Oct 2015 23:32:36 +0000 (23:32 +0000)]
am 09d00566: Merge "Move dmtracedump from dalvik to art."

* commit '09d005667edbf2b2676d387111888cb638428af6':
  Move dmtracedump from dalvik to art.

8 years agoMerge "Move dmtracedump from dalvik to art."
Jeff Hao [Wed, 7 Oct 2015 23:27:55 +0000 (23:27 +0000)]
Merge "Move dmtracedump from dalvik to art."

8 years agoMove dmtracedump from dalvik to art.
Jeff Hao [Wed, 7 Oct 2015 22:52:09 +0000 (15:52 -0700)]
Move dmtracedump from dalvik to art.

Also ported from C to C++. Note this is more or less a straight port
from C, and the code is still very C-like.

Bug: 24700673
Change-Id: I87db5b799dc1ddd442fdd519abb88fe69fc66773

8 years agoam 2beb2ab1: am 80cd1635: Merge "Mark breakpoint roots"
Mathieu Chartier [Wed, 7 Oct 2015 21:27:57 +0000 (21:27 +0000)]
am 2beb2ab1: am 80cd1635: Merge "Mark breakpoint roots"

* commit '2beb2ab1561339601dfc905e68122faa8b76263b':
  Mark breakpoint roots

8 years agoam 80cd1635: Merge "Mark breakpoint roots"
Mathieu Chartier [Wed, 7 Oct 2015 21:20:18 +0000 (21:20 +0000)]
am 80cd1635: Merge "Mark breakpoint roots"

* commit '80cd163575f3ca7b8f9885e47fdcc798336ab058':
  Mark breakpoint roots

8 years agoMerge "Mark breakpoint roots"
Mathieu Chartier [Wed, 7 Oct 2015 21:15:51 +0000 (21:15 +0000)]
Merge "Mark breakpoint roots"

8 years agoDon't remove type checks if we need to perform an access check.
Calin Juravle [Wed, 7 Oct 2015 16:51:52 +0000 (17:51 +0100)]
Don't remove type checks if we need to perform an access check.

Change-Id: I9b9e07c7524e96ece8dc089c8379631c2f9e3320

8 years agoEnforce optimizing test marker for verification errors.
Calin Juravle [Wed, 7 Oct 2015 11:08:54 +0000 (12:08 +0100)]
Enforce optimizing test marker for verification errors.

Change-Id: Ie7babf162729fa02d285572ee043fa9e588d73cc

8 years agoam 8eb985e9: am 9be16fe2: Merge "ART: Remove interpreter entrypoints"
Andreas Gampe [Wed, 7 Oct 2015 17:10:48 +0000 (17:10 +0000)]
am 8eb985e9: am 9be16fe2: Merge "ART: Remove interpreter entrypoints"

* commit '8eb985e95088053f1e31f057cbe58ebad5392962':
  ART: Remove interpreter entrypoints

8 years agoFix x86_64 round intrinsic duplicate load
Mark Mendell [Fri, 18 Sep 2015 12:22:04 +0000 (08:22 -0400)]
Fix x86_64 round intrinsic duplicate load

When I changed the code to use Load64BitValue, I forgot to delete the
original load instruction(s).  Remove them now.

Change-Id: I76aeccf88576507f2fbcf463ae1e503827a20fe2
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
8 years agoam 9be16fe2: Merge "ART: Remove interpreter entrypoints"
Andreas Gampe [Wed, 7 Oct 2015 17:03:33 +0000 (17:03 +0000)]
am 9be16fe2: Merge "ART: Remove interpreter entrypoints"

* commit '9be16fe2cd19a555092512c16afde50f79e80e3d':
  ART: Remove interpreter entrypoints

8 years agoMerge "ART: Remove interpreter entrypoints"
Andreas Gampe [Wed, 7 Oct 2015 16:59:56 +0000 (16:59 +0000)]
Merge "ART: Remove interpreter entrypoints"

8 years agoART: Remove interpreter entrypoints
Andreas Gampe [Wed, 7 Oct 2015 00:04:01 +0000 (17:04 -0700)]
ART: Remove interpreter entrypoints

These are no longer used as entrypoints. Make them proper runtime
functions local to the interpreter.

Bump oat version.

Change-Id: Icdd92e20eafc5668b68eeebf55cf624560f462b3

8 years agoam cec0d2b8: am f4156986: Merge "ART: Change asm test logging"
Andreas Gampe [Wed, 7 Oct 2015 16:45:55 +0000 (16:45 +0000)]
am cec0d2b8: am f4156986: Merge "ART: Change asm test logging"

* commit 'cec0d2b8d712cb78dc85fe6aa2e86932f15880c1':
  ART: Change asm test logging

8 years agoam f4156986: Merge "ART: Change asm test logging"
Andreas Gampe [Wed, 7 Oct 2015 16:41:00 +0000 (16:41 +0000)]
am f4156986: Merge "ART: Change asm test logging"

* commit 'f4156986d1ba5b6dd7dfe89754c8562557cd1bc5':
  ART: Change asm test logging

8 years agoMerge "ART: Change asm test logging"
Andreas Gampe [Wed, 7 Oct 2015 16:29:30 +0000 (16:29 +0000)]
Merge "ART: Change asm test logging"

8 years agoART: Change asm test logging
Andreas Gampe [Wed, 7 Oct 2015 01:59:08 +0000 (18:59 -0700)]
ART: Change asm test logging

Adapt the output a bit to log the exact shell command, and change
how the output is logged and what is logged. Should get more info
on failure.

Change-Id: Iacf58d27d6e1cf01e2fcd5835c4e0f8b5a820501

8 years agoam 2ba44e16: am 2cebfc68: Merge "Revert "Quick: Work around large frame sizes for...
Vladimir Marko [Wed, 7 Oct 2015 15:08:24 +0000 (15:08 +0000)]
am 2ba44e16: am 2cebfc68: Merge "Revert "Quick: Work around large frame sizes for x86_64.""

* commit '2ba44e16ba71d8411c32dc298f7741f84b31b083':
  Revert "Quick: Work around large frame sizes for x86_64."

8 years agoam 2cebfc68: Merge "Revert "Quick: Work around large frame sizes for x86_64.""
Vladimir Marko [Wed, 7 Oct 2015 15:04:23 +0000 (15:04 +0000)]
am 2cebfc68: Merge "Revert "Quick: Work around large frame sizes for x86_64.""

* commit '2cebfc684128738f3361a078bac777193830c2e1':
  Revert "Quick: Work around large frame sizes for x86_64."

8 years agoMerge "Revert "Quick: Work around large frame sizes for x86_64.""
Vladimir Marko [Wed, 7 Oct 2015 15:00:41 +0000 (15:00 +0000)]
Merge "Revert "Quick: Work around large frame sizes for x86_64.""

8 years agoRevert "Quick: Work around large frame sizes for x86_64."
Vladimir Marko [Wed, 7 Oct 2015 12:44:31 +0000 (12:44 +0000)]
Revert "Quick: Work around large frame sizes for x86_64."

Instead, move the MEMORY_TOOL_MAKE_* calls out-of-line.

Bug: 24729377

This reverts commit d4cf1e4fe0624b99df22ed5556dc1d042b32a7e0.

Change-Id: I9bccc8bd4a691a2d018b84de8b95bc68fafad4e1

8 years agoam 0bc80f96: am 59289315: Merge "Quick: Work around large frame sizes for x86_64."
Vladimir Marko [Wed, 7 Oct 2015 11:17:05 +0000 (11:17 +0000)]
am 0bc80f96: am 59289315: Merge "Quick: Work around large frame sizes for x86_64."

* commit '0bc80f965f7d9fc2de980e44f3e471adfdf8802a':
  Quick: Work around large frame sizes for x86_64.

8 years agoam 9995022e: am 2e0cf19d: Merge "Fix lint issues."
Nicolas Geoffray [Wed, 7 Oct 2015 11:12:49 +0000 (11:12 +0000)]
am 9995022e: am 2e0cf19d: Merge "Fix lint issues."

* commit '9995022e19e34b49c438dd5598bb5bb0e105d805':
  Fix lint issues.

8 years agoam 59289315: Merge "Quick: Work around large frame sizes for x86_64."
Vladimir Marko [Wed, 7 Oct 2015 11:11:17 +0000 (11:11 +0000)]
am 59289315: Merge "Quick: Work around large frame sizes for x86_64."

* commit '5928931541e07b4c98e677cfca3088106b2b9e64':
  Quick: Work around large frame sizes for x86_64.

8 years agoMerge "Quick: Work around large frame sizes for x86_64."
Vladimir Marko [Wed, 7 Oct 2015 11:07:30 +0000 (11:07 +0000)]
Merge "Quick: Work around large frame sizes for x86_64."

8 years agoam 2e0cf19d: Merge "Fix lint issues."
Nicolas Geoffray [Wed, 7 Oct 2015 11:06:51 +0000 (11:06 +0000)]
am 2e0cf19d: Merge "Fix lint issues."

* commit '2e0cf19db386cbe003550027faf8c53739cf08db':
  Fix lint issues.

8 years agoQuick: Work around large frame sizes for x86_64.
Vladimir Marko [Wed, 7 Oct 2015 11:03:29 +0000 (12:03 +0100)]
Quick: Work around large frame sizes for x86_64.

Bug: 24729377
Change-Id: Id608aabad60fb7f1a1450a02444bddfb0eb008a6

8 years agoMerge "Fix lint issues."
Nicolas Geoffray [Wed, 7 Oct 2015 11:00:15 +0000 (11:00 +0000)]
Merge "Fix lint issues."

8 years agoFix lint issues.
Nicolas Geoffray [Wed, 7 Oct 2015 10:52:21 +0000 (11:52 +0100)]
Fix lint issues.

Change-Id: I989e25cdaa7e0b99bfef1379f4e4a71511ae1a27

8 years agoam cb9cbb60: am d6ace609: Merge "Add support for intrinsic optimizations."
Nicolas Geoffray [Wed, 7 Oct 2015 10:02:14 +0000 (10:02 +0000)]
am cb9cbb60: am d6ace609: Merge "Add support for intrinsic optimizations."

* commit 'cb9cbb60dd11b07713d144110ba509a5525882e7':
  Add support for intrinsic optimizations.

8 years agoam d6ace609: Merge "Add support for intrinsic optimizations."
Nicolas Geoffray [Wed, 7 Oct 2015 09:56:31 +0000 (09:56 +0000)]
am d6ace609: Merge "Add support for intrinsic optimizations."

* commit 'd6ace609ef3c5d37ea4d980a2aaa3a9c31943d3b':
  Add support for intrinsic optimizations.

8 years agoMerge "Add support for intrinsic optimizations."
Nicolas Geoffray [Wed, 7 Oct 2015 09:51:07 +0000 (09:51 +0000)]
Merge "Add support for intrinsic optimizations."

8 years agoAdd support for intrinsic optimizations.
Nicolas Geoffray [Fri, 2 Oct 2015 16:30:26 +0000 (17:30 +0100)]
Add support for intrinsic optimizations.

Change-Id: Ib5a4224022f9360e60c09a19ac8642270a7f3b64

8 years agoam 00a7f1fa: am ce18a7f1: Merge "Revert "Optimizing: Disable -Wframe-larger-than...
Vladimir Marko [Wed, 7 Oct 2015 09:22:34 +0000 (09:22 +0000)]
am 00a7f1fa: am ce18a7f1: Merge "Revert "Optimizing: Disable -Wframe-larger-than= for CompileOptimized().""

* commit '00a7f1fa9cfda2a853bda9a214478eada0a1c537':
  Revert "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."

8 years agoam ce18a7f1: Merge "Revert "Optimizing: Disable -Wframe-larger-than= for CompileOptim...
Vladimir Marko [Wed, 7 Oct 2015 09:18:07 +0000 (09:18 +0000)]
am ce18a7f1: Merge "Revert "Optimizing: Disable -Wframe-larger-than= for CompileOptimized().""

* commit 'ce18a7f16166dd525dfcf6afaca567d7e82dba0a':
  Revert "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."

8 years agoMerge "Revert "Optimizing: Disable -Wframe-larger-than= for CompileOptimized().""
Vladimir Marko [Wed, 7 Oct 2015 09:11:49 +0000 (09:11 +0000)]
Merge "Revert "Optimizing: Disable -Wframe-larger-than= for CompileOptimized().""

8 years agoam 4da818cc: am 0d9b52f0: Merge "The move to jack forces us to explicitly give the...
Nicolas Geoffray [Wed, 7 Oct 2015 09:11:45 +0000 (09:11 +0000)]
am 4da818cc: am 0d9b52f0: Merge "The move to jack forces us to explicitly give the jar path."

* commit '4da818cc58dcb5837c9f8d5c0de9cac715ff925b':
  The move to jack forces us to explicitly give the jar path.

8 years agoam 0d9b52f0: Merge "The move to jack forces us to explicitly give the jar path."
Nicolas Geoffray [Wed, 7 Oct 2015 09:05:45 +0000 (09:05 +0000)]
am 0d9b52f0: Merge "The move to jack forces us to explicitly give the jar path."

* commit '0d9b52f09f520440d6b1c2880183b29b99719f11':
  The move to jack forces us to explicitly give the jar path.

8 years agoMerge "The move to jack forces us to explicitly give the jar path."
Nicolas Geoffray [Wed, 7 Oct 2015 08:31:18 +0000 (08:31 +0000)]
Merge "The move to jack forces us to explicitly give the jar path."

8 years agoThe move to jack forces us to explicitly give the jar path.
Nicolas Geoffray [Wed, 7 Oct 2015 08:28:52 +0000 (09:28 +0100)]
The move to jack forces us to explicitly give the jar path.

vogar currently does not support the --classpath option with jack.

bug:24723887
Change-Id: I0923ff32ffa62d0ea3fbb4b330e50a3e7dbe8e69

8 years agoam 6a6da049: am 7f9558ee: Merge "Disable class unloading test for CC"
Mathieu Chartier [Tue, 6 Oct 2015 22:19:18 +0000 (22:19 +0000)]
am 6a6da049: am 7f9558ee: Merge "Disable class unloading test for CC"

* commit '6a6da0497a098c51cf19bba61f82cc833715eb9e':
  Disable class unloading test for CC

8 years agoam 7f9558ee: Merge "Disable class unloading test for CC"
Mathieu Chartier [Tue, 6 Oct 2015 22:12:32 +0000 (22:12 +0000)]
am 7f9558ee: Merge "Disable class unloading test for CC"

* commit '7f9558eea5ffae184556ac13b93edf48371b41f8':
  Disable class unloading test for CC

8 years agoMerge "Disable class unloading test for CC"
Mathieu Chartier [Tue, 6 Oct 2015 22:05:45 +0000 (22:05 +0000)]
Merge "Disable class unloading test for CC"

8 years agoDisable class unloading test for CC
Mathieu Chartier [Tue, 6 Oct 2015 21:14:26 +0000 (14:14 -0700)]
Disable class unloading test for CC

Test is flaky for now.

Bug: 22720414
Bug: 24468364
Change-Id: I5d9a7468e17b64522929ae2f7ca469680b8dced2

8 years agoam dda864ba: am 8c812b71: Merge "Refactor the alloc entry point generation code."
Hiroshi Yamauchi [Tue, 6 Oct 2015 21:21:10 +0000 (21:21 +0000)]
am dda864ba: am 8c812b71: Merge "Refactor the alloc entry point generation code."

* commit 'dda864bab8643cf1e224fd5ec38e38c1434753e5':
  Refactor the alloc entry point generation code.

8 years agoam 0ec3b73b: am 1e5d0cd1: Merge remote-tracking branch \'goog/stage-aosp-master\...
The Android Open Source Project [Tue, 6 Oct 2015 21:21:09 +0000 (21:21 +0000)]
am 0ec3b73b: am 1e5d0cd1: Merge remote-tracking branch \'goog/stage-aosp-master\' into HEAD

* commit '0ec3b73bac29d0ecd8cce8a0167e02cf42141356':

8 years agoam 7b84e5ad: am 92c4fc25: Merge "Fix location summary for LoadClass"
Calin Juravle [Tue, 6 Oct 2015 21:21:07 +0000 (21:21 +0000)]
am 7b84e5ad: am 92c4fc25: Merge "Fix location summary for LoadClass"

* commit '7b84e5ad3bd4f3aad10fa77a04a88e7be368e975':
  Fix location summary for LoadClass

8 years agoam a9fff29d: am 6e3a8388: Merge "ART: Add more error logging to assembler tests"
Andreas Gampe [Tue, 6 Oct 2015 21:21:06 +0000 (21:21 +0000)]
am a9fff29d: am 6e3a8388: Merge "ART: Add more error logging to assembler tests"

* commit 'a9fff29d4c2c06d1530ceb1820c687a5ed7da505':
  ART: Add more error logging to assembler tests

8 years agoam bc8ebec0: am 4012c37f: Merge "Assert we don\'t store an invalid dex_pc in the...
Calin Juravle [Tue, 6 Oct 2015 21:21:04 +0000 (21:21 +0000)]
am bc8ebec0: am 4012c37f: Merge "Assert we don\'t store an invalid dex_pc in the stack maps."

* commit 'bc8ebec04900e4e953874a5d40b03aa90fcbb8f1':
  Assert we don't store an invalid dex_pc in the stack maps.

8 years agoam 8c812b71: Merge "Refactor the alloc entry point generation code."
Hiroshi Yamauchi [Tue, 6 Oct 2015 21:13:40 +0000 (21:13 +0000)]
am 8c812b71: Merge "Refactor the alloc entry point generation code."

* commit '8c812b71552a8a1b2bf06e430d355b12b7084807':
  Refactor the alloc entry point generation code.

8 years agoam 1e5d0cd1: Merge remote-tracking branch \'goog/stage-aosp-master\' into HEAD
The Android Open Source Project [Tue, 6 Oct 2015 21:13:38 +0000 (21:13 +0000)]
am 1e5d0cd1: Merge remote-tracking branch \'goog/stage-aosp-master\' into HEAD

* commit '1e5d0cd1bec6c96add46a3b9ca907ec2c222203b':

8 years agoam 92c4fc25: Merge "Fix location summary for LoadClass"
Calin Juravle [Tue, 6 Oct 2015 21:13:36 +0000 (21:13 +0000)]
am 92c4fc25: Merge "Fix location summary for LoadClass"

* commit '92c4fc2518b582b8c28c32d53ca5c1738b4eb37a':
  Fix location summary for LoadClass

8 years agoam 6e3a8388: Merge "ART: Add more error logging to assembler tests"
Andreas Gampe [Tue, 6 Oct 2015 21:13:34 +0000 (21:13 +0000)]
am 6e3a8388: Merge "ART: Add more error logging to assembler tests"

* commit '6e3a83880045aae045e9a3689244be12b680063a':
  ART: Add more error logging to assembler tests

8 years agoam 4012c37f: Merge "Assert we don\'t store an invalid dex_pc in the stack maps."
Calin Juravle [Tue, 6 Oct 2015 21:13:32 +0000 (21:13 +0000)]
am 4012c37f: Merge "Assert we don\'t store an invalid dex_pc in the stack maps."

* commit '4012c37f0459f757d4ab74ac9b0cda0481ba3546':
  Assert we don't store an invalid dex_pc in the stack maps.

8 years agoMark breakpoint roots
Mathieu Chartier [Tue, 6 Oct 2015 17:32:38 +0000 (10:32 -0700)]
Mark breakpoint roots

Used to prevent class unloading on methods that have breakpoints.

Bug: 22720414
Change-Id: I9aee8bcbfdf253607e89dfc55a50ba3f11d99206

8 years agoRevert "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."
Vladimir Marko [Tue, 6 Oct 2015 17:30:45 +0000 (17:30 +0000)]
Revert "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."

Instead, prevent inlining of AllocateRegisters() that uses
huge stack-allocated objects.

Bug: 24698147

This reverts commit 67f784e63343db5ecd6e584343484684ea60d1f8.

Change-Id: I94c408f7acf6e43897a248d9ea0761b979ed00c8

8 years agoMerge "Refactor the alloc entry point generation code."
Hiroshi Yamauchi [Tue, 6 Oct 2015 17:01:33 +0000 (17:01 +0000)]
Merge "Refactor the alloc entry point generation code."

8 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD
The Android Open Source Project [Tue, 6 Oct 2015 16:59:00 +0000 (09:59 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

8 years agoMerge "Fix location summary for LoadClass"
Calin Juravle [Tue, 6 Oct 2015 16:38:30 +0000 (16:38 +0000)]
Merge "Fix location summary for LoadClass"

8 years agoFix location summary for LoadClass
Calin Juravle [Tue, 6 Oct 2015 16:35:58 +0000 (17:35 +0100)]
Fix location summary for LoadClass

Don't request a register for the current method if we're gonna call the
runtime.

Change-Id: I9760d15108bd95efb2a34e6eacd84b60841781d7

8 years agoMerge "ART: Add more error logging to assembler tests"
Andreas Gampe [Tue, 6 Oct 2015 16:25:16 +0000 (16:25 +0000)]
Merge "ART: Add more error logging to assembler tests"

8 years agoART: Add more error logging to assembler tests
Andreas Gampe [Tue, 6 Oct 2015 16:05:10 +0000 (09:05 -0700)]
ART: Add more error logging to assembler tests

Add error logging so we can figure out when something goes wrong
on the build servers.

Change-Id: Idf9bc1d0e19846059d1dc78510be6333179cd758

8 years agoMerge "Assert we don't store an invalid dex_pc in the stack maps."
Calin Juravle [Tue, 6 Oct 2015 16:21:28 +0000 (16:21 +0000)]
Merge "Assert we don't store an invalid dex_pc in the stack maps."

8 years agoAssert we don't store an invalid dex_pc in the stack maps.
Calin Juravle [Tue, 6 Oct 2015 16:09:49 +0000 (17:09 +0100)]
Assert we don't store an invalid dex_pc in the stack maps.

Change-Id: Ie106486bd4a6d975c9a3d03d02dc48d97d83c3d8

8 years agoam 7e8dd4c3: am 22d450d3: Merge "Remove dex_pc\'s default value from top level HInstr...
Calin Juravle [Tue, 6 Oct 2015 15:52:21 +0000 (15:52 +0000)]
am 7e8dd4c3: am 22d450d3: Merge "Remove dex_pc\'s default value from top level HInstruction"

* commit '7e8dd4c3147145879b26591492c839530d650b81':
  Remove dex_pc's default value from top level HInstruction

8 years agoam 22d450d3: Merge "Remove dex_pc\'s default value from top level HInstruction"
Calin Juravle [Tue, 6 Oct 2015 15:47:49 +0000 (15:47 +0000)]
am 22d450d3: Merge "Remove dex_pc\'s default value from top level HInstruction"

* commit '22d450d37801d05785ad1fc792ea9873225fb6a6':
  Remove dex_pc's default value from top level HInstruction

8 years agoMerge "Remove dex_pc's default value from top level HInstruction"
Calin Juravle [Tue, 6 Oct 2015 15:43:38 +0000 (15:43 +0000)]
Merge "Remove dex_pc's default value from top level HInstruction"

8 years agoRemove dex_pc's default value from top level HInstruction
Calin Juravle [Tue, 6 Oct 2015 14:46:54 +0000 (15:46 +0100)]
Remove dex_pc's default value from top level HInstruction

This clearly hints that the dex_pc is stored in the super class and
doesn't need to be reimplemented in subclasses.

Change-Id: Ifd4aa95190c4c89367b4dd2cc8ab0ffd263659ac

8 years agoam 0050cc73: am 51d70f17: Merge "Optimizing: Disable -Wframe-larger-than= for Compile...
Vladimir Marko [Tue, 6 Oct 2015 15:25:33 +0000 (15:25 +0000)]
am 0050cc73: am 51d70f17: Merge "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."

* commit '0050cc73c0b24710bf593a8cbafa082248f73730':
  Optimizing: Disable -Wframe-larger-than= for CompileOptimized().

8 years agoam 51d70f17: Merge "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."
Vladimir Marko [Tue, 6 Oct 2015 15:19:02 +0000 (15:19 +0000)]
am 51d70f17: Merge "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."

* commit '51d70f1744493d75e5cef946b7f5e398d0df4d3d':
  Optimizing: Disable -Wframe-larger-than= for CompileOptimized().

8 years agoMerge "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."
Vladimir Marko [Tue, 6 Oct 2015 15:15:58 +0000 (15:15 +0000)]
Merge "Optimizing: Disable -Wframe-larger-than= for CompileOptimized()."

8 years agoOptimizing: Disable -Wframe-larger-than= for CompileOptimized().
Vladimir Marko [Tue, 6 Oct 2015 14:52:34 +0000 (15:52 +0100)]
Optimizing: Disable -Wframe-larger-than= for CompileOptimized().

Bug: 24698147
Change-Id: I360e9412d85afa83ef2152e4c16bcd3139b34f75

8 years agoam a5ed7830: am 72305e26: Merge "Fix another Makefile typo."
Nicolas Geoffray [Tue, 6 Oct 2015 15:00:18 +0000 (15:00 +0000)]
am a5ed7830: am 72305e26: Merge "Fix another Makefile typo."

* commit 'a5ed7830458707c9ec10afc80163e481c2da9eaf':
  Fix another Makefile typo.

8 years agoam 72305e26: Merge "Fix another Makefile typo."
Nicolas Geoffray [Tue, 6 Oct 2015 14:57:10 +0000 (14:57 +0000)]
am 72305e26: Merge "Fix another Makefile typo."

* commit '72305e26c8cecea0d2259278c950b96541c3f8ce':
  Fix another Makefile typo.