Merge "Rename ObjPtr::Decode to ObjPtr::Ptr"

diff --cc compiler/driver/compiler_driver-inl.h
index b4730cc,d807fca..3e9e3cb
--- 1/compiler/driver/compiler_driver-inl.h
--- 2/compiler/driver/compiler_driver-inl.h
+++ b/compiler/driver/compiler_driver-inl.h
@@@ -31,13 -31,9 +31,13 @@@
  
  namespace art {
  
 +inline mirror::DexCache* CompilerDriver::GetDexCache(const DexCompilationUnit* mUnit) {
 +  return mUnit->GetClassLinker()->FindDexCache(Thread::Current(), *mUnit->GetDexFile(), false);
 +}
 +
  inline mirror::ClassLoader* CompilerDriver::GetClassLoader(const ScopedObjectAccess& soa,
                                                             const DexCompilationUnit* mUnit) {
-   return soa.Decode<mirror::ClassLoader>(mUnit->GetClassLoader()).Decode();
+   return soa.Decode<mirror::ClassLoader>(mUnit->GetClassLoader()).Ptr();
  }
  
  inline mirror::Class* CompilerDriver::ResolveClass(

diff --cc compiler/oat_test.cc
Simple merge

diff --cc dex2oat/dex2oat.cc
Simple merge

diff --cc oatdump/oatdump.cc
Simple merge

diff --cc runtime/runtime.cc
Simple merge