OSDN Git Service

android-x86/art.git
7 years agoMerge "ARM: VIXL32: Update the trampoline compiler." am: 24cbdc42f8 am: e72f7cd952
Anton Kirilov [Thu, 25 Aug 2016 15:26:47 +0000 (15:26 +0000)]
Merge "ARM: VIXL32: Update the trampoline compiler." am: 24cbdc42f8 am: e72f7cd952
am: eb31281b42

Change-Id: I0294a37d261f576fb9c746542dcc3dc176e6a2ba

7 years agoMerge "ARM: VIXL32: Switch JNI compiler to use VIXL Assembler." am: 3e93a40f08 am...
Artem Serov [Thu, 25 Aug 2016 15:26:46 +0000 (15:26 +0000)]
Merge "ARM: VIXL32: Switch JNI compiler to use VIXL Assembler." am: 3e93a40f08 am: 443c18ba5b
am: 5287c9a8e0

Change-Id: I0121ece7059697ba606f7dd9bc1343f409ade453

7 years agoMerge "ARM: VIXL32: Implement VIXL-based assembler." am: e7c85ad018 am: 50cf83c5db
Artem Serov [Thu, 25 Aug 2016 15:26:46 +0000 (15:26 +0000)]
Merge "ARM: VIXL32: Implement VIXL-based assembler." am: e7c85ad018 am: 50cf83c5db
am: 8fe59dc597

Change-Id: I5c9317bc5c0ea639f92b6e1b098e7b6e37be15ff

7 years agoMerge "ARM: VIXL32: Update the trampoline compiler." am: 24cbdc42f8
Anton Kirilov [Thu, 25 Aug 2016 15:23:49 +0000 (15:23 +0000)]
Merge "ARM: VIXL32: Update the trampoline compiler." am: 24cbdc42f8
am: e72f7cd952

Change-Id: Ic562d9138fcc10a729def95f01ef51c74765fb18

7 years agoMerge "ARM: VIXL32: Switch JNI compiler to use VIXL Assembler." am: 3e93a40f08
Artem Serov [Thu, 25 Aug 2016 15:23:46 +0000 (15:23 +0000)]
Merge "ARM: VIXL32: Switch JNI compiler to use VIXL Assembler." am: 3e93a40f08
am: 443c18ba5b

Change-Id: I402267b2f71c3473a3c287194e84a5de5142662a

7 years agoMerge "ARM: VIXL32: Implement VIXL-based assembler." am: e7c85ad018
Artem Serov [Thu, 25 Aug 2016 15:23:45 +0000 (15:23 +0000)]
Merge "ARM: VIXL32: Implement VIXL-based assembler." am: e7c85ad018
am: 50cf83c5db

Change-Id: I3f8ca96c8c0a1d81f29d6cccd5a39b2f68ecc1cc

7 years agoMerge "ARM: VIXL32: Update the trampoline compiler."
Anton Kirilov [Thu, 25 Aug 2016 15:20:53 +0000 (15:20 +0000)]
Merge "ARM: VIXL32: Update the trampoline compiler."
am: 24cbdc42f8

Change-Id: Ib4e01394bcdbb21b77f302f33ddf59cbace5a1fd

7 years agoMerge "ARM: VIXL32: Switch JNI compiler to use VIXL Assembler."
Artem Serov [Thu, 25 Aug 2016 15:20:50 +0000 (15:20 +0000)]
Merge "ARM: VIXL32: Switch JNI compiler to use VIXL Assembler."
am: 3e93a40f08

Change-Id: Ic882e46ff588a31e7583bf643dd0acb2f792c1a9

7 years agoMerge "ARM: VIXL32: Implement VIXL-based assembler."
Artem Serov [Thu, 25 Aug 2016 15:20:48 +0000 (15:20 +0000)]
Merge "ARM: VIXL32: Implement VIXL-based assembler."
am: e7c85ad018

Change-Id: I15441d2f5a2e6e35e5690fa5d563887eba34c256

7 years agoMerge "ARM: VIXL32: Update the trampoline compiler."
Treehugger Robot [Thu, 25 Aug 2016 15:12:37 +0000 (15:12 +0000)]
Merge "ARM: VIXL32: Update the trampoline compiler."

7 years agoMerge "ARM: VIXL32: Switch JNI compiler to use VIXL Assembler."
Treehugger Robot [Thu, 25 Aug 2016 15:12:19 +0000 (15:12 +0000)]
Merge "ARM: VIXL32: Switch JNI compiler to use VIXL Assembler."

7 years agoMerge "ARM: VIXL32: Implement VIXL-based assembler."
Treehugger Robot [Thu, 25 Aug 2016 15:11:52 +0000 (15:11 +0000)]
Merge "ARM: VIXL32: Implement VIXL-based assembler."

7 years agoMerge "ARM: Purge Arm32Assembler." am: a518c150ad am: f17448437b
Roland Levillain [Thu, 25 Aug 2016 12:34:34 +0000 (12:34 +0000)]
Merge "ARM: Purge Arm32Assembler." am: a518c150ad am: f17448437b
am: 69329fbc5e

Change-Id: I3b67060be8f80b6c4d72d52cd680cb3f57ca8932

7 years agoMerge "ARM: Purge Arm32Assembler." am: a518c150ad
Roland Levillain [Thu, 25 Aug 2016 12:31:05 +0000 (12:31 +0000)]
Merge "ARM: Purge Arm32Assembler." am: a518c150ad
am: f17448437b

Change-Id: I0a9a4152223b7658763bfc40fc8180f76ee1fa2d

7 years agoMerge "ARM: Purge Arm32Assembler."
Roland Levillain [Thu, 25 Aug 2016 12:28:08 +0000 (12:28 +0000)]
Merge "ARM: Purge Arm32Assembler."
am: a518c150ad

Change-Id: If28ac6adfcd28290ca8251b5a181b4ac2d6022bc

7 years agoMerge "ARM: Purge Arm32Assembler."
Roland Levillain [Thu, 25 Aug 2016 12:19:36 +0000 (12:19 +0000)]
Merge "ARM: Purge Arm32Assembler."

7 years agoMerge "MIPS32: Refactor implicit null checks in array/field get/set." am: c8cbbf518d...
Vladimir Marko [Thu, 25 Aug 2016 11:29:30 +0000 (11:29 +0000)]
Merge "MIPS32: Refactor implicit null checks in array/field get/set." am: c8cbbf518d am: 447116bdf0
am: 8f1dde7eaf

Change-Id: Ia792e33fabb0fef3aaee9e3115d2655452ca2ffb

7 years agoMerge "MIPS32: Refactor implicit null checks in array/field get/set." am: c8cbbf518d
Vladimir Marko [Thu, 25 Aug 2016 11:26:30 +0000 (11:26 +0000)]
Merge "MIPS32: Refactor implicit null checks in array/field get/set." am: c8cbbf518d
am: 447116bdf0

Change-Id: I3a9ebc3cc79fa566c46b1c628b8e442a98a4c1a2

7 years agoMerge "MIPS32: Refactor implicit null checks in array/field get/set."
Vladimir Marko [Thu, 25 Aug 2016 11:23:32 +0000 (11:23 +0000)]
Merge "MIPS32: Refactor implicit null checks in array/field get/set."
am: c8cbbf518d

Change-Id: Idfa26f5aec59846ad6cedfbe625b491f09859cbe

7 years agoMerge "MIPS32: Refactor implicit null checks in array/field get/set."
Vladimir Marko [Thu, 25 Aug 2016 11:18:23 +0000 (11:18 +0000)]
Merge "MIPS32: Refactor implicit null checks in array/field get/set."

7 years agoMerge "Remove duplicate entries with libcore expectation files." am: 082bfec576 am...
Nicolas Geoffray [Thu, 25 Aug 2016 09:25:53 +0000 (09:25 +0000)]
Merge "Remove duplicate entries with libcore expectation files." am: 082bfec576 am: 3a46c8ed22
am: 68af561bb4

Change-Id: I98d0750332e173d33b203ebf00279b7eef195397

7 years agoMerge "Remove duplicate entries with libcore expectation files." am: 082bfec576
Nicolas Geoffray [Thu, 25 Aug 2016 09:23:28 +0000 (09:23 +0000)]
Merge "Remove duplicate entries with libcore expectation files." am: 082bfec576
am: 3a46c8ed22

Change-Id: I2b06a1bc8d69b1164feb79665cb12aa8049dc24e

7 years agoMerge "Remove duplicate entries with libcore expectation files."
Nicolas Geoffray [Thu, 25 Aug 2016 09:19:55 +0000 (09:19 +0000)]
Merge "Remove duplicate entries with libcore expectation files."
am: 082bfec576

Change-Id: Ia7e67ba9affca54b005f1dc47602c3b9f57b076a

7 years agoMerge "Remove duplicate entries with libcore expectation files."
Nicolas Geoffray [Thu, 25 Aug 2016 09:14:35 +0000 (09:14 +0000)]
Merge "Remove duplicate entries with libcore expectation files."

7 years agoRemove duplicate entries with libcore expectation files.
Nicolas Geoffray [Thu, 25 Aug 2016 09:11:40 +0000 (10:11 +0100)]
Remove duplicate entries with libcore expectation files.

Needed after N->AOSP drop.

test:art/tools/run-libcore-tests.sh
Change-Id: Icd7e20e8a6cff42aecf316e2a356d19bf9e5ee39

7 years agoMerge "Revert "Revert "Fix debugger calling new String().""" am: edbfb68895 am: cf205...
Jeff Hao [Thu, 25 Aug 2016 06:02:42 +0000 (06:02 +0000)]
Merge "Revert "Revert "Fix debugger calling new String().""" am: edbfb68895 am: cf20574ab0
am: a12d38d121

Change-Id: I5a3ffc0ef634293db66a74175307b0b362713fe0

7 years agoMerge "Revert "Revert "Fix debugger calling new String().""" am: edbfb68895
Jeff Hao [Thu, 25 Aug 2016 05:59:41 +0000 (05:59 +0000)]
Merge "Revert "Revert "Fix debugger calling new String().""" am: edbfb68895
am: cf20574ab0

Change-Id: I46ba5376de8b5bd2fc05a525d16fb58e333c65f1

7 years agoMerge "Revert "Revert "Fix debugger calling new String()."""
Jeff Hao [Thu, 25 Aug 2016 05:56:42 +0000 (05:56 +0000)]
Merge "Revert "Revert "Fix debugger calling new String()."""
am: edbfb68895

Change-Id: I5fda25dda83504316c8577826ddfbde853902ae3

7 years agoMerge "Revert "Revert "Fix debugger calling new String()."""
Treehugger Robot [Thu, 25 Aug 2016 05:51:36 +0000 (05:51 +0000)]
Merge "Revert "Revert "Fix debugger calling new String()."""

7 years agoRevert "Revert "Fix debugger calling new String().""
Jeff Hao [Thu, 25 Aug 2016 03:52:40 +0000 (03:52 +0000)]
Revert "Revert "Fix debugger calling new String().""

Bug: 30951794
Test: mm -j24 run-jdwp-tests-host

This reverts commit 6f48d4c72e7b4011a6d9652734bd1cb0c389790b.
This also includes the reversion of commit
528954f55e3173b02df2822c1fc680873d6a91c8.

Change-Id: If0b2ae39cb2a9db80b567bb8d5761d504433632d

7 years agoMerge "Revert "Convert libart and dependencies to Android.bp"" am: 2851ce0ca2 am...
Colin Cross [Thu, 25 Aug 2016 01:18:38 +0000 (01:18 +0000)]
Merge "Revert "Convert libart and dependencies to Android.bp"" am: 2851ce0ca2 am: 8f505123cf
am: 5b8ed18937

Change-Id: Ieb09a1b98a07f16f8e314d401e17a07b0d24e055

7 years agoMerge "Revert "Convert libart and dependencies to Android.bp"" am: 2851ce0ca2
Colin Cross [Thu, 25 Aug 2016 01:15:23 +0000 (01:15 +0000)]
Merge "Revert "Convert libart and dependencies to Android.bp"" am: 2851ce0ca2
am: 8f505123cf

Change-Id: I995edf661ea65cfc7745c97e0c853f4cd42983af

7 years agoMerge "Revert "Convert libart and dependencies to Android.bp""
Colin Cross [Thu, 25 Aug 2016 01:12:54 +0000 (01:12 +0000)]
Merge "Revert "Convert libart and dependencies to Android.bp""
am: 2851ce0ca2

Change-Id: I54900bb21d11e7d93be66790a6b3f13e96786c73

7 years agoMerge "Revert "Convert libart and dependencies to Android.bp""
Colin Cross [Thu, 25 Aug 2016 01:05:27 +0000 (01:05 +0000)]
Merge "Revert "Convert libart and dependencies to Android.bp""

7 years agoRevert "Convert libart and dependencies to Android.bp"
Colin Cross [Thu, 25 Aug 2016 01:03:42 +0000 (01:03 +0000)]
Revert "Convert libart and dependencies to Android.bp"

This reverts commit 4ea3a22f0ccfb0f746c63c274b2655545e759e1f.

Change-Id: I3ac4397b4d6be038e5b863b7a24231c0736e84f3

7 years agoMerge "Convert libart and dependencies to Android.bp" am: 8d0e8840df am: 392b2634a7
Colin Cross [Thu, 25 Aug 2016 00:44:53 +0000 (00:44 +0000)]
Merge "Convert libart and dependencies to Android.bp" am: 8d0e8840df am: 392b2634a7
am: 1000f149f5

Change-Id: Ifc54e71788d212c97c5645e2a2684871538ff145

7 years agoMerge "Convert libart and dependencies to Android.bp" am: 8d0e8840df
Colin Cross [Thu, 25 Aug 2016 00:41:51 +0000 (00:41 +0000)]
Merge "Convert libart and dependencies to Android.bp" am: 8d0e8840df
am: 392b2634a7

Change-Id: I4568ce87d8219e0b65bfbe15eccc8273dfc6280b

7 years agoMerge "Convert libart and dependencies to Android.bp"
Colin Cross [Thu, 25 Aug 2016 00:38:51 +0000 (00:38 +0000)]
Merge "Convert libart and dependencies to Android.bp"
am: 8d0e8840df

Change-Id: I95bac807d16a68d65cfd28ddaf932cc722dbb3e1

7 years agoMerge "Convert libart and dependencies to Android.bp"
Treehugger Robot [Thu, 25 Aug 2016 00:31:20 +0000 (00:31 +0000)]
Merge "Convert libart and dependencies to Android.bp"

7 years agoMIPS32: Refactor implicit null checks in array/field get/set.
Alexey Frunze [Sat, 20 Aug 2016 08:55:47 +0000 (01:55 -0700)]
MIPS32: Refactor implicit null checks in array/field get/set.

Rationale: on MIPS32 64-bit loads and stores may be performed
as pairs of 32-bit loads/stores. Implicit null checks must be
associated with the first 32-bit load/store in a pair and not
the last. This change ensures proper association of said checks
(a few were done after the last 32-bit load/store in a pair)
and lays ground for further improvements in array/field get/set.

Test: booted MIPS32 in QEMU
Test: test-art-host-gtest
Test: test-art-target-run-test-optimizing in QEMU

Change-Id: I3674947c00bb17930790a7a47c9b7aadc0c030b8

7 years agoConvert libart and dependencies to Android.bp
Colin Cross [Wed, 27 Jul 2016 17:12:38 +0000 (10:12 -0700)]
Convert libart and dependencies to Android.bp

Test: mma -j, m -j test-art-host
Change-Id: I73839046a5a53eb34cd28eea53149911c568e411

7 years agoMerge "Avoid CAS for marking region space bitmap for baker" am: 770e31af96 am: 1fcc34f67f
Mathieu Chartier [Wed, 24 Aug 2016 22:05:09 +0000 (22:05 +0000)]
Merge "Avoid CAS for marking region space bitmap for baker" am: 770e31af96 am: 1fcc34f67f
am: d5d76fcc79

Change-Id: I4c75706b88f3757422a5ae16466d46968ddeb68a

7 years agoMerge "Avoid CAS for marking region space bitmap for baker" am: 770e31af96
Mathieu Chartier [Wed, 24 Aug 2016 22:02:35 +0000 (22:02 +0000)]
Merge "Avoid CAS for marking region space bitmap for baker" am: 770e31af96
am: 1fcc34f67f

Change-Id: I591120b18febd86f5c66b040cd02322c44f7fba0

7 years agoMerge "Avoid CAS for marking region space bitmap for baker"
Mathieu Chartier [Wed, 24 Aug 2016 21:59:36 +0000 (21:59 +0000)]
Merge "Avoid CAS for marking region space bitmap for baker"
am: 770e31af96

Change-Id: I050dd383e6bf5062c41021de6a667423037ce009

7 years agoMerge "Avoid CAS for marking region space bitmap for baker"
Treehugger Robot [Wed, 24 Aug 2016 21:53:50 +0000 (21:53 +0000)]
Merge "Avoid CAS for marking region space bitmap for baker"

7 years agoAvoid CAS for marking region space bitmap for baker
Mathieu Chartier [Tue, 23 Aug 2016 20:27:53 +0000 (13:27 -0700)]
Avoid CAS for marking region space bitmap for baker

Only have the GC thread mark it. This occurs when popping from the
mark stack. The race where an object may be pushed to the mark
stack twice is handled by not scanning if it is already marked.

Also avoid checking is_active when marking from the GC.

EAAC: 1263 -> 1253 (average of 30 runs)
GC time: 7.21s -> 6.83s (average of 18 runs)

Timings on 960 mhz N6P.

Bug: 12687968

Change-Id: I47e98c3e258829d2ba0babd803a219c82a36168c
Test: test-art-host, debug N6P booting with baker CC.

7 years agoMerge "ART: Remove vestiges of GCC" am: 8aea8dbca6 am: 897b8f5da9
Andreas Gampe [Wed, 24 Aug 2016 17:28:16 +0000 (17:28 +0000)]
Merge "ART: Remove vestiges of GCC" am: 8aea8dbca6 am: 897b8f5da9
am: 5775f988b0

Change-Id: I6a722e202cc6ab7b79486b6b42eb702a140b0bdd

7 years agoMerge "ART: Remove vestiges of GCC" am: 8aea8dbca6
Andreas Gampe [Wed, 24 Aug 2016 17:25:15 +0000 (17:25 +0000)]
Merge "ART: Remove vestiges of GCC" am: 8aea8dbca6
am: 897b8f5da9

Change-Id: I0120a0b4a5ab20e5b185171c2ca3dcb481dc6ad7

7 years agoMerge "ART: Remove vestiges of GCC"
Andreas Gampe [Wed, 24 Aug 2016 17:21:18 +0000 (17:21 +0000)]
Merge "ART: Remove vestiges of GCC"
am: 8aea8dbca6

Change-Id: I6bf7a971949ccbc0aa2d008a1264c7f3c880b9fb

7 years agoMerge "ART: Remove vestiges of GCC"
Treehugger Robot [Wed, 24 Aug 2016 17:09:42 +0000 (17:09 +0000)]
Merge "ART: Remove vestiges of GCC"

7 years agoRevert "Revert "Use try lock to fix class resolution race"" am: 23da026ec7
Mathieu Chartier [Wed, 24 Aug 2016 16:50:03 +0000 (16:50 +0000)]
Revert "Revert "Use try lock to fix class resolution race"" am: 23da026ec7
am: 4d6ad96cc0

Change-Id: I4e3d9b874d7eb3aef2bdbfc85ed8712601938519

7 years agoRevert "Use try lock to fix class resolution race" am: adc538a57a
Mathieu Chartier [Wed, 24 Aug 2016 16:49:43 +0000 (16:49 +0000)]
Revert "Use try lock to fix class resolution race" am: adc538a57a
am: 1f678c0b95  -s ours

Change-Id: Ieae39f6019669a0a5c17e2714261ab54a4e2aab6

7 years agoUse try lock to fix class resolution race am: 1386f8619b
Mathieu Chartier [Wed, 24 Aug 2016 16:44:12 +0000 (16:44 +0000)]
Use try lock to fix class resolution race am: 1386f8619b
am: 43f36646a9  -s ours

Change-Id: Ifd4182a3b0dd2f95edf0d745e7be9d7e390b93f6

7 years agoRevert "Revert "Use try lock to fix class resolution race""
Mathieu Chartier [Wed, 24 Aug 2016 16:36:42 +0000 (16:36 +0000)]
Revert "Revert "Use try lock to fix class resolution race""
am: 23da026ec7

Change-Id: Icc27f56679886cddbacdd2fcb198bdeeafdd1904

7 years agoRevert "Use try lock to fix class resolution race"
Mathieu Chartier [Wed, 24 Aug 2016 16:36:37 +0000 (16:36 +0000)]
Revert "Use try lock to fix class resolution race"
am: adc538a57a

Change-Id: I5dc4f5291800c124beed080e46bfee437b40669b

7 years agoUse try lock to fix class resolution race
Mathieu Chartier [Wed, 24 Aug 2016 16:36:32 +0000 (16:36 +0000)]
Use try lock to fix class resolution race
am: 1386f8619b

Change-Id: Ic196684640f2bad1b24837bdefd902305b4eb785

7 years agoMerge "Revert "Revert "x86/x86-64: Avoid temporary for read barrier field load."...
Vladimir Marko [Wed, 24 Aug 2016 14:03:35 +0000 (14:03 +0000)]
Merge "Revert "Revert "x86/x86-64: Avoid temporary for read barrier field load.""" am: 7c95b4e228 am: 95492ed21e
am: aa26911e4c

Change-Id: I885418a2c1c0956e3eae9280c9a39369e082f633

7 years agoMerge "Revert "Fix debugger calling new String()."" am: f91b5f3372 am: 431432dade
Nicolas Geoffray [Wed, 24 Aug 2016 14:03:34 +0000 (14:03 +0000)]
Merge "Revert "Fix debugger calling new String()."" am: f91b5f3372 am: 431432dade
am: f0cf72f7c9

Change-Id: I96f9b1f1f7fa6de618af1c423555a4f22c790e8b

7 years agoMerge "Revert "Fix debugger missing handle between adding and tagging object."" am...
Nicolas Geoffray [Wed, 24 Aug 2016 14:03:32 +0000 (14:03 +0000)]
Merge "Revert "Fix debugger missing handle between adding and tagging object."" am: 85f692bc43 am: 7c075399f1
am: 435a144c54

Change-Id: I7df4305556b4f9331e60d35c2dc70f423c9a1b0b

7 years agoMerge "Revert "Revert "x86/x86-64: Avoid temporary for read barrier field load."...
Vladimir Marko [Wed, 24 Aug 2016 14:01:06 +0000 (14:01 +0000)]
Merge "Revert "Revert "x86/x86-64: Avoid temporary for read barrier field load.""" am: 7c95b4e228
am: 95492ed21e

Change-Id: I75a889dfad9bd754a428c8813047aedffeab2474

7 years agoMerge "Revert "Fix debugger calling new String()."" am: f91b5f3372
Nicolas Geoffray [Wed, 24 Aug 2016 14:01:04 +0000 (14:01 +0000)]
Merge "Revert "Fix debugger calling new String()."" am: f91b5f3372
am: 431432dade

Change-Id: Ic040b381e7a031b1f5651b12fd8b96f9f1ebc958

7 years agoMerge "Revert "Fix debugger missing handle between adding and tagging object."" am...
Nicolas Geoffray [Wed, 24 Aug 2016 14:01:02 +0000 (14:01 +0000)]
Merge "Revert "Fix debugger missing handle between adding and tagging object."" am: 85f692bc43
am: 7c075399f1

Change-Id: Ideef0df1c6ff3fdc824d896a9a6f791d75736578

7 years agoMerge "Revert "Revert "x86/x86-64: Avoid temporary for read barrier field load."""
Vladimir Marko [Wed, 24 Aug 2016 13:56:50 +0000 (13:56 +0000)]
Merge "Revert "Revert "x86/x86-64: Avoid temporary for read barrier field load."""
am: 7c95b4e228

Change-Id: I190029aa010e53193f2212bd539462664bddbe4d

7 years agoMerge "Revert "Fix debugger calling new String().""
Nicolas Geoffray [Wed, 24 Aug 2016 13:56:33 +0000 (13:56 +0000)]
Merge "Revert "Fix debugger calling new String().""
am: f91b5f3372

Change-Id: Ie1103da43144d9bfadbd56dcb6f83b219ea0d012

7 years agoMerge "Revert "Fix debugger missing handle between adding and tagging object.""
Nicolas Geoffray [Wed, 24 Aug 2016 13:56:29 +0000 (13:56 +0000)]
Merge "Revert "Fix debugger missing handle between adding and tagging object.""
am: 85f692bc43

Change-Id: I25274033c55726076f6507b1a5405b847b675e88

7 years agoMerge "Revert "Revert "x86/x86-64: Avoid temporary for read barrier field load."""
Treehugger Robot [Wed, 24 Aug 2016 13:49:04 +0000 (13:49 +0000)]
Merge "Revert "Revert "x86/x86-64: Avoid temporary for read barrier field load."""

7 years agoMerge "Revert "Fix debugger calling new String().""
Nicolas Geoffray [Wed, 24 Aug 2016 13:48:47 +0000 (13:48 +0000)]
Merge "Revert "Fix debugger calling new String().""

7 years agoMerge "Revert "Fix debugger missing handle between adding and tagging object.""
Nicolas Geoffray [Wed, 24 Aug 2016 13:48:08 +0000 (13:48 +0000)]
Merge "Revert "Fix debugger missing handle between adding and tagging object.""

7 years agoRevert "Fix debugger missing handle between adding and tagging object."
Nicolas Geoffray [Wed, 24 Aug 2016 13:40:41 +0000 (13:40 +0000)]
Revert "Fix debugger missing handle between adding and tagging object."

Bug: 30951794

This reverts commit 9e0878494cdacd0877a1614041efc38ebb053017.

Change-Id: I3fe1c7e466ae25a81cd37ee5a4aacb40b55686a1

7 years agoRevert "Fix debugger calling new String()."
Nicolas Geoffray [Wed, 24 Aug 2016 13:39:08 +0000 (13:39 +0000)]
Revert "Fix debugger calling new String()."

Bug: 30951794

This reverts commit f15ec05896ddc5fec1f224ef97bdfebb72b5a855.

Change-Id: Ie7fc565159a19a19a269099f21db833d470aef7c

7 years agoMerge "Fix for package name test break in ART" am: 66e7ba24b7 am: e7af3cd604
Neil Fuller [Wed, 24 Aug 2016 13:28:29 +0000 (13:28 +0000)]
Merge "Fix for package name test break in ART" am: 66e7ba24b7 am: e7af3cd604
am: 12b5de59c0

Change-Id: I1eb5bdc1914efd3c50da404cfebd41c0ff3588bf

7 years agoMerge "Fix for package name test break in ART" am: 66e7ba24b7
Neil Fuller [Wed, 24 Aug 2016 13:25:29 +0000 (13:25 +0000)]
Merge "Fix for package name test break in ART" am: 66e7ba24b7
am: e7af3cd604

Change-Id: I9eb2c4e7e185f6468d06d7d6d4bc363b42a283ca

7 years agoMerge "Fix for package name test break in ART"
Neil Fuller [Wed, 24 Aug 2016 13:23:27 +0000 (13:23 +0000)]
Merge "Fix for package name test break in ART"
am: 66e7ba24b7

Change-Id: I2e68378a2be69da62a717026515b6fbc5cfab615

7 years agoMerge "Fix for package name test break in ART"
Neil Fuller [Wed, 24 Aug 2016 13:14:19 +0000 (13:14 +0000)]
Merge "Fix for package name test break in ART"

7 years agoFix for package name test break in ART
Neil Fuller [Wed, 24 Aug 2016 12:57:23 +0000 (13:57 +0100)]
Fix for package name test break in ART

Modifying the hard-coded string in test 031.

Bug: 28131225
Test: run-test --host 031-class-attributes
Change-Id: Ifffaebd5b8595075fcde295a6e3921af99871f9d

7 years agoRevert "Revert "x86/x86-64: Avoid temporary for read barrier field load.""
Vladimir Marko [Wed, 24 Aug 2016 08:30:46 +0000 (08:30 +0000)]
Revert "Revert "x86/x86-64: Avoid temporary for read barrier field load.""

Fixed the fault handler recognizing the TEST instruction and
fault address within the lock word. Added tests to 439-npe.

Bug: 29966877
Bug: 12687968
Test: Tested with ART_USE_READ_BARRIER=true on host.
Test: Tested with ART_USE_READ_BARRIER=true ART_HEAP_POISONING=true on host.

This reverts commit ccf15bca330f9a23337b1a4b5850f7fcc6c1bf15.

Change-Id: I8990def5f719c9205bf6e5fdba32027fa82bec50

7 years agoMerge "ART: unblock compiler tests on MIPS" am: c31ba109d5 am: dcb970b788
Alexey Frunze [Wed, 24 Aug 2016 10:16:16 +0000 (10:16 +0000)]
Merge "ART: unblock compiler tests on MIPS" am: c31ba109d5 am: dcb970b788
am: b16e5e554c

Change-Id: Idaf5b944b5764d91b1f08a29f2169c135cac0576

7 years agoMerge "ART: unblock compiler tests on MIPS" am: c31ba109d5
Alexey Frunze [Wed, 24 Aug 2016 10:13:46 +0000 (10:13 +0000)]
Merge "ART: unblock compiler tests on MIPS" am: c31ba109d5
am: dcb970b788

Change-Id: I15fcf33bcd15d79babad9b5519877aacaebf5658

7 years agoMerge "ART: unblock compiler tests on MIPS"
Alexey Frunze [Wed, 24 Aug 2016 10:11:43 +0000 (10:11 +0000)]
Merge "ART: unblock compiler tests on MIPS"
am: c31ba109d5

Change-Id: I72ec401ed09c411c3933137a901a9aa24ca3c730

7 years agoMerge "ART: unblock compiler tests on MIPS"
Treehugger Robot [Wed, 24 Aug 2016 09:58:59 +0000 (09:58 +0000)]
Merge "ART: unblock compiler tests on MIPS"

7 years agoART: unblock compiler tests on MIPS
Alexey Frunze [Wed, 24 Aug 2016 06:42:54 +0000 (23:42 -0700)]
ART: unblock compiler tests on MIPS

The DCHECK() that's removed here causes most of compiler tests to
fail on MIPS. The issue is introduced with the recent changes in
the string dex cache.

Test: booted MIPS32 in QEMU
Test: test-art-target-run-test-optimizing on CI20

Change-Id: I7fd45fa0b6d64fbc553f6aeaa6dac7345c885fe4

7 years agoMerge "ART: Remove -std=gnu++11" am: c67d22ac6d am: b1da09c40b
Andreas Gampe [Wed, 24 Aug 2016 05:17:27 +0000 (05:17 +0000)]
Merge "ART: Remove -std=gnu++11" am: c67d22ac6d am: b1da09c40b
am: d9733a9a67

Change-Id: Ic7e7b9068b5c7df951132f5fb5472918661dd1ce

7 years agoMerge "ART: Remove -std=gnu++11" am: c67d22ac6d
Andreas Gampe [Wed, 24 Aug 2016 05:14:57 +0000 (05:14 +0000)]
Merge "ART: Remove -std=gnu++11" am: c67d22ac6d
am: b1da09c40b

Change-Id: I681c0336bd30c2086f6be5c91b9eaa3d33fc4503

7 years agoMerge "ART: Remove -std=gnu++11"
Andreas Gampe [Wed, 24 Aug 2016 05:10:23 +0000 (05:10 +0000)]
Merge "ART: Remove -std=gnu++11"
am: c67d22ac6d

Change-Id: I2f25500995f5338ffaa593afc1f278bdcf0305b9

7 years agoMerge "ART: Remove -std=gnu++11"
Treehugger Robot [Wed, 24 Aug 2016 05:04:32 +0000 (05:04 +0000)]
Merge "ART: Remove -std=gnu++11"

7 years agoART: Remove -std=gnu++11
Andreas Gampe [Wed, 24 Aug 2016 03:24:11 +0000 (20:24 -0700)]
ART: Remove -std=gnu++11

We no longer have to restrict ourselves, with GCC gone. Pick up
the default from the build system (which is at least as good).

Change-Id: I98b4a82944b7e16a80fbeac1d43c9e7ed0d17a6a
Test: m test-art-host

7 years agoMerge "Revert "Make dchecked_vector C++11 compatible."" am: 9f98286cf2 am: 285b2b6998
Andreas Gampe [Wed, 24 Aug 2016 03:14:20 +0000 (03:14 +0000)]
Merge "Revert "Make dchecked_vector C++11 compatible."" am: 9f98286cf2 am: 285b2b6998
am: c55d1aec1f

Change-Id: I59ab9a16478eb5ccb534fffcfe42fe2a7d697814

7 years agoMerge "ART: Improve art_quick_resolve_string for x86." am: 2ccdfbbf78 am: c5817d4703
Christina Wadsworth [Wed, 24 Aug 2016 03:14:19 +0000 (03:14 +0000)]
Merge "ART: Improve art_quick_resolve_string for x86." am: 2ccdfbbf78 am: c5817d4703
am: ea71105ea3

Change-Id: I3f9a20c5ec71c7af533c169b254c8e07fabfa745

7 years agoMerge "Revert "Make dchecked_vector C++11 compatible."" am: 9f98286cf2
Andreas Gampe [Wed, 24 Aug 2016 03:11:20 +0000 (03:11 +0000)]
Merge "Revert "Make dchecked_vector C++11 compatible."" am: 9f98286cf2
am: 285b2b6998

Change-Id: I9f42b3d3731a6754d8991ababe8aa634efd0a578

7 years agoMerge "ART: Improve art_quick_resolve_string for x86." am: 2ccdfbbf78
Christina Wadsworth [Wed, 24 Aug 2016 03:11:20 +0000 (03:11 +0000)]
Merge "ART: Improve art_quick_resolve_string for x86." am: 2ccdfbbf78
am: c5817d4703

Change-Id: I5353b748733a722538f739f1b036fe6d1fb09fb2

7 years agoMerge "Revert "Make dchecked_vector C++11 compatible.""
Andreas Gampe [Wed, 24 Aug 2016 03:07:22 +0000 (03:07 +0000)]
Merge "Revert "Make dchecked_vector C++11 compatible.""
am: 9f98286cf2

Change-Id: I949f452b4958e7a7d731746fb87f29dacd257cbb

7 years agoMerge "ART: Improve art_quick_resolve_string for x86."
Christina Wadsworth [Wed, 24 Aug 2016 03:07:18 +0000 (03:07 +0000)]
Merge "ART: Improve art_quick_resolve_string for x86."
am: 2ccdfbbf78

Change-Id: If03a4d9a70b55794a50e4348e4bb50f90f6f13cd

7 years agoMerge "Revert "Make dchecked_vector C++11 compatible.""
Treehugger Robot [Wed, 24 Aug 2016 03:01:49 +0000 (03:01 +0000)]
Merge "Revert "Make dchecked_vector C++11 compatible.""

7 years agoMerge "ART: Improve art_quick_resolve_string for x86."
Treehugger Robot [Wed, 24 Aug 2016 02:57:47 +0000 (02:57 +0000)]
Merge "ART: Improve art_quick_resolve_string for x86."

7 years agoMerge "ART: Improve art_quick_resolve_string for x86_64." am: 47ec97259f am: c92baefd48
Christina Wadsworth [Wed, 24 Aug 2016 01:39:12 +0000 (01:39 +0000)]
Merge "ART: Improve art_quick_resolve_string for x86_64." am: 47ec97259f am: c92baefd48
am: 5ba6cfe46c

Change-Id: Ib808859912e344606129bf18da7b54077ac378ff

7 years agoMerge "ART: Improve art_quick_resolve_string for x86_64." am: 47ec97259f
Christina Wadsworth [Wed, 24 Aug 2016 01:35:42 +0000 (01:35 +0000)]
Merge "ART: Improve art_quick_resolve_string for x86_64." am: 47ec97259f
am: c92baefd48

Change-Id: I36f2e819947cfd616d22145e945ac2b8a4c19fcc

7 years agoMerge "ART: Improve art_quick_resolve_string for x86_64."
Christina Wadsworth [Wed, 24 Aug 2016 01:31:38 +0000 (01:31 +0000)]
Merge "ART: Improve art_quick_resolve_string for x86_64."
am: 47ec97259f

Change-Id: I6326ea542984ad7d5f93d4eaadef3793f07ac87a

7 years agoRevert "Make dchecked_vector C++11 compatible."
Andreas Gampe [Wed, 24 Aug 2016 01:24:51 +0000 (01:24 +0000)]
Revert "Make dchecked_vector C++11 compatible."

We no longer support GCC in ART.

This reverts commit 05ff5a4ad666d9eb583ff343c1cbba886d7621b1.

Bug: 25022512
Change-Id: Ie0aee5ce3f8b5bb5023fba90c39d96ae01e3e256
Test: m test-art-host

7 years agoMerge "ART: Improve art_quick_resolve_string for x86_64."
Treehugger Robot [Wed, 24 Aug 2016 01:22:01 +0000 (01:22 +0000)]
Merge "ART: Improve art_quick_resolve_string for x86_64."

7 years agoART: Remove vestiges of GCC
Andreas Gampe [Wed, 24 Aug 2016 00:35:19 +0000 (17:35 -0700)]
ART: Remove vestiges of GCC

We no longer support GCC.

Change-Id: I869ac6e5dcb166747e45236a0d313c7672bbf2de
Test: m test-art-host