OSDN Git Service
Nicolas Geoffray [Fri, 7 Oct 2016 08:52:01 +0000 (08:52 +0000)]
Merge "Blacklist test 903." am:
2dacb1da03
am:
22ab7a89cb
Change-Id: Ifc41ca1855ef107525c51510d5eac76b201af836
Nicolas Geoffray [Fri, 7 Oct 2016 08:48:01 +0000 (08:48 +0000)]
Merge "Blacklist test 903."
am:
2dacb1da03
Change-Id: Iaac0e6471def2421dca5b77cb4d947389b8195cb
Nicolas Geoffray [Fri, 7 Oct 2016 08:41:37 +0000 (08:41 +0000)]
Merge "Blacklist test 903."
Nicolas Geoffray [Fri, 7 Oct 2016 08:29:20 +0000 (09:29 +0100)]
Blacklist test 903.
bug:
31681198
Change-Id: I2d5578242d594be791aedd99266263ec53182d77
Mathieu Chartier [Fri, 7 Oct 2016 00:41:06 +0000 (00:41 +0000)]
Merge "Move remaining jobject related functions to use ObjPtr" am:
81ca05d930
am:
9a160f64c9
Change-Id: I8a0fa5a09032d5dc701f294df3ceaff6751e095c
Mathieu Chartier [Fri, 7 Oct 2016 00:37:35 +0000 (00:37 +0000)]
Merge "Move remaining jobject related functions to use ObjPtr"
am:
81ca05d930
Change-Id: Ic7e25af0f020ab4d0a33aa9b06596602ed428908
Mathieu Chartier [Fri, 7 Oct 2016 00:31:27 +0000 (00:31 +0000)]
Merge "Move remaining jobject related functions to use ObjPtr"
Andreas Gampe [Thu, 6 Oct 2016 22:35:56 +0000 (22:35 +0000)]
Merge "ART: Register object tagging table" am:
a2dca22534
am:
adf7b717d6
Change-Id: I3db3bb0c55a88a8771342f4d21c145dc7cd22fec
Andreas Gampe [Thu, 6 Oct 2016 22:31:56 +0000 (22:31 +0000)]
Merge "ART: Register object tagging table"
am:
a2dca22534
Change-Id: Ia95c94f63a7f8468588d45951e08279cb2ecfef2
Andreas Gampe [Thu, 6 Oct 2016 22:26:42 +0000 (22:26 +0000)]
Merge "ART: Register object tagging table"
Mathieu Chartier [Thu, 6 Oct 2016 01:32:08 +0000 (18:32 -0700)]
Move remaining jobject related functions to use ObjPtr
Also added ObjPtr::DownCast.
Bug:
31113334
Test: test-art-host
Change-Id: I59c253211dc435579ffdfd49f856861ab13d262c
Andreas Gampe [Thu, 6 Oct 2016 20:13:30 +0000 (13:13 -0700)]
ART: Register object tagging table
Actually register object tagging table with the runtime so it
gets swept properly.
Bug:
31385027
Test: m test-art-host
Test: m ART_USE_READ_BARRIER=true test-art-host
Change-Id: I4364458ece2893e6a85fe7518df39fb838199f20
Igor Murashkin [Thu, 6 Oct 2016 19:33:44 +0000 (19:33 +0000)]
Merge "test: Fix jni_compiler_test for const correctness" am:
2b31c0ac03
am:
c64c485078
Change-Id: I1009714d699b3b4cba0ac2ade3085d3007d51d1d
Igor Murashkin [Thu, 6 Oct 2016 19:30:45 +0000 (19:30 +0000)]
Merge "test: Fix jni_compiler_test for const correctness"
am:
2b31c0ac03
Change-Id: Ib428bf1ad3bb99723caba8c932c6912bf4b5024a
Treehugger Robot [Thu, 6 Oct 2016 19:27:59 +0000 (19:27 +0000)]
Merge "test: Fix jni_compiler_test for const correctness"
Mathieu Chartier [Thu, 6 Oct 2016 18:31:09 +0000 (18:31 +0000)]
Merge "Allow early abort logging" am:
18f7de841f
am:
af1f4c92a4
Change-Id: I71139a1ef20b53b0cdb572cdb3feed114633c5b0
Andreas Gampe [Thu, 6 Oct 2016 18:30:55 +0000 (18:30 +0000)]
Merge "ART: Support object tagging" am:
83805a2c02
am:
ae54c0ed55
Change-Id: I811150e2a0817466f387d562b4f1292d63c3a7c1
Mathieu Chartier [Thu, 6 Oct 2016 18:30:42 +0000 (18:30 +0000)]
Merge "ObjPtr misc cleanup" am:
db8eed0fa5
am:
54fa4375d3
Change-Id: Idbf9406cbffa721294d45351ee6ab862a7917ad5
Mathieu Chartier [Thu, 6 Oct 2016 18:27:40 +0000 (18:27 +0000)]
Merge "Allow early abort logging"
am:
18f7de841f
Change-Id: I440edc8dcf2daa1a6eea1e9c2beb674d5d0160f7
Andreas Gampe [Thu, 6 Oct 2016 18:27:26 +0000 (18:27 +0000)]
Merge "ART: Support object tagging"
am:
83805a2c02
Change-Id: I9b5e8d52f20c97508e74642cc3f5fa2c5f0c42a2
Mathieu Chartier [Thu, 6 Oct 2016 18:27:11 +0000 (18:27 +0000)]
Merge "ObjPtr misc cleanup"
am:
db8eed0fa5
Change-Id: I819d4147416c486ae1b2e35585f72a798a29dfe4
Treehugger Robot [Thu, 6 Oct 2016 18:24:19 +0000 (18:24 +0000)]
Merge "Allow early abort logging"
Treehugger Robot [Thu, 6 Oct 2016 18:24:03 +0000 (18:24 +0000)]
Merge "ART: Support object tagging"
Treehugger Robot [Thu, 6 Oct 2016 18:22:32 +0000 (18:22 +0000)]
Merge "ObjPtr misc cleanup"
Igor Murashkin [Thu, 6 Oct 2016 17:51:11 +0000 (10:51 -0700)]
test: Fix jni_compiler_test for const correctness
Change-Id: Id0ea8f18f8fac3cf884a43a2ae6448bb0221209a
Hiroshi Yamauchi [Thu, 6 Oct 2016 17:32:08 +0000 (17:32 +0000)]
Merge "Temporarily add debug logging for b/
31357497" am:
54aaba2420
am:
75034cdde3
Change-Id: I0b5f925a90f986418c7b681b3e41bb433ebc6b38
Hiroshi Yamauchi [Thu, 6 Oct 2016 17:29:07 +0000 (17:29 +0000)]
Merge "Temporarily add debug logging for b/
31357497"
am:
54aaba2420
Change-Id: I3f2741c058832f413fa28f1ef342f1a8f13ce6df
Hiroshi Yamauchi [Thu, 6 Oct 2016 17:19:17 +0000 (17:19 +0000)]
Merge "Temporarily add debug logging for b/
31357497"
Neil Fuller [Thu, 6 Oct 2016 09:03:08 +0000 (09:03 +0000)]
Merge "Revert "Blacklist flaky test."" am:
6e9854e4df
am:
cea79bb3e8
Change-Id: I0e4f5181717a03de5316ff8859cd27a7efae6abf
Neil Fuller [Thu, 6 Oct 2016 08:59:37 +0000 (08:59 +0000)]
Merge "Revert "Blacklist flaky test.""
am:
6e9854e4df
Change-Id: I42572b4eb6f2fc4b33121896ae63b45b42d428db
Neil Fuller [Thu, 6 Oct 2016 08:55:03 +0000 (08:55 +0000)]
Merge "Revert "Blacklist flaky test.""
Neil Fuller [Thu, 6 Oct 2016 08:40:07 +0000 (08:40 +0000)]
Revert "Blacklist flaky test."
Reverts the blacklisting of NetworkSecurityPolicyTest
#testCleartextTrafficPolicyWithJarHttpURLConnection.
This reverts commit
71ceb721240d50d396ea1a61a2bf2832be345007.
Bug:
31944681
Change-Id: Ib0f13cfec021e258ceba480c43cced59c554b3f5
Hiroshi Yamauchi [Thu, 6 Oct 2016 03:06:14 +0000 (03:06 +0000)]
Merge "Fix a deadlock between thread flip and suspend request." am:
81c6c8e6de
am:
d33bd5f68c
Change-Id: I813558eff9ca2ac09507f80cc77e96d6d0e3f922
Hiroshi Yamauchi [Thu, 6 Oct 2016 03:03:15 +0000 (03:03 +0000)]
Merge "Fix a deadlock between thread flip and suspend request."
am:
81c6c8e6de
Change-Id: I828a59ecc430d1371355cdcb5e95b5eb4b5e8674
Treehugger Robot [Thu, 6 Oct 2016 02:57:57 +0000 (02:57 +0000)]
Merge "Fix a deadlock between thread flip and suspend request."
Mathieu Chartier [Wed, 5 Oct 2016 21:12:45 +0000 (14:12 -0700)]
Allow early abort logging
Print unattached threads with native stack traces for early abort.
Bug:
31855501
Test: test-art-host -j32
Test: thread_list_->Dump in Runtime::Start.
Change-Id: I5364625e798356c4fa1f88a8c646e374e59d93b0
Jeff Hao [Thu, 6 Oct 2016 01:21:10 +0000 (01:21 +0000)]
Merge "Revert "Revert "Add dex file writer to dexlayout tool.""" am:
765dee21f3
am:
6449dd7204
Change-Id: I25418a101bbb4fd15a03bbf8e27d08bc63da7e68
Jeff Hao [Thu, 6 Oct 2016 01:17:38 +0000 (01:17 +0000)]
Merge "Revert "Revert "Add dex file writer to dexlayout tool."""
am:
765dee21f3
Change-Id: I41b548c0ca1b1f1b412aafadf6dc5d9006d645da
Hiroshi Yamauchi [Thu, 6 Oct 2016 01:13:23 +0000 (18:13 -0700)]
Temporarily add debug logging for b/
31357497
Note the check can't be a DCHECK because 103-string-append runs with the
non-debug build (libart.so).
Bug:
31357497
Bug:
12687968
Test: run-test 103-string-append on N9.
Change-Id: I30ebe9111fa6c42796dcafa182ae066214805173
Treehugger Robot [Thu, 6 Oct 2016 01:12:23 +0000 (01:12 +0000)]
Merge "Revert "Revert "Add dex file writer to dexlayout tool."""
Hiroshi Yamauchi [Mon, 3 Oct 2016 22:32:01 +0000 (15:32 -0700)]
Fix a deadlock between thread flip and suspend request.
See
31683379#9 for the deadlock scenario.
Make ModifySuspendCount(+1) retry if the thread flip function is set.
Bug:
31683379
Bug:
12687968
Test: test-art, N9 libartd boot, Ritz EAAC with CC.
Test: 129-GetThreadId with gcstress and CC.
Change-Id: Id5cdfcd90a08a2ff497f9f0e2842fa4c613549bc
Igor Murashkin [Wed, 5 Oct 2016 23:49:02 +0000 (23:49 +0000)]
Merge "jni: Test that pushed handle scopes are popped after JNI transitions" am:
30267ea042
am:
15912e9d0c
Change-Id: Ib692e0f5b962cb3a14d1c6a0625288e84ef74510
Igor Murashkin [Wed, 5 Oct 2016 23:46:32 +0000 (23:46 +0000)]
Merge "jni: Test that pushed handle scopes are popped after JNI transitions"
am:
30267ea042
Change-Id: Ic422b92661e7fe4fee9e9c13ae450850c0744548
Treehugger Robot [Wed, 5 Oct 2016 23:41:27 +0000 (23:41 +0000)]
Merge "jni: Test that pushed handle scopes are popped after JNI transitions"
Mathieu Chartier [Wed, 5 Oct 2016 23:41:02 +0000 (23:41 +0000)]
Merge "Change java_lang_reflect_Field.cc to use ObjPtr" am:
6206a5d523
am:
d3b604f0c3
Change-Id: I643c6d38e2bf245cb0a6774db985e6ef334d20fc
Mathieu Chartier [Wed, 5 Oct 2016 23:38:01 +0000 (23:38 +0000)]
Merge "Change java_lang_reflect_Field.cc to use ObjPtr"
am:
6206a5d523
Change-Id: I83eac899d4bb2d8230312fdb073fc1779db82265
Treehugger Robot [Wed, 5 Oct 2016 23:32:05 +0000 (23:32 +0000)]
Merge "Change java_lang_reflect_Field.cc to use ObjPtr"
Mathieu Chartier [Wed, 5 Oct 2016 22:56:52 +0000 (15:56 -0700)]
ObjPtr misc cleanup
Check for subtypes in constructor.
Remove various calls to MakeObjPtr and ObjPtr::Ptr.
Bug:
31113334
Test: test-art-host
Change-Id: I8d680d514ea52cd64fc4f7c2e988926bc726174e
Mathieu Chartier [Wed, 5 Oct 2016 20:48:41 +0000 (13:48 -0700)]
Change java_lang_reflect_Field.cc to use ObjPtr
Also deleted some calls to ObjPtr::Ptr and fixed formatting.
Bug:
31113334
Test: test-art-host
Change-Id: I951b80886b723e1beff4783f28ee7c928cb10650
Mathieu Chartier [Wed, 5 Oct 2016 22:03:26 +0000 (22:03 +0000)]
Merge "Change indirect reference table to use ObjPtr" am:
463a67dd60
am:
22316a1570
Change-Id: I7c7b64fa33ff1805627408a821e2ed0c9c25e8b2
Mathieu Chartier [Wed, 5 Oct 2016 22:00:55 +0000 (22:00 +0000)]
Merge "Change indirect reference table to use ObjPtr"
am:
463a67dd60
Change-Id: Id1faabb203c6885d873acd0515a1dbaf68915334
Treehugger Robot [Wed, 5 Oct 2016 21:55:20 +0000 (21:55 +0000)]
Merge "Change indirect reference table to use ObjPtr"
Igor Murashkin [Wed, 5 Oct 2016 21:33:30 +0000 (14:33 -0700)]
jni: Test that pushed handle scopes are popped after JNI transitions
There was previously a bug in generic JNI for @CriticalNative where new
handle scopes were pushed, but then not popped after the native call
was done. This caused a bug with stale pointers being found by GC.
Bug:
31933313
Change-Id: I423f9e7a7d391ba3a4771c830691931f0025b354
Aart Bik [Wed, 5 Oct 2016 20:36:50 +0000 (20:36 +0000)]
Merge "Refactoring of graph linearization and linear order." am:
78c6fefdb9
am:
ac2065c9a3
Change-Id: Ic2fc38ace9dcb4c0ac0c1e27ba79f34611c98373
Aart Bik [Wed, 5 Oct 2016 20:34:20 +0000 (20:34 +0000)]
Merge "Refactoring of graph linearization and linear order."
am:
78c6fefdb9
Change-Id: I15ebff4861446000918e11a85972708b9a47ab09
Treehugger Robot [Wed, 5 Oct 2016 20:29:58 +0000 (20:29 +0000)]
Merge "Refactoring of graph linearization and linear order."
Mathieu Chartier [Wed, 5 Oct 2016 20:06:20 +0000 (20:06 +0000)]
Merge "Initialize dex cache while holding dex_lock" am:
7638651be2
am:
0a881d4341
Change-Id: I4c89b4d7c6db27dcb26d376609a7867e68fe8305
Mathieu Chartier [Wed, 5 Oct 2016 20:03:47 +0000 (20:03 +0000)]
Merge "Initialize dex cache while holding dex_lock"
am:
7638651be2
Change-Id: I067b023de98cc6d559437f01339ef814ca9fadde
Mathieu Chartier [Wed, 5 Oct 2016 02:06:30 +0000 (19:06 -0700)]
Change indirect reference table to use ObjPtr
Bug:
31113334
Test: test-art-host
Change-Id: I340fdf430897ebd790ea4e35f94bcee776e98445
Mathieu Chartier [Wed, 5 Oct 2016 19:59:08 +0000 (19:59 +0000)]
Merge "Initialize dex cache while holding dex_lock"
Andreas Gampe [Tue, 13 Sep 2016 02:58:13 +0000 (19:58 -0700)]
ART: Support object tagging
Add support for tagging in the JVMTI plugin.
Bug:
31385027
Test: m test-art-host
Change-Id: I4d8fb12cd23ca60dc0b0ce9051d1c77e5eb18aa9
Aart Bik [Wed, 5 Oct 2016 00:33:56 +0000 (17:33 -0700)]
Refactoring of graph linearization and linear order.
Rationale:
Ownership of graph's linear order and iterators was
a bit unclear now that other phases are using it.
New approach allows phases to compute their own
order, while ssa_liveness is sole owner for graph
(since it is not mutated afterwards).
Also shortens lifetime of loop's arena.
Test: test-art-host
Change-Id: Ib7137d1203a1e0a12db49868f4117d48a4277f30
Mathieu Chartier [Wed, 5 Oct 2016 18:27:40 +0000 (18:27 +0000)]
Merge "Don't push handle scope for critical native generic JNI" am:
cf42ad62df
am:
2b5f912538
Change-Id: Ia2ce952cae1f906fe75e99cb5316a1f519366a5b
Mathieu Chartier [Wed, 5 Oct 2016 18:25:10 +0000 (18:25 +0000)]
Merge "Don't push handle scope for critical native generic JNI"
am:
cf42ad62df
Change-Id: Icc0c28b73311cd864204d955e2dce209d3232288
Treehugger Robot [Wed, 5 Oct 2016 18:19:36 +0000 (18:19 +0000)]
Merge "Don't push handle scope for critical native generic JNI"
Vladimir Marko [Wed, 5 Oct 2016 17:07:07 +0000 (17:07 +0000)]
Merge "Remove #include "oat_file.h" from class_linker.h ." am:
2f61867045
am:
6622934a0a
Change-Id: Ifd187a18923c661a47570cb45c205dab712bc060
Vladimir Marko [Wed, 5 Oct 2016 17:04:05 +0000 (17:04 +0000)]
Merge "Remove #include "oat_file.h" from class_linker.h ."
am:
2f61867045
Change-Id: Ieb002dddb7408806db914e7c81f521a45e1452f3
Vladimir Marko [Wed, 5 Oct 2016 17:00:41 +0000 (17:00 +0000)]
Merge "Remove #include "oat_file.h" from class_linker.h ."
Mathieu Chartier [Tue, 4 Oct 2016 22:41:42 +0000 (15:41 -0700)]
Don't push handle scope for critical native generic JNI
Leaving a stale handle scope causes problems for the GC the next
time roots are visited. At this point the stack will have other
contents and the GC will attempt to mark many invalid roots.
Bug:
31933313
Test: non preopt eng build booting.
Test: test-art-host
(cherry picked from commit
92879f9bbcfc034660ed1ff5ef741d7f2bcb116f)
Change-Id: I7d57964ccd2b59a05bb06f67062f646362ce1204
Mathieu Chartier [Thu, 15 Sep 2016 17:24:43 +0000 (10:24 -0700)]
Initialize dex cache while holding dex_lock
Fixes multiple threads calling RegisterDexFile occasionally getting
DCHECK failures due to the arrays not being null since the BSS ones
is per dex file.
Bug:
31369621
Test: test-art-host, no DCHECK failure during debug booting
Change-Id: I7b6e4cd03460dd1213eb4e044bdcf5f6103fd5f9
Nicolas Geoffray [Wed, 5 Oct 2016 16:11:00 +0000 (16:11 +0000)]
Merge "Make it possible to pass an arena allocator to HLoopOptimization." am:
4aa6a93c46
am:
cb4ea84388
Change-Id: Ib13aebaed943217800ee0f22e675a23df70fba7b
Nicolas Geoffray [Wed, 5 Oct 2016 16:08:01 +0000 (16:08 +0000)]
Merge "Make it possible to pass an arena allocator to HLoopOptimization."
am:
4aa6a93c46
Change-Id: I8dbf05c57f04e10a1578c405ee6a02659667a82d
Treehugger Robot [Wed, 5 Oct 2016 16:03:30 +0000 (16:03 +0000)]
Merge "Make it possible to pass an arena allocator to HLoopOptimization."
Narayan Kamath [Wed, 5 Oct 2016 13:54:52 +0000 (13:54 +0000)]
Merge "Temporarily blacklist 955-method-handles-smali." am:
99ce62c347
am:
08d85bf8bd
Change-Id: I84c2b0773cd7b06804771bfae5a65390aa239fb6
Narayan Kamath [Wed, 5 Oct 2016 13:52:23 +0000 (13:52 +0000)]
Merge "Temporarily blacklist 955-method-handles-smali."
am:
99ce62c347
Change-Id: I5873a5f978a0d387faa2f9d3460e04ee7a990916
Narayan Kamath [Wed, 5 Oct 2016 13:46:49 +0000 (13:46 +0000)]
Merge "Temporarily blacklist 955-method-handles-smali."
Narayan Kamath [Wed, 5 Oct 2016 13:15:01 +0000 (14:15 +0100)]
Temporarily blacklist 955-method-handles-smali.
Needs a companion smali change
7b348e4f323f44a7c44282.
Test: make test-art-host
Change-Id: Id245d9ead8467315c97cfe07103da2b406b08c49
Nicolas Geoffray [Wed, 5 Oct 2016 12:49:44 +0000 (13:49 +0100)]
Make it possible to pass an arena allocator to HLoopOptimization.
loop_optimization_test uses memory from HLoopOptimization's
allocator, which is scoped by the Run method.
Fix is to pass custom allocator.
test: m test-art-host-gtest
Change-Id: I359330e22202519f400a26da5403eeb00f0b2db4
Narayan Kamath [Wed, 5 Oct 2016 12:26:17 +0000 (12:26 +0000)]
Merge "Basic implementation of invoke / invoke-polymorphic." am:
8ee0b085be
am:
c150534c9b
Change-Id: I8b7358aaf3e14589bdd7a60edfbc2ea8f7b54c37
Narayan Kamath [Wed, 5 Oct 2016 12:23:47 +0000 (12:23 +0000)]
Merge "Basic implementation of invoke / invoke-polymorphic."
am:
8ee0b085be
Change-Id: Ia59c4669734575f6cf0bd426a89fd4fc3caa6462
Vladimir Marko [Tue, 4 Oct 2016 13:44:28 +0000 (14:44 +0100)]
Remove #include "oat_file.h" from class_linker.h .
Refactor the OatClass and OatMethod related functions from
ClassLinker to OatFile and ArtMethod, respectively. Refactor
the remaining ClassLinker dependencies on OatFile to break
the #include dependency and reduce incremental build times.
Test: m test-art-host
Change-Id: Iebc5b9f81b48fbcf79821cc827a5d7c4a0261bf6
Treehugger Robot [Wed, 5 Oct 2016 12:19:30 +0000 (12:19 +0000)]
Merge "Basic implementation of invoke / invoke-polymorphic."
Nicolas Geoffray [Wed, 5 Oct 2016 10:36:39 +0000 (10:36 +0000)]
Merge "Properly scope HLoopOptimization's allocator." am:
d3a9ce9d30
am:
6f72ae011e
Change-Id: I2dccb5fefa34fe34a567acb662123b62d4b9fab5
Nicolas Geoffray [Wed, 5 Oct 2016 10:34:10 +0000 (10:34 +0000)]
Merge "Properly scope HLoopOptimization's allocator."
am:
d3a9ce9d30
Change-Id: I5fc6d2bfafdbe59862d5e572ad439d66b496cbfa
Treehugger Robot [Wed, 5 Oct 2016 10:30:14 +0000 (10:30 +0000)]
Merge "Properly scope HLoopOptimization's allocator."
Narayan Kamath [Wed, 3 Aug 2016 11:46:58 +0000 (12:46 +0100)]
Basic implementation of invoke / invoke-polymorphic.
Basic switch interpreter support for invoke-polymorphic. This change
allows for virtual/interface and static invokes on method handles.
Support for direct invokes (including constructors) and field
getters and setters will be added in follow up changes.
Bug:
30550796
Test: make test-art-host
Change-Id: Ieb3a991d974060d930d56467908d5c7c11d0e38e
Nicolas Geoffray [Wed, 5 Oct 2016 08:55:42 +0000 (09:55 +0100)]
Properly scope HLoopOptimization's allocator.
HOptimization classes do not get their destructor called,
as they are arena objects. So the scope for the optimization
allocator needs to be the Run method.
Also anticipate bisection search breakage by adding
HLoopOptimization to the list of recognized optimizations.
Change-Id: I7770989c39d5700a3b6b0a20af5d4b874dfde111
Goran Jakovljevic [Wed, 5 Oct 2016 04:07:44 +0000 (04:07 +0000)]
Merge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics" am:
2a5c516077
am:
745297ac7e
Change-Id: Ic14b5319575d95ba0605cb5cbee9a451452eae67
Goran Jakovljevic [Wed, 5 Oct 2016 04:05:44 +0000 (04:05 +0000)]
Merge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics"
am:
2a5c516077
Change-Id: Iec049cc9fc03d2e3d4b05aec7e752ecc680dd5df
Treehugger Robot [Wed, 5 Oct 2016 03:55:28 +0000 (03:55 +0000)]
Merge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics"
Colin Cross [Wed, 5 Oct 2016 01:44:35 +0000 (01:44 +0000)]
Merge "Revert "Compute PPID at ninja time"" am:
3601e4a5c5
am:
84a7962b88
Change-Id: I57b37702b9138714a474b1e2a3d1e32bed4e6eec
Colin Cross [Wed, 5 Oct 2016 01:42:35 +0000 (01:42 +0000)]
Merge "Revert "Compute PPID at ninja time""
am:
3601e4a5c5
Change-Id: Ifb341ffc0ee82d95bff904367baac78f0e23ebc0
Colin Cross [Wed, 5 Oct 2016 01:38:09 +0000 (01:38 +0000)]
Merge "Revert "Compute PPID at ninja time""
Mathieu Chartier [Wed, 5 Oct 2016 00:59:31 +0000 (00:59 +0000)]
Merge "Fix build break from merge conflict" am:
c13fbeb220
am:
dfd6e355c9
Change-Id: I9c545e3851b8d83807ce11774cfbf7efa833a653
Mathieu Chartier [Wed, 5 Oct 2016 00:57:31 +0000 (00:57 +0000)]
Merge "Fix build break from merge conflict"
am:
c13fbeb220
Change-Id: Id3efe319a6c75dd1d8fafc92104caf2f2c956a75
Mathieu Chartier [Wed, 5 Oct 2016 00:54:38 +0000 (00:54 +0000)]
Merge "Fix build break from merge conflict"
Mathieu Chartier [Wed, 5 Oct 2016 00:48:45 +0000 (17:48 -0700)]
Fix build break from merge conflict
Bug:
31113334
Test: mm -j32
Change-Id: I5643a0ec22cf03a54671a5c7fa0ebda41cc9a8c3
Mathieu Chartier [Wed, 5 Oct 2016 00:45:30 +0000 (00:45 +0000)]
Merge "Rename ObjPtr::Decode to ObjPtr::Ptr" am:
556c9a2f18
am:
a386275651
Change-Id: Iff960bc05c66248914f2e2b522e702e981fefa3f
Mathieu Chartier [Wed, 5 Oct 2016 00:43:31 +0000 (00:43 +0000)]
Merge "Rename ObjPtr::Decode to ObjPtr::Ptr"
am:
556c9a2f18
Change-Id: I2265df5d6748d385d44b76e5e2b8507432a173f4
Mathieu Chartier [Wed, 5 Oct 2016 00:39:07 +0000 (00:39 +0000)]
Merge "Rename ObjPtr::Decode to ObjPtr::Ptr"
OSDN Git Service
