diff options
| author | Andreas Gampe <agampe@google.com> | 2014-09-15 16:39:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-15 16:39:46 +0000 |
| commit | 41bc89598bbfe1037740a6a2e12ce0936dd9ba19 (patch) | |
| tree | 99ee2bfb5a6f4d27735aeed26a0533c759db733c /compiler | |
| parent | 56369897d662ea63ea5ed57ae36af0ae0fa1452d (diff) | |
| parent | 5182932cf6704b53e957f7b4be021fe505a55e22 (diff) | |
| download | android_art-41bc89598bbfe1037740a6a2e12ce0936dd9ba19.tar.gz android_art-41bc89598bbfe1037740a6a2e12ce0936dd9ba19.tar.bz2 android_art-41bc89598bbfe1037740a6a2e12ce0936dd9ba19.zip | |
Merge "ART: Change access flag behavior in verifier"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 6 | ||||
| -rw-r--r-- | compiler/oat_writer.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index bbd19396cd..01e0ac4abe 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1605,7 +1605,7 @@ static void ResolveClassFieldsAndMethods(const ParallelCompilationManager* manag // We require a constructor barrier if there are final instance fields. requires_constructor_barrier = false; while (it.HasNextInstanceField()) { - if ((it.GetMemberAccessFlags() & kAccFinal) != 0) { + if (it.MemberIsFinal()) { requires_constructor_barrier = true; } if (resolve_fields_and_methods) { @@ -1946,7 +1946,7 @@ void CompilerDriver::CompileClass(const ParallelCompilationManager* manager, siz continue; } previous_direct_method_idx = method_idx; - driver->CompileMethod(it.GetMethodCodeItem(), it.GetMemberAccessFlags(), + driver->CompileMethod(it.GetMethodCodeItem(), it.GetMethodAccessFlags(), it.GetMethodInvokeType(class_def), class_def_index, method_idx, jclass_loader, dex_file, dex_to_dex_compilation_level); it.Next(); @@ -1962,7 +1962,7 @@ void CompilerDriver::CompileClass(const ParallelCompilationManager* manager, siz continue; } previous_virtual_method_idx = method_idx; - driver->CompileMethod(it.GetMethodCodeItem(), it.GetMemberAccessFlags(), + driver->CompileMethod(it.GetMethodCodeItem(), it.GetMethodAccessFlags(), it.GetMethodInvokeType(class_def), class_def_index, method_idx, jclass_loader, dex_file, dex_to_dex_compilation_level); it.Next(); diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc index c5d1478a43..e74d6de4eb 100644 --- a/compiler/oat_writer.cc +++ b/compiler/oat_writer.cc @@ -437,7 +437,7 @@ class OatWriter::InitCodeMethodVisitor : public OatDexMethodVisitor { std::vector<uint8_t> const * gc_map = compiled_method->GetGcMap(); if (gc_map != nullptr) { size_t gc_map_size = gc_map->size() * sizeof(gc_map[0]); - bool is_native = (it.GetMemberAccessFlags() & kAccNative) != 0; + bool is_native = it.MemberIsNative(); CHECK(gc_map_size != 0 || is_native || status < mirror::Class::kStatusVerified) << gc_map << " " << gc_map_size << " " << (is_native ? "true" : "false") << " " << (status < mirror::Class::kStatusVerified) << " " << status << " " |