diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-28 04:44:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-28 04:44:37 +0000 |
| commit | 86787d0bc2c5ad3b9c3b880b0fe2325d2b8bd672 (patch) | |
| tree | 6de43fc1c1336d18a72f5c205e142e1c6ca1ef5e /runtime/mirror | |
| parent | 5c7acfc0b5acc50c60c57934341750f7c776d57e (diff) | |
| parent | 81c6f8db12b203878a7d72444ead2bc7cf5c47ad (diff) | |
| download | art-86787d0bc2c5ad3b9c3b880b0fe2325d2b8bd672.zip art-86787d0bc2c5ad3b9c3b880b0fe2325d2b8bd672.tar.gz art-86787d0bc2c5ad3b9c3b880b0fe2325d2b8bd672.tar.bz2 | |
Merge "ART: PathClassLoader for compiler"
Diffstat (limited to 'runtime/mirror')
| -rw-r--r-- | runtime/mirror/art_field.cc | 2 | ||||
| -rw-r--r-- | runtime/mirror/object_test.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/runtime/mirror/art_field.cc b/runtime/mirror/art_field.cc index 3cea4a1..5d543a1 100644 --- a/runtime/mirror/art_field.cc +++ b/runtime/mirror/art_field.cc @@ -45,7 +45,7 @@ void ArtField::ResetClass() { void ArtField::SetOffset(MemberOffset num_bytes) { DCHECK(GetDeclaringClass()->IsLoaded() || GetDeclaringClass()->IsErroneous()); if (kIsDebugBuild && Runtime::Current()->IsAotCompiler() && - !Runtime::Current()->UseCompileTimeClassPath()) { + Runtime::Current()->GetCompilerCallbacks()->IsBootImage()) { Primitive::Type type = GetTypeAsPrimitiveType(); if (type == Primitive::kPrimDouble || type == Primitive::kPrimLong) { DCHECK_ALIGNED(num_bytes.Uint32Value(), 8); diff --git a/runtime/mirror/object_test.cc b/runtime/mirror/object_test.cc index 21972a1..1ce298d 100644 --- a/runtime/mirror/object_test.cc +++ b/runtime/mirror/object_test.cc @@ -360,8 +360,7 @@ TEST_F(ObjectTest, StaticFieldFromCode) { // pretend we are trying to access 'Static.s0' from StaticsFromCode.<clinit> ScopedObjectAccess soa(Thread::Current()); jobject class_loader = LoadDex("StaticsFromCode"); - const DexFile* dex_file = Runtime::Current()->GetCompileTimeClassPath(class_loader)[0]; - CHECK(dex_file != NULL); + const DexFile* dex_file = GetFirstDexFile(class_loader); StackHandleScope<2> hs(soa.Self()); Handle<mirror::ClassLoader> loader(hs.NewHandle(soa.Decode<ClassLoader*>(class_loader))); |