commit 8e3fb14615f20677da8421ada131b5f2fcd8eb56
author Brian Carlstrom <bdc@google.com> Wed Oct 09 21:00:27 2013 -0700
committer Brian Carlstrom <bdc@google.com> Wed Oct 09 21:00:27 2013 -0700
tree a06c3cbc6d8ea544fd221765af770921fd340d77
parent 31c9763a1b5f45ee51cef272244a58fb1115945a

Revert "Add Jack modifier."

This reverts commit 6ffd0967027c092a62d7100ca42ceded369c8ca1.

Change-Id: Ia69241a5100e8f740379e2ed944279de4daaf9ed

oatdump/oatdump.cc

diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index bc450bb..304222a 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -256,10 +256,7 @@
       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);

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index e23f1b1..9248ee4 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1728,8 +1728,7 @@
   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);

runtime/modifiers.h

diff --git a/runtime/modifiers.h b/runtime/modifiers.h
index 9b61ee0..34f4af8 100644
--- a/runtime/modifiers.h
+++ b/runtime/modifiers.h
@@ -45,10 +45,7 @@
 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.