diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-19 16:49:03 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-19 22:27:39 -0700 |
| commit | 700a402244a1a423da4f3ba8032459f4b65fa18f (patch) | |
| tree | 4c22fcda04d271bd55a37aff30650214af17a90c /compiler/llvm/gbc_expander.cc | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
| download | art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 art-700a402244a1a423da4f3ba8032459f4b65fa18f.zip | |
Now we have a proper C++ library, use std::unique_ptr.
Also remove the Android.libcxx.mk and other bits of stlport compatibility
mechanics.
Change-Id: Icdf7188ba3c79cdf5617672c1cfd0a68ae596a61
Diffstat (limited to 'compiler/llvm/gbc_expander.cc')
| -rw-r--r-- | compiler/llvm/gbc_expander.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/llvm/gbc_expander.cc b/compiler/llvm/gbc_expander.cc index cf28db3bfc..25c9b20514 100644 --- a/compiler/llvm/gbc_expander.cc +++ b/compiler/llvm/gbc_expander.cc @@ -141,7 +141,7 @@ class GBCExpanderPass : public llvm::FunctionPass { std::vector<llvm::BasicBlock*> basic_block_landing_pads_; llvm::BasicBlock* current_bb_; - std::map<llvm::BasicBlock*, std::vector<std::pair<llvm::BasicBlock*, llvm::BasicBlock*> > > + std::map<llvm::BasicBlock*, std::vector<std::pair<llvm::BasicBlock*, llvm::BasicBlock*>>> landing_pad_phi_mapping_; llvm::BasicBlock* basic_block_unwind_; @@ -545,7 +545,7 @@ void GBCExpanderPass::RewriteFunction() { } llvm::TerminatorInst* term_inst = lbb->getTerminator(); - std::vector<std::pair<llvm::BasicBlock*, llvm::BasicBlock*> >& rewrite_pair + std::vector<std::pair<llvm::BasicBlock*, llvm::BasicBlock*>>& rewrite_pair = landing_pad_phi_mapping_[lbb]; irb_.SetInsertPoint(lbb->begin()); |