diff options
| author | Andreas Gampe <agampe@google.com> | 2015-08-07 08:29:13 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-08-10 13:09:00 -0700 |
| commit | f695a009725c8c840d916d01c14998f5c5f816d2 (patch) | |
| tree | aead903f2740b4dd4aa3d3b286c0fa25a4c4f8ff /compiler | |
| parent | 6e9c66e099654b63ed3648bda2daeaf0a862f047 (diff) | |
| download | art-f695a009725c8c840d916d01c14998f5c5f816d2.zip art-f695a009725c8c840d916d01c14998f5c5f816d2.tar.gz art-f695a009725c8c840d916d01c14998f5c5f816d2.tar.bz2 | |
ART: Change UnresolvedMergedType internal representation
Squashed cherry-picks:
* 067f1ed7816cf4eb5d6258ca31b387ddb2073ab7
* 750f7c2827318f6d07620f2ef0321218ea4d8670
* 2f90b3415aadc2587d26c767c6bfb235797119a8
* 2ea7b70b2347969f3735bd0ec1b462bd6d2ff1bd
Bug: 22881413
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/gvn_dead_code_elimination.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/gvn_dead_code_elimination.cc b/compiler/dex/gvn_dead_code_elimination.cc index 044989e..d29b865 100644 --- a/compiler/dex/gvn_dead_code_elimination.cc +++ b/compiler/dex/gvn_dead_code_elimination.cc @@ -74,7 +74,7 @@ inline void GvnDeadCodeElimination::MIRData::RemovePrevChange(int v_reg, MIRData GvnDeadCodeElimination::VRegChains::VRegChains(uint32_t num_vregs, ScopedArenaAllocator* alloc) : num_vregs_(num_vregs), vreg_data_(alloc->AllocArray<VRegValue>(num_vregs, kArenaAllocMisc)), - vreg_high_words_(num_vregs, false, Allocator::GetNoopAllocator(), + vreg_high_words_(false, Allocator::GetNoopAllocator(), BitVector::BitsToWords(num_vregs), alloc->AllocArray<uint32_t>(BitVector::BitsToWords(num_vregs))), mir_data_(alloc->Adapter()) { |