diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-10-10 14:20:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-10 14:20:53 -0700 |
| commit | 657d498c3e644cfae4ee25d8e04749840f137249 (patch) | |
| tree | 76a56ad873dab4890f9c6963517c7ac731aa7658 | |
| parent | fe29f369ea6dca8999cf61912c65193d60c203e6 (diff) | |
| parent | ed51dca05ca81dc753d86f26c3b372a6a87f5260 (diff) | |
| download | art-657d498c3e644cfae4ee25d8e04749840f137249.tar.gz art-657d498c3e644cfae4ee25d8e04749840f137249.tar.bz2 art-657d498c3e644cfae4ee25d8e04749840f137249.zip | |
am ed51dca0: am 9fbe6cbd: am 8e3fb146: Revert "Add Jack modifier."
* commit 'ed51dca05ca81dc753d86f26c3b372a6a87f5260':
Revert "Add Jack modifier."
| -rw-r--r-- | oatdump/oatdump.cc | 5 | ||||
| -rw-r--r-- | runtime/class_linker.cc | 3 | ||||
| -rw-r--r-- | runtime/modifiers.h | 5 |
3 files changed, 3 insertions, 10 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index aacbbf5ce3..6db5813a1b 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -256,10 +256,7 @@ class OatDumper { UniquePtr<const OatFile::OatClass> oat_class(oat_dex_file.GetOatClass(class_def_index)); CHECK(oat_class.get() != NULL); os << StringPrintf("%zd: %s (type_idx=%d) (", class_def_index, descriptor, class_def.class_idx_) - << oat_class->GetStatus() << ")" - // TODO: JACK CLASS ACCESS (HACK TO BE REMOVED) - << ( (class_def.access_flags_ & kAccClassJack) == kAccClassJack ? " (Jack)" : "" ) - << "\n"; + << oat_class->GetStatus() << ")\n"; Indenter indent_filter(os.rdbuf(), kIndentChar, kIndentBy1Count); std::ostream indented_os(&indent_filter); DumpOatClass(indented_os, *oat_class.get(), *(dex_file.get()), class_def); diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index f0a7202408..9e67f5a4f3 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -1732,8 +1732,7 @@ void ClassLinker::LoadClass(const DexFile& dex_file, klass->SetClass(GetClassRoot(kJavaLangClass)); uint32_t access_flags = dex_class_def.access_flags_; // Make sure that none of our runtime-only flags are set. - // TODO: JACK CLASS ACCESS (HACK TO BE REMOVED) - CHECK_EQ(access_flags & ~(kAccJavaFlagsMask | kAccClassJack), 0U); + CHECK_EQ(access_flags & ~kAccJavaFlagsMask, 0U); klass->SetAccessFlags(access_flags); klass->SetClassLoader(class_loader); DCHECK_EQ(klass->GetPrimitiveType(), Primitive::kPrimNot); diff --git a/runtime/modifiers.h b/runtime/modifiers.h index 9b61ee0cf0..34f4af845b 100644 --- a/runtime/modifiers.h +++ b/runtime/modifiers.h @@ -45,10 +45,7 @@ static const uint32_t kAccJavaFlagsMask = 0xffff; // bits set from Java sources static const uint32_t kAccConstructor = 0x00010000; // method (dex only) <init> and <clinit> static const uint32_t kAccDeclaredSynchronized = 0x00020000; // method (dex only) static const uint32_t kAccClassIsProxy = 0x00040000; // class (dex only) -// TODO: JACK CLASS ACCESS (HACK TO BE REMOVED) -static const uint32_t kAccClassJack = 0x00080000; // class (dex only) - -static const uint32_t kAccPreverified = 0x00100000; // method (dex only) +static const uint32_t kAccPreverified = 0x00080000; // method (dex only) // Special runtime-only flags. // Note: if only kAccClassIsReference is set, we have a soft reference. |